October 2008 - Wine-Commits

Aric Stewart : mlang/tests: Make sure a given codepage has 'abc' before depending on that conversion to detect if a codepage is convertable .
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: f2dbaeff645ce91a8a764e289dcfa176d458a3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2dbaeff645ce91a8a764e289… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 9 08:40:39 2008 -0500 mlang/tests: Make sure a given codepage has 'abc' before depending on that conversion to detect if a codepage is convertable. --- dlls/mlang/tests/mlang.c | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index a1e5793..f42836d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -250,7 +250,7 @@ static const char *dump_mime_flags(DWORD flags) } #endif -static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) +static HRESULT check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) { CHAR convert[MAX_PATH]; BYTE dest[MAX_PATH]; @@ -259,21 +259,37 @@ static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) static WCHAR strW[] = {'a','b','c',0}; + /* Check to see if the target codepage has these characters or not */ + if (from != CP_UTF8) + { + BOOL fDefaultChar; + char ch[10]; + int cb; + cb = WideCharToMultiByte( from, WC_NO_BEST_FIT_CHARS | WC_COMPOSITECHECK | WC_DEFAULTCHAR, + strW, 3, ch, sizeof(ch), NULL, &fDefaultChar); + + if(cb == 0 || fDefaultChar) + { + trace("target codepage %i does not contain 'abc'\n",from); + return E_FAIL; + } + } + srcsz = lstrlenW(strW) + 1; destsz = MAX_PATH; hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, from, strW, &srcsz, convert, &destsz); if (hr != S_OK) - return FALSE; + return S_FALSE; srcsz = -1; destsz = MAX_PATH; hr = IMultiLanguage2_ConvertString(iML2, NULL, from, to, (BYTE *)convert, &srcsz, dest, &destsz); if (hr != S_OK) - return FALSE; + return S_FALSE; - return TRUE; + return S_OK; } static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) @@ -333,8 +349,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) { CHARSETINFO csi; MIMECSETINFO mcsi; - BOOL convertible; - HRESULT check = S_OK; + HRESULT convertible = S_OK; static const WCHAR autoW[] = {'_','a','u','t','o',0}; static const WCHAR feffW[] = {'u','n','i','c','o','d','e','F','E','F','F',0}; @@ -386,13 +401,13 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); convertible = check_convertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - if (!convertible) - check = S_FALSE; - - ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - ok(ret == check, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); - ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); - ok(ret == check, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + if (convertible != E_FAIL) + { + ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); + ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + } } else trace("IsValidCodePage failed for cp %u\n", cpinfo[i].uiCodePage);

1 0

Hans Leidekker : usp10: Store glyph mappings and widths in the script cache .
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: addcf866cbb42309ccafa41e8424c3b80a00a7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=addcf866cbb42309ccafa41e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 9 15:17:29 2008 +0200 usp10: Store glyph mappings and widths in the script cache. --- dlls/usp10/tests/usp10.c | 11 ++- dlls/usp10/usp10.c | 271 +++++++++++++++++++++++++--------------------- 2 files changed, 160 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=addcf866cbb42309ccafa…

1 0

Alexandre Julliard : git-notify: Allow specifying the various parameters from the git config file too.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: tools Branch: master Commit: cbae80c39e7bbb6888510ae48e858787fb95620a URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbae80c39e7bbb6888510ae4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 19:38:30 2008 +0200 git-notify: Allow specifying the various parameters from the git config file too. --- git-notify | 71 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 28 deletions(-) diff --git a/git-notify b/git-notify index df8d49e..acf011c 100755 --- a/git-notify +++ b/git-notify @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # # Tool to send git commit notifications # @@ -31,37 +31,42 @@ use Cwd 'realpath'; binmode STDIN, ':utf8'; binmode STDOUT, ':utf8'; -# some parameters you may want to change +sub git_config($); +sub get_repos_name(); -# base URL of the gitweb repository browser (can be set with the -u option) -my $gitweb_url = "http://source.winehq.org/git"; +# some parameters you may want to change # set this to something that takes "-s" my $mailer = "/usr/bin/mail"; +# CIA notification address +my $cia_address = "cia\(a)cia.navi.cx"; + +# debug mode +my $debug = 0; + +# configuration parameters + +# base URL of the gitweb repository browser (can be set with the -u option) +my $gitweb_url = git_config( "notify.baseurl" ); + # default repository name (can be changed with the -r option) -my $repos_name = ""; +my $repos_name = git_config( "notify.repository" ) || get_repos_name(); # max size of diffs in bytes (can be changed with the -s option) -my $max_diff_size = 10000; +my $max_diff_size = git_config( "notify.maxdiff" ) || 10000; # address for mail notices (can be set with -m option) -my $commitlist_address; +my $commitlist_address = git_config( "notify.mail" ); # project name for CIA notices (can be set with -c option) -my $cia_project_name; - -# CIA notification address -my $cia_address = "cia\(a)cia.navi.cx"; +my $cia_project_name = git_config( "notify.cia" ); # max number of individual notices before falling back to a single global notice (can be set with -n option) -my $max_individual_notices = 100; - -# debug mode -my $debug = 0; +my $max_individual_notices = git_config( "notify.maxnotices" ) || 100; # branches to exclude -my @exclude_list = (); +my @exclude_list = split /\s+/, git_config( "notify.exclude" ) || ""; sub usage() { @@ -106,6 +111,18 @@ sub format_date($$) return gmtime($time) . sprintf " %+05d", $tz; } +# fetch a parameter from the git config file +sub git_config($) +{ + my ($param) = @_; + + open CONFIG, "-|" or exec "git", "config", $param; + my $ret = <CONFIG>; + chomp $ret if $ret; + close CONFIG or $ret = undef; + return $ret; +} + # parse command line options sub parse_options() { @@ -120,11 +137,12 @@ sub parse_options() elsif ($arg eq '-r') { $repos_name = shift @ARGV; } elsif ($arg eq '-s') { $max_diff_size = shift @ARGV; } elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } - elsif ($arg eq '-x') { push @exclude_list, "^" . shift @ARGV; } + elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } elsif ($arg eq '-d') { $debug++; } else { usage(); } } if (@ARGV && $#ARGV != 2) { usage(); } + @exclude_list = map { "^$_"; } @exclude_list; } # send an email notification @@ -159,8 +177,8 @@ sub get_repos_name() my $dir = `git rev-parse --git-dir`; chomp $dir; my $repos = realpath($dir); - $repos =~ s/(.*?)((\.git\/)?\.git)$/\1/; - $repos =~ s/(.*)\/([^\/]+)\/?$/\2/; + $repos =~ s/(.*?)((\.git\/)?\.git)$/$1/; + $repos =~ s/(.*)\/([^\/]+)\/?$/$2/; return $repos; } @@ -221,8 +239,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Tag: $obj", - "URL: $gitweb_url/?a=tag;h=$obj", - "", + $gitweb_url ? "URL: $gitweb_url/?a=tag;h=$obj\n" : "", "Tagger: " . $info{"tagger"}, "Date: " . format_date($info{"tagger_date"},$info{"tagger_tz"}), "", @@ -235,8 +252,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Commit: $obj", - "URL: $gitweb_url/?a=commit;h=$obj", - "", + $gitweb_url ? "URL: $gitweb_url/?a=commit;h=$obj\n" : "", "Author: " . $info{"author"}, "Date: " . format_date($info{"author_date"},$info{"author_tz"}), "", @@ -259,7 +275,7 @@ sub send_commit_notice($$) } else { - push @notice, "Diff: $gitweb_url/?a=commitdiff;h=$obj", + push @notice, "Diff: $gitweb_url/?a=commitdiff;h=$obj" if $gitweb_url; } $subject = $info{"author_name"} . ": " . ${$info{"log"}}[0]; @@ -315,7 +331,7 @@ sub send_cia_notice($$) push @cia_text, " </files>", - " <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>", + $gitweb_url ? " <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>" : "", " </commit>", " </body>", " <timestamp>" . $info{"author_date"} . "</timestamp>", @@ -334,7 +350,7 @@ sub send_global_notice($$$) while (<LIST>) { chomp; - s/^commit /URL: $gitweb_url\/?a=commit;h=/; + s/^commit /URL: $gitweb_url\/?a=commit;h=/ if $gitweb_url; push @notice, $_; } close LIST; @@ -379,11 +395,10 @@ sub send_all_notices($$$) } } -$repos_name = get_repos_name(); parse_options(); # append repository path to URL -$gitweb_url .= "/$repos_name.git"; +$gitweb_url .= "/$repos_name.git" if $gitweb_url; if (@ARGV) {

1 0

Alexandre Julliard : git-notify: Change the arguments order to match the post-receive hook.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: tools Branch: master Commit: 582a7cc1fadd73c4265bdb94528a64b0b2dbc42b URL: http://source.winehq.org/git/tools.git/?a=commit;h=582a7cc1fadd73c4265bdb94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 19:41:19 2008 +0200 git-notify: Change the arguments order to match the post-receive hook. --- git-notify | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git-notify b/git-notify index acf011c..ad4b90e 100755 --- a/git-notify +++ b/git-notify @@ -10,9 +10,9 @@ # the License, or (at your option) any later version. # # -# This script is meant to be called from .git/hooks/update. +# This script is meant to be called from .git/hooks/post-receive. # -# Usage: git-notify [options] [--] refname old-sha1 new-sha1 +# Usage: git-notify [options] [--] old-sha1 new-sha1 refname # # -c name Send CIA notifications under specified project name # -m addr Send mail notifications to specified address @@ -361,7 +361,7 @@ sub send_global_notice($$$) # send all the notices sub send_all_notices($$$) { - my ($ref, $old_sha1, $new_sha1) = @_; + my ($old_sha1, $new_sha1, $ref) = @_; $ref =~ s/^refs\/heads\///; @@ -409,7 +409,7 @@ else # read them from stdin while (<>) { chomp; - if (/^([0-9a-f]{40}) ([0-9a-f]{40}) (.*)$/) { send_all_notices( $3, $1, $2 ); } + if (/^([0-9a-f]{40}) ([0-9a-f]{40}) (.*)$/) { send_all_notices( $1, $2, $3 ); } } }

1 0

Alexandre Julliard : msi/tests: Clean up the binary.dat file.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 87e21fe58531883f7dc46e04b39b4bdd2e1f610e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e21fe58531883f7dc46e04b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 14:27:21 2008 +0200 msi/tests: Clean up the binary.dat file. --- dlls/msi/tests/db.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 938241d..afee033 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6972,6 +6972,7 @@ static void test_dbmerge(void) DeleteFileA(msifile); DeleteFileA("refdb.msi"); DeleteFileA("codepage.idt"); + DeleteFileA("binary.dat"); } START_TEST(db)

1 0

Stefan Leichter : winscard: Add stubs for SCardAddReaderToGroupA/W.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: fa6a31ab84f44b113c381d2067f33ff2065f7cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6a31ab84f44b113c381d206… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Oct 8 23:25:42 2008 +0200 winscard: Add stubs for SCardAddReaderToGroupA/W. --- dlls/winscard/Makefile.in | 2 +- dlls/winscard/winscard.c | 25 +++++++++++++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index 796280d..3399071 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winscard.dll IMPORTLIB = winscard -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ winscard.c diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 810dee1..51d0adf 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "wine/debug.h" #include "winscard.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(winscard); @@ -51,6 +52,30 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT context, LPCSTR reader, LPCSTR group) +{ + LONG retval; + UNICODE_STRING readerW, groupW; + + if(reader) RtlCreateUnicodeStringFromAsciiz(&readerW,reader); + else readerW.Buffer = NULL; + if(group) RtlCreateUnicodeStringFromAsciiz(&groupW,group); + else groupW.Buffer = NULL; + + retval = SCardAddReaderToGroupW(context, readerW.Buffer, groupW.Buffer); + + RtlFreeUnicodeString(&readerW); + RtlFreeUnicodeString(&groupW); + + return retval; +} + +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR group) +{ + FIXME("%x %s %s\n", (unsigned int) context, debugstr_w(reader), debugstr_w(group)); + return SCARD_S_SUCCESS; +} + LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index f223415..1610de4 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -3,8 +3,8 @@ @ stub SCardReleaseAllEvents @ stub SCardReleaseNewReaderEvent @ stub SCardAccessStartedEvent -@ stub SCardAddReaderToGroupA -@ stub SCardAddReaderToGroupW +@ stdcall SCardAddReaderToGroupA(long str str) +@ stdcall SCardAddReaderToGroupW(long wstr wstr) @ stub SCardBeginTransaction @ stub SCardCancel @ stub SCardConnectA

1 0

Rob Shearman : msvcmaker: Don't generate project files for DLLs that can' t be compiled with MSVC.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 86ffc2b59feaed7b7f2a5c60d1733e56d90a1dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ffc2b59feaed7b7f2a5c60d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 9 11:53:58 2008 +0100 msvcmaker: Don't generate project files for DLLs that can't be compiled with MSVC. --- tools/winapi/msvcmaker | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 1fec041..655d171 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -36,6 +36,22 @@ my $no_release = 1; my %modules; +# These DLLs don't have a hope of compiling properly +my @unix_dependent_dlls = qw(iphlpapi mountmgr.sys ntdll mswsock opengl32 + secur32 winex11 wnaspi32 ws2_32); + +sub is_unix_dependent_dll($) { + my $dll = shift; + + foreach my $unix_only_dll (@unix_dependent_dlls) { + if($dll eq $unix_only_dll) { + return 1; + } + } + + return 0; +} + sub read_spec_file($) { my $spec_file = shift; @@ -85,7 +101,11 @@ sub read_spec_file($) { if ($options->wine || $options->winetest) { foreach my $spec_file (@spec_files) { - read_spec_file($spec_file); + my $dll = $spec_file; + $dll =~ s%dlls/([^/]+)/[^/]+\.spec%$1%; + if(!is_unix_dependent_dll($dll)) { + read_spec_file($spec_file); + } } } @@ -121,13 +141,18 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { my $testdll; my @imports; my $type; + my $dll; my %vars; my $again = 0; my $lookahead = 0; - if($makefile_in_file eq "loader/Makefile.in") { + $dll = $makefile_in_file; + $dll =~ s%dlls/([^/]+)/Makefile\.in%$1%; + + if($makefile_in_file eq "loader/Makefile.in" || + is_unix_dependent_dll($dll)) { next; }

1 0

Juan Lang : inetmib1: Fix remaining failure on Win9x/NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 1627377d1b2dc2ec3e5f23c90ce61635181c142d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1627377d1b2dc2ec3e5f23c90… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 15:24:12 2008 -0700 inetmib1: Fix remaining failure on Win9x/NT4. --- dlls/inetmib1/tests/main.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index efb0467..27ba9e5 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -66,7 +66,7 @@ static void testQuery(void) UINT mib2IpAddr[] = { 1,3,6,1,2,1,4,20,1,1 }; UINT mib2IpRouteTable[] = { 1,3,6,1,2,1,4,21,1,1 }; UINT mib2UdpTable[] = { 1,3,6,1,2,1,7,5,1,1 }; - SnmpVarBind vars[3], vars2[3]; + SnmpVarBind vars[3], vars2[3], vars3[3]; UINT entry; pQuery = (void *)GetProcAddress(inetmib1, "SnmpExtensionQuery"); @@ -247,8 +247,8 @@ static void testQuery(void) SnmpUtilVarBindFree(&vars2[2]); /* Even though SnmpExtensionInit says this DLL supports the MIB2 system - * variables, the first variable it returns a value for is the first - * interface. + * variables, on recent systems (at least Win2k) the first variable it + * returns a value for is the first interface. */ vars[0].name.idLength = sizeof(mib2System) / sizeof(mib2System[0]); vars[0].name.ids = mib2System; @@ -263,10 +263,12 @@ static void testQuery(void) ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); - vars[0].name.idLength = sizeof(mib2If) / sizeof(mib2If[0]); - vars[0].name.ids = mib2If; - ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength), - "expected 1.3.6.1.2.1.2, got %s\n", SnmpUtilOidToA(&vars2[0].name)); + vars3[0].name.idLength = sizeof(mib2If) / sizeof(mib2If[0]); + vars3[0].name.ids = mib2If; + ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength) || + !SnmpUtilOidNCmp(&vars2[0].name, &vars3[0].name, vars3[0].name.idLength), + "expected 1.3.6.1.2.1.1 or 1.3.6.1.2.1.2, got %s\n", + SnmpUtilOidToA(&vars2[0].name)); SnmpUtilVarBindFree(&vars2[0]); /* Check the type and OIDs of the IP address table */

1 0

Rob Shearman : msvcmaker: Don't automatically add a define for the DLL name .
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: a4e4e27f48c6baf32fc203fc40ef3ca4f3ca76fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e4e27f48c6baf32fc203fc4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 9 11:54:05 2008 +0100 msvcmaker: Don't automatically add a define for the DLL name. Use EXTRADEFS from the Makefile.in instead. --- tools/winapi/msvcmaker | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 655d171..91ea656 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -271,6 +271,11 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $idl_h_files = [sort(@{$vars{IDL_H_SRCS}})]; } + my $extradefs; + if(exists($vars{EXTRADEFS})) { + $extradefs = $vars{EXTRADEFS}; + } + my $project = $module; $project =~ s/\.(?:dll|exe|lib)$//; $project =~ y/./_/; @@ -316,6 +321,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{resource_files} = $local_resource_files; $modules{$module}{imports} = []; $modules{$module}{idl_h_files} = $local_idl_h_files; + $modules{$module}{extradefs} = $extradefs if $extradefs; } } @@ -330,6 +336,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{resource_files} = $resource_files; $modules{$module}{imports} = [@imports]; $modules{$module}{idl_h_files} = $idl_h_files; + $modules{$module}{extradefs} = $extradefs if $extradefs; } $wine_test_dsp_files{"wineruntests.dsp"}{files} = ["runtests.c"]; @@ -626,7 +633,7 @@ sub _generate_dsp($$) { push @defines, qw(_DEBUG _MBCS _LIB); } else { print OUT "/MDd "; - push @defines, (qw(_DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + push @defines, qw(_DEBUG _WINDOWS _MBCS _USRDLL); } print OUT "/W3 /Gm /GX /Zi /Od"; } else { @@ -634,7 +641,7 @@ sub _generate_dsp($$) { push @defines, qw(NDEBUG _MBCS _LIB); } else { print OUT "/MD "; - push @defines, (qw(NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); + push @defines, qw(NDEBUG _WINDOWS _MBCS _USRDLL); } print OUT "/W3 /GX /O2"; } @@ -652,28 +659,29 @@ sub _generate_dsp($$) { print OUT " /c"; print OUT "\r\n"; - my @defines2 = qw(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE USE_COMPILER_EXCEPTIONS _USE_MATH_DEFINES); + my @defines2 = qw(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE + USE_COMPILER_EXCEPTIONS _USE_MATH_DEFINES + WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700); if($debug) { if($lib) { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _LIB); + push @defines2, qw(WIN32 _DEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x700 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); + push @defines2, qw(_DEBUG WIN32 _WINDOWS _MBCS _USRDLL); } } else { if($lib) { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _LIB); + push @defines2, qw(WIN32 NDEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); + push @defines2, qw(NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); } } my @includes = (); if($wine) { - push @defines2, "_\U${project}\E_"; push @defines2, qw(__WINESRC__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/; if ($msvc_headers) { push @defines2, qw(__WINE_USE_NATIVE_HEADERS); @@ -712,6 +720,10 @@ sub _generate_dsp($$) { print OUT " /D inline=__inline" if $wine; print OUT " /D \"__STDC__\"" if 0 && $wine; + if(exists($modules{$module}{extradefs})) { + print OUT " @{$modules{$module}{extradefs}} "; + } + print OUT " /YX" if $lib; print OUT " /FR" if !$lib; print OUT " /FD";

1 0

Juan Lang : inetmib1: Fix some test failures on Win9x/NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 52e64b155e90caa718978856d78d3b0133e7206f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e64b155e90caa718978856d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 15:22:59 2008 -0700 inetmib1: Fix some test failures on Win9x/NT4. --- dlls/inetmib1/tests/main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index e00749f..efb0467 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -106,9 +106,14 @@ static void testQuery(void) index = 0xdeadbeef; ret = pQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); - ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + ok(error == SNMP_ERRORSTATUS_NOERROR || + error == ERROR_FILE_NOT_FOUND /* Win9x */, + "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %d\n", + error); + if (error == SNMP_ERRORSTATUS_NOERROR) + ok(index == 0, "expected index 0, got %d\n", index); + else if (error == ERROR_FILE_NOT_FOUND) + ok(index == 1, "expected index 1, got %d\n", index); /* The OID isn't changed either: */ ok(!strcmp("1.2.3.4", SnmpUtilOidToA(&vars[0].name)), "expected 1.2.3.4, got %s\n", SnmpUtilOidToA(&vars[0].name));

1 0