June 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Fix the change notification test on Vista.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: af785c4d0ff8a00ce9ed1f6f8632e61571ac2892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af785c4d0ff8a00ce9ed1f6f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:44:41 2008 +0200 kernel32/tests: Fix the change notification test on Vista. --- dlls/kernel32/tests/change.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index c070eb0..cb500ef 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -560,8 +560,8 @@ static void test_readdirectorychanges(void) pfni = (PFILE_NOTIFY_INFORMATION) buffer; ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); - ok( pfni->FileNameLength == 0x0c, "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" ); + ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); r = RemoveDirectoryW( subsubdir ); ok( r == TRUE, "failed to remove directory\n"); @@ -578,13 +578,21 @@ static void test_readdirectorychanges(void) ok( r == WAIT_OBJECT_0, "should be ready\n" ); pfni = (PFILE_NOTIFY_INFORMATION) buffer; - ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); - ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong\n" ); - ok( pfni->FileNameLength == 0x0c, "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6), "name wrong\n" ); + /* we may get a notification for the parent dir too */ + if (pfni->Action == FILE_ACTION_MODIFIED && pfni->NextEntryOffset) + { + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n" ); + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } + ok( pfni->NextEntryOffset == 0, "offset wrong %u\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong %u\n", pfni->Action ); + ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); + dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; + ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); CloseHandle(hdir);

1 0

Dan Kegel : shell32/tests: Avoid buffer overflow during test.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 63557d572c2f3c20acbb48a8284f7ec2945ffd05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63557d572c2f3c20acbb48a82… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 10 06:07:20 2008 -0700 shell32/tests: Avoid buffer overflow during test. --- dlls/shell32/tests/shlfileop.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index df4bd41..30d3f24 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -843,8 +843,9 @@ static void test_copy(void) createTestFile("one.txt"); - /* no double-NULL terminator for pFrom */ - memset(from, 'a', MAX_PATH); + /* pFrom contains bogus 2nd name longer than MAX_PATH */ + memset(from, 'a', MAX_PATH*2); + memset(from+MAX_PATH*2, 0, 2); lstrcpyA(from, "one.txt"); shfo.pFrom = from; shfo.pTo = "two.txt\0"; @@ -856,8 +857,9 @@ static void test_copy(void) createTestFile("one.txt"); - /* no double-NULL terminator for pTo */ - memset(to, 'a', MAX_PATH); + /* pTo contains bogus 2nd name longer than MAX_PATH */ + memset(to, 'a', MAX_PATH*2); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "two.txt"); shfo.pFrom = "one.txt\0"; shfo.pTo = to; @@ -880,9 +882,11 @@ static void test_copy(void) createTestFile("one.txt"); - /* no double-NULL terminator for pFrom and pTo */ - memset(from, 'a', MAX_PATH); - memset(to, 'a', MAX_PATH); + /* both pFrom and pTo contain bogus 2nd names longer than MAX_PATH */ + memset(from, 'a', MAX_PATH*2); + memset(from+MAX_PATH*2, 0, 2); + memset(to, 'a', MAX_PATH*2); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(from, "one.txt"); lstrcpyA(to, "two.txt"); shfo.pFrom = from; @@ -895,8 +899,9 @@ static void test_copy(void) createTestFile("one.txt"); - /* no double-NULL terminator for pTo, FOF_MULTIDESTFILES */ - memset(to, 'a', MAX_PATH); + /* pTo contains bogus 2nd name longer than MAX_PATH, FOF_MULTIDESTFILES */ + memset(to, 'a', MAX_PATH*2); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "two.txt"); shfo.pFrom = "one.txt\0"; shfo.pTo = to; @@ -910,11 +915,12 @@ static void test_copy(void) createTestFile("one.txt"); createTestFile("two.txt"); - /* no double-NULL terminator for pTo, + /* pTo contains bogus 2nd name longer than MAX_PATH, * multiple source files, * dest directory does not exist */ memset(to, 'a', 2 * MAX_PATH); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "threedir"); shfo.pFrom = "one.txt\0two.txt\0"; shfo.pTo = to; @@ -932,11 +938,12 @@ static void test_copy(void) createTestFile("two.txt"); CreateDirectoryA("threedir", NULL); - /* no double-NULL terminator for pTo, + /* pTo contains bogus 2nd name longer than MAX_PATH, * multiple source files, * dest directory does exist */ memset(to, 'a', 2 * MAX_PATH); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "threedir"); shfo.pFrom = "one.txt\0two.txt\0"; shfo.pTo = to; @@ -952,11 +959,12 @@ static void test_copy(void) createTestFile("one.txt"); createTestFile("two.txt"); - /* no double-NULL terminator for pTo, + /* pTo contains bogus 2nd name longer than MAX_PATH, * multiple source files, FOF_MULTIDESTFILES * dest dir does not exist */ memset(to, 'a', 2 * MAX_PATH); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "threedir"); shfo.pFrom = "one.txt\0two.txt\0"; shfo.pTo = to; @@ -979,11 +987,12 @@ static void test_copy(void) createTestFile("two.txt"); CreateDirectoryA("threedir", NULL); - /* no double-NULL terminator for pTo, + /* pTo contains bogus 2nd name longer than MAX_PATH, * multiple source files, FOF_MULTIDESTFILES * dest dir does exist */ memset(to, 'a', 2 * MAX_PATH); + memset(to+MAX_PATH*2, 0, 2); lstrcpyA(to, "threedir"); ptr = to + lstrlenA(to) + 1; lstrcpyA(ptr, "fourdir");

1 0

Alistair Leslie-Hughes : mshtml: Stop test crash on error condition.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 294fe6b65bc9b9d41537527b48fb00e39c68656d URL: http://source.winehq.org/git/wine.git/?a=commit;h=294fe6b65bc9b9d41537527b4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 10 22:52:56 2008 +1000 mshtml: Stop test crash on error condition. --- dlls/mshtml/tests/dom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a3d0701..ad06e5b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -885,6 +885,9 @@ static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)&elcol); IDispatch_Release(disp); ok(hres == S_OK, "Could not get IHTMLElementCollection interface: %08x\n", hres); + if(hres != S_OK) + goto cleanup; + test_elem_collection(elcol, elem_types, len); IHTMLElementCollection_Release(elcol); @@ -916,6 +919,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == NULL, "disp != NULL\n"); +cleanup: SysFreeString(V_BSTR(&name)); }

1 0

Alistair Leslie-Hughes : shell32: Stop shlfolder tests crashing under win98 .
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 996e5d62b87067b1f0c2f0e46b41f69c45f220be URL: http://source.winehq.org/git/wine.git/?a=commit;h=996e5d62b87067b1f0c2f0e46… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 10 21:52:58 2008 +1000 shell32: Stop shlfolder tests crashing under win98. --- dlls/shell32/tests/shlfolder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 5c43d38..950f1d7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -432,6 +432,12 @@ static void test_GetDisplayName(void) if (SUCCEEDED(hr)) { IShellFolder_Release(psfFile); } + + if(!pSHBindToParent) + { + skip("SHBindToParent is missing\n"); + return; + } /* Some tests for IShellFolder::SetNameOf */ hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); @@ -474,8 +480,6 @@ static void test_GetDisplayName(void) ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); } - if(!pSHBindToParent) return; - /* SHBindToParent fails, if called with a NULL PIDL. */ hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); ok (FAILED(hr), "SHBindToParent(NULL) should fail!\n");

1 0

Paul Vriens : ole32/tests: Only skip the tests if we are on NT4 or below.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 185ad65d1212dc723a2432a84aca720dfccc1404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185ad65d1212dc723a2432a84… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 10 14:42:50 2008 +0200 ole32/tests: Only skip the tests if we are on NT4 or below. --- dlls/ole32/tests/ole2.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7ddbe78..8d72b15 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1130,8 +1130,8 @@ static void test_data_cache(void) hr = IOleCache_Uncache(pOleCache, 0xdeadbeef); ok(hr == OLE_E_NOCONNECTION, "IOleCache_Uncache with invalid value should return OLE_E_NOCONNECTION instead of 0x%x\n", hr); - /* Both tests crash on NT4 and below */ - if (0) + /* Both tests crash on NT4 and below. StgCreatePropSetStg is only available on w2k and above. */ + if (GetProcAddress(GetModuleHandleA("ole32.dll"), "StgCreatePropSetStg")) { hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection); ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr); @@ -1139,6 +1139,10 @@ static void test_data_cache(void) hr = IOleCache_Cache(pOleCache, NULL, 0, NULL); ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr); } + else + { + skip("tests with NULL parameters will crash on NT4 and below\n"); + } for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++) {

1 0

Paul Vriens : ntdll/tests: Free memory after use.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: f75e4bf0de4f9f907030cffe7c8556f5921230ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75e4bf0de4f9f907030cffe7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 10 12:09:38 2008 +0200 ntdll/tests: Free memory after use. --- dlls/ntdll/tests/port.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index f30cdc8..0bb1ff7 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -225,6 +225,9 @@ static DWORD WINAPI test_ports_client(LPVOID arg) ok(!lstrcmp((LPSTR)out->Data, REPLY), "Expected %s, got %s\n", REPLY, out->Data); ok(out->MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->MessageType); + HeapFree(GetProcessHeap(), 0, out); + HeapFree(GetProcessHeap(), 0, LpcMessage); + return 0; } @@ -290,6 +293,7 @@ static void test_ports_server(void) case LPC_CLIENT_DIED: ok(done, "Expected LPC request to be completed!\n"); + HeapFree(GetProcessHeap(), 0, LpcMessage); return; default: @@ -297,6 +301,8 @@ static void test_ports_server(void) break; } } + + HeapFree(GetProcessHeap(), 0, LpcMessage); } START_TEST(port)

1 0

Francois Gouget : notepad: Improve handling of quoted filenames.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 5bc7b784cbcf386a99f96238a0f488eb0eb9b4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc7b784cbcf386a99f96238a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 10 10:20:19 2008 +0200 notepad: Improve handling of quoted filenames. --- programs/notepad/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index fb84487..f231f20 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -571,8 +571,13 @@ static void HandleCommandLine(LPWSTR cmdline) if (cmdline[0] == '"') { + WCHAR* wc; cmdline++; - cmdline[lstrlen(cmdline) - 1] = 0; + wc=cmdline; + /* Note: Double-quotes are not allowed in Windows filenames */ + while (*wc && *wc != '"') wc++; + /* On Windows notepad ignores further arguments too */ + *wc = 0; } if (FileExists(cmdline))

1 0

Alexandre Julliard : winetest: Display unknown versions as "Other" instead of ignoring them.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: tools Branch: master Commit: 6835d1dfc9a48e1190680ee4b0e0befe74e3f5f0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6835d1dfc9a48e1190680ee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 17:20:26 2008 +0200 winetest: Display unknown versions as "Other" instead of ignoring them. --- winetest/build-index | 27 ++++++++++++++------------- winetest/gather | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 7b708f9..66b10a2 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -17,23 +17,24 @@ binmode STDOUT, ':utf8'; $ENV{GIT_DIR} = $gitdir; -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %wine = (name => "Wine"); +my %w95 = (name => "Win95"); +my %w98 = (name => "Win98"); +my %me = (name => "Me"); +my %nt3 = (name => "NT3"); +my %nt4 = (name => "NT4"); +my %w2k = (name => "2000"); +my %xp = (name => "XP"); +my %w2k3 = (name => "2003"); +my %vista = (name => "Vista"); +my %unknown = (name => "Other"); +my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes -my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, - 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, wine=>\%wine); +my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/gather b/winetest/gather index 28431ed..6c06b39 100755 --- a/winetest/gather +++ b/winetest/gather @@ -81,23 +81,24 @@ my $summary_version=4; # errors The number of unit tests with errors. # todos The number of unit tests with no error but todos. -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %wine = (name => "Wine"); +my %w95 = (name => "Win95"); +my %w98 = (name => "Win98"); +my %me = (name => "Me"); +my %nt3 = (name => "NT3"); +my %nt4 = (name => "NT4"); +my %w2k = (name => "2000"); +my %xp = (name => "XP"); +my %w2k3 = (name => "2003"); +my %vista = (name => "Vista"); +my %unknown = (name => "Other"); +my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes -my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, - 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, wine=>\%wine); +my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;

1 0

Alexandre Julliard : user32/tests: Fix a window style check on Vista.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: d93fa6a1e7e4b38e340b4c7011eea1b05c5f8adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93fa6a1e7e4b38e340b4c701… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 13:03:37 2008 +0200 user32/tests: Fix a window style check on Vista. --- dlls/user32/tests/win.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 45dda82..e8368d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -730,10 +730,10 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info) ok(info->dwStyle == (DWORD)GetWindowLongA(hwnd, GWL_STYLE), "wrong dwStyle: %08x != %08x\n", info->dwStyle, GetWindowLongA(hwnd, GWL_STYLE)); - /* Windows reports a not documented exstyle 0x800 in WINDOWINFO, but - * doesn't return it in GetWindowLong(hwnd, GWL_EXSTYLE). + /* Windows reports some undocumented exstyles in WINDOWINFO, but + * doesn't return them in GetWindowLong(hwnd, GWL_EXSTYLE). */ - ok((info->dwExStyle & ~0x800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE), + ok((info->dwExStyle & ~0xe0000800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE), "wrong dwExStyle: %08x != %08x\n", info->dwExStyle, GetWindowLongA(hwnd, GWL_EXSTYLE)); status = (GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0; ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x\n",

1 0

Alexandre Julliard : kernel32/tests: Limit the number of failures in the ligatures test.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 5b0c326679d4a377b5beacca2962c93253737294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0c326679d4a377b5beacca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 11:55:01 2008 +0200 kernel32/tests: Limit the number of failures in the ligatures test. --- dlls/kernel32/tests/locale.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0c10bb4..c234921 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1954,7 +1954,7 @@ static void test_FoldStringW(void) EXPECT_LEN(sizeof(ligatures_dst)/sizeof(ligatures_dst[0])); EXPECT_VALID; ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)), "MAP_EXPAND_LIGATURES: Expanded incorrectly\n"); - for (i = 1; i <= 0xffff; i++) + for (i = 1, failures = 0; i <= 0xffff; i++) { if (!strchrW(ligatures_src, i)) { @@ -1963,9 +1963,18 @@ static void test_FoldStringW(void) SetLastError(0); ret = pFoldStringW(MAP_EXPAND_LIGATURES, src, -1, dst, 256); EXPECT_LEN(2); EXPECT_VALID; - ok(dst[0] == src[0], - "MAP_EXPAND_LIGATURES: 0x%02x : Expected 0x%02x, got 0x%02x\n", - i, src[0], dst[0]); + if (ret == 3) + ok(0, "MAP_EXPAND_LIGATURES: %04x : Expected %04x, got %04x %04x\n", + i, src[0], dst[0], dst[1]); + else + ok(dst[0] == src[0], + "MAP_EXPAND_LIGATURES: %04x : Expected %04x, got %04x\n", + i, src[0], dst[0]); + if (dst[0] != src[0] && ++failures > 50) + { + trace( "MAP_EXPAND_LIGATURES: Too many failures, giving up\n" ); + break; + } } } }

1 0