April 2009 - Wine-Commits - list.winehq.org

Paul Vriens : gdi32/tests: Fix some test failures on Win9x/WinME.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 75f6b1d6363207dc7848121f235b797a38caaea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f6b1d6363207dc7848121f2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 14:35:51 2009 +0200 gdi32/tests: Fix some test failures on Win9x/WinME. --- dlls/gdi32/tests/bitmap.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 75f3310..bfbeee0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1441,6 +1441,13 @@ static void test_GetDIBits(void) 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0 }; + static const BYTE dib_bits_1_9x[16 * 4] = + { + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa + }; /* 2-bytes aligned 24-bit bitmap data: 16x16 */ static const BYTE bmp_bits_24[16 * 16*3] = { @@ -1592,15 +1599,21 @@ static void test_GetDIBits(void) } /* returned bits are DWORD aligned and upside down */ - ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)) || + broken(!memcmp(buf, dib_bits_1_9x, sizeof(dib_bits_1_9x))), /* Win9x, WinME */ + "DIB bits don't match\n"); /* Test the palette indices */ memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); SetLastError(0xdeadbeef); lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); - - ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); - ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + if (lines == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + win_skip("Win9x/WinMe doesn't handle 0 for the number of scan lines\n"); + else + { + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + } for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[1]); @@ -1708,15 +1721,21 @@ static void test_GetDIBits(void) /* returned bits are DWORD aligned and upside down */ todo_wine - ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)) || + broken(!memcmp(buf, dib_bits_1_9x, sizeof(dib_bits_1_9x))), /* Win9x, WinME */ + "DIB bits don't match\n"); /* Test the palette indices */ memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); SetLastError(0xdeadbeef); lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); - - ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); - ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + if (lines == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + win_skip("Win9x/WinMe doesn't handle 0 for the number of scan lines\n"); + else + { + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + } for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]);

1 0

Alexandre Julliard : winetest: Split per-platform results to different index files.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: tools Branch: master Commit: 3b8743fae628af8b9e04f3b38976ab86110ab2bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=3b8743fae628af8b9e04f3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 15:09:42 2009 +0200 winetest: Split per-platform results to different index files. --- winetest/build-index | 2 +- winetest/gather | 215 ++++++++++++++++++++++++++------------------------ winetest/site | 17 +++-- 3 files changed, 124 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=3b8743fae628af8b9e04…

1 0

André Hentschel : winemaker: Fix project file path parsing.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 1199d05d597ef1fc56fa17018cb3cc5ef1927018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1199d05d597ef1fc56fa17018… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 15:47:59 2009 +0200 winemaker: Fix project file path parsing. --- tools/winemaker | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index ba7d284..1c177aa 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1096,10 +1096,11 @@ sub source_scan_workspace_file($) s/\r\n$/\n/; # catch a project definition - if (/^Project:\s\"(.*)\"=(.*)\s-/) { + if (/^Project:\s\"(.*)\"=\"?(.*)\s-/) { $prj_name=$1; $prj_path=$2; - @components=split /[\/\\]+/, $2; + $prj_path=~s/\"$//; + @components=split /[\/\\]+/, $prj_path; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n"; source_scan_project_file(\@main_project,1,$prj_path);

1 0

Rico Schüller : notepad: Allow only one search/ replace dialog to open.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: ac6a18f1f6d5eb3fb453c7eea913ed4d720088a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a18f1f6d5eb3fb453c7eea… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Apr 25 17:54:03 2009 +0200 notepad: Allow only one search/replace dialog to open. --- programs/notepad/dialog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ce4bbfa..aa0a53c 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -724,6 +724,13 @@ VOID DIALOG_SelectFont(VOID) VOID DIALOG_Search(VOID) { + /* Allow only one search/replace dialog to open */ + if(Globals.hFindReplaceDlg != NULL) + { + SetActiveWindow(Globals.hFindReplaceDlg); + return; + } + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd; @@ -749,6 +756,13 @@ VOID DIALOG_SearchNext(VOID) VOID DIALOG_Replace(VOID) { + /* Allow only one search/replace dialog to open */ + if(Globals.hFindReplaceDlg != NULL) + { + SetActiveWindow(Globals.hFindReplaceDlg); + return; + } + ZeroMemory(&Globals.find, sizeof(Globals.find)); Globals.find.lStructSize = sizeof(Globals.find); Globals.find.hwndOwner = Globals.hMainWnd;

1 0

Nikolay Sivov : comctl32/listview: Fix resizing grid drawing at right from rightmost column.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 82744c93e0d7019017a13901c984f8bcae891fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82744c93e0d7019017a13901c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 26 12:39:36 2009 +0400 comctl32/listview: Fix resizing grid drawing at right from rightmost column. --- dlls/comctl32/listview.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6301c8a..b6c6c2d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9057,9 +9057,21 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE } /* when shrinking the last column clear the now unused field */ - if (lpnmh->iItem == DPA_GetPtrCount(infoPtr->hdpaColumns) - 1 && dx < 0) + if (lpnmh->iItem == DPA_GetPtrCount(infoPtr->hdpaColumns) - 1) + { + RECT right; + rcCol.right -= dx; + /* deal with right from rightmost column area */ + right.left = rcCol.right; + right.top = rcCol.top; + right.bottom = rcCol.bottom; + right.right = infoPtr->rcList.right; + + LISTVIEW_InvalidateRect(infoPtr, &right); + } + LISTVIEW_InvalidateRect(infoPtr, &rcCol); } }

1 0

André Hentschel : winemaker: Add often used negative optimization.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: dc31d870823de968c49987dd3bbb742ac0c6fa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc31d870823de968c49987dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:41:48 2009 +0200 winemaker: Add often used negative optimization. --- tools/winemaker | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 3144b59..1df8fa7 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -638,6 +638,9 @@ sub source_scan_project_file($$$) } elsif (/^Oy$/) { # Frame-Pointer Omission $prj_target_cflags.="-fomit-frame-pointer "; + } elsif (/^Oy-$/) { + # Frame-Pointer Omission + $prj_target_cflags.="-fno-omit-frame-pointer "; } elsif (/^GZ$/) { # Catch Release-Build Errors in Debug Build } elsif (/^M[DLT]d?$/) {

1 0

Jeff Latimer : ws2_32: Make inet_ntop conform to msdn definition.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 4d4819d8c4d13d1bc53f82c3b4322c897e8bdd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4819d8c4d13d1bc53f82c3b… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 00:30:22 2009 +1000 ws2_32: Make inet_ntop conform to msdn definition. --- dlls/ws2_32/socket.c | 12 +++++++----- dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 42bab60..01ebd7c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4698,16 +4698,18 @@ int WINAPI WSARemoveServiceClass(LPGUID info) PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, size_t len ) { #ifdef HAVE_INET_NTOP - union generic_unix_sockaddr unix_addr; + struct WS_in6_addr *in6; + struct WS_in_addr *in; + TRACE("family %d, addr (%p), buffer (%p), len %d\n", family, addr, buffer, len); switch (family) { case WS_AF_INET: - ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in), &unix_addr ); - return inet_ntop( AF_INET, &unix_addr, buffer, len ); + in = addr; + return inet_ntop( AF_INET, &in->WS_s_addr, buffer, len ); case WS_AF_INET6: - ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in6), &unix_addr ); - return inet_ntop( AF_INET6, &unix_addr, buffer, len ); + in6 = addr; + return inet_ntop( AF_INET6, in6->WS_s6_addr, buffer, len ); } #else FIXME( "not supported on this platform\n" ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7bc3ee8..8316982 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2040,7 +2040,7 @@ static void test_addr_to_print(void) pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); ok(pdst != NULL, "InetNtop failed %s\n", dst); - todo_wine ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); /* Test invalid parm conditions */ pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); @@ -2051,13 +2051,13 @@ static void test_addr_to_print(void) memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); - todo_wine ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); + ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); /* Test an zero suffixed IPV6 address */ memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); - todo_wine ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); + ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); } static void test_ioctlsocket(void)

1 0

André Hentschel : winemaker: Fix optimizations.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: e1cdd9778ff0af880bce04b6db8809ed0f9d5be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cdd9778ff0af880bce04b6d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:27:42 2009 +0200 winemaker: Fix optimizations. --- tools/winemaker | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1c177aa..3144b59 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -627,10 +627,14 @@ sub source_scan_project_file($$$) # Disables inline Expansion $prj_target_cflags.="-fno-inline "; } elsif (/^Ob1$/) { - # In-line Function Expansion + #In-line Function Expansion + $prj_target_cflags.="-finline-functions "; } elsif (/^Ob2$/) { # auto In-line Function Expansion $prj_target_cflags.="-finline-functions "; + } elsif (/^Ox$/) { + # Use maximum optimization + $prj_target_cflags.="-O3 "; } elsif (/^Oy$/) { # Frame-Pointer Omission $prj_target_cflags.="-fomit-frame-pointer ";

1 0

André Hentschel : winemaker: Fix path handling for Current Working Directory.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 70fbe9770a4775f9c6cf8769ff6a9b0c15891428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fbe9770a4775f9c6cf8769f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 24 17:40:32 2009 +0200 winemaker: Fix path handling for Current Working Directory. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index eca6417..ba7d284 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1724,7 +1724,7 @@ sub search_from($$) my $path=$_[1]; my $real_path=""; - if ($dirname eq "" or $dirname eq ".") { + if ($dirname eq "" or $dirname eq "." or $dirname eq "./") { $dirname=cwd; } elsif ($dirname !~ m+^/+) { $dirname=cwd . "/" . $dirname;

1 0

Jeff Latimer : ws2_32/tests: Add tests for Inet_Ntop and inet_ntoa.
by Alexandre Julliard April 27, 2009

April 27, 2009

Module: wine Branch: master Commit: 0cdd0d80eef747f7400568f6a16e89292bbaa531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdd0d80eef747f7400568f6a… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Apr 25 00:30:06 2009 +1000 ws2_32/tests: Add tests for Inet_Ntop and inet_ntoa. --- dlls/ws2_32/tests/sock.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dbd43d8..7bc3ee8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -55,6 +55,9 @@ ok ( cond tmp, msg, GetCurrentThreadId(), err); \ } while (0); +/* Function pointers */ +static HMODULE hws2_32 = 0; +static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; /**************** Structs and typedefs ***************/ @@ -1996,6 +1999,67 @@ static void test_inet_addr(void) ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); } +static void test_addr_to_print(void) +{ + char dst[16]; + char dst6[64]; + const char * pdst; + struct in_addr in; + struct in6_addr in6; + + u_long addr0_Num = 0x00000000; + PCSTR addr0_Str = "0.0.0.0"; + u_long addr1_Num = 0x20201015; + PCSTR addr1_Str = "21.16.32.32"; + u_char addr2_Num[16] = {0,0,0,0,0,0,0,0,0,0,0xff,0xfe,0xcC,0x98,0xbd,0x74}; + PCSTR addr2_Str = "::fffe:cc98:bd74"; + u_char addr3_Num[16] = {0x20,0x30,0xa4,0xb1}; + PCSTR addr3_Str = "2030:a4b1::"; + + hws2_32 = GetModuleHandle("ws2_32.dll"); + pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + + in.s_addr = addr0_Num; + + pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); + ok(pdst != NULL, "inet_ntoa failed %s\n", dst); + ok(!strcmp(pdst, addr0_Str),"Address %s != %s\n", pdst, addr0_Str); + + /* Test that inet_ntoa and inet_ntop return the same value */ + in.S_un.S_addr = addr1_Num; + pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); + ok(pdst != NULL, "inet_ntoa failed %s\n", dst); + ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + + /* InetNtop became available in Vista and Win2008 */ + if (!pInetNtop) + { + win_skip("InetNtop not present, not executing tests\n"); + return; + } + + pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); + ok(pdst != NULL, "InetNtop failed %s\n", dst); + todo_wine ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + + /* Test invalid parm conditions */ + pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "Should be WSAEAFNOSUPPORT\n"); + + /* Test an zero prefixed IPV6 address */ + memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); + pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + ok(pdst != NULL, "InetNtop failed %s\n", dst6); + todo_wine ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); + + /* Test an zero suffixed IPV6 address */ + memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); + pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + ok(pdst != NULL, "InetNtop failed %s\n", dst6); + todo_wine ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); +} + static void test_ioctlsocket(void) { SOCKET sock; @@ -2369,6 +2433,7 @@ START_TEST( sock ) test_accept(); test_getsockname(); test_inet_addr(); + test_addr_to_print(); test_ioctlsocket(); test_dns(); test_gethostbyname_hack();

1 0