February 2011 - Wine-commits

Austin English : shell32/tests: Remove win9x hacks.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: d710056e4da3d8d3b211c3bee3bb63d57b11bb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d710056e4da3d8d3b211c3bee… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:40:28 2011 -0800 shell32/tests: Remove win9x hacks. --- dlls/shell32/tests/systray.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 1f505ec..23d3034 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -45,19 +45,15 @@ static void test_cbsize(void) nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); nidW.uCallbackMessage = WM_USER+17; ret = pShell_NotifyIconW(NIM_ADD, &nidW); - if (ret) - { - /* using an invalid cbSize does work */ - nidW.cbSize = 3; - nidW.hWnd = hMainWnd; - nidW.uID = 1; - ret = pShell_NotifyIconW(NIM_DELETE, &nidW); - ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); - /* as icon doesn't exist anymore - now there will be an error */ - nidW.cbSize = sizeof(nidW); - ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); - } - else win_skip( "Shell_NotifyIconW not working\n" ); /* win9x */ + /* using an invalid cbSize does work */ + nidW.cbSize = 3; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + ret = pShell_NotifyIconW(NIM_DELETE, &nidW); + ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidW.cbSize = sizeof(nidW); + ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); } /* same for Shell_NotifyIconA */ @@ -75,7 +71,7 @@ static void test_cbsize(void) nidA.hWnd = hMainWnd; nidA.uID = 1; ret = Shell_NotifyIconA(NIM_DELETE, &nidA); - ok( ret || broken(!ret), /* win9x */ "NIM_DELETE failed!\n"); + ok(ret, "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidA.cbSize = sizeof(nidA); ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n");

1 0

Łukasz Wojniłowicz : Correct misspelled word in Polish news translations
by Jeremy Newman 24 Feb '11

24 Feb '11

1 0

Jacek Caban : mshtml: Make sure we don' t try to create node object for attributes.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 6fe3c709e2b31ce9e4b0f0c15d66097bd7d4cfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe3c709e2b31ce9e4b0f0c15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:39 2011 +0100 mshtml: Make sure we don't try to create node object for attributes. --- dlls/mshtml/htmlnode.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e521850..1dc50ab 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1033,6 +1033,9 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod *ret = &comment->node; break; } + case ATTRIBUTE_NODE: + ERR("Called on attribute node\n"); + return E_UNEXPECTED; default: { HTMLDOMNode *node;

1 0

Jacek Caban : mshtml: Improved debug traces.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: ceff92a512645c02e1b5fbd9a48dd6a549f7f0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceff92a512645c02e1b5fbd9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:49 2011 +0100 mshtml: Improved debug traces. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index c4f7945..3e528bf 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -547,7 +547,7 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu { HTMLDocumentNode *This = impl_from_nsIDocumentObserver(iface); - TRACE("\n"); + TRACE("(%p)\n", This); if(This->skip_mutation_notif) return;

1 0

Maarten Lankhorst : ntdll: Fix time accounting in NtQuerySystemInformation.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: f45b6c54bec52e9a8429fafa7a663edf98c98422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b6c54bec52e9a8429fafa7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 23 14:12:22 2011 +0100 ntdll: Fix time accounting in NtQuerySystemInformation. --- dlls/ntdll/nt.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6165082..8b4f09c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1586,26 +1586,35 @@ NTSTATUS WINAPI NtQuerySystemInformation( FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) { - unsigned usr,nice,sys; - unsigned long idle; + unsigned long usr,nice,sys,idle,remainder[8]; int count; char name[10]; char line[255]; /* first line is combined usage */ if (fgets(line,255,cpuinfo)) - count = sscanf(line, "%s %u %u %u %lu", name, &usr, &nice, - &sys, &idle); + count = sscanf(line, "%s %lu %lu %lu %lu " + "%lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], + &remainder[3], &remainder[4], &remainder[5], + &remainder[6], &remainder[7]); else count = 0; /* we set this up in the for older non-smp enabled kernels */ - if (count == 5 && strcmp(name, "cpu") == 0) + if (count >= 5 && strcmp(name, "cpu") == 0) { + int i; + for (i = 0; i + 5 < count; ++i) + sys += remainder[i]; + usr += nice; sppi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); sppi->IdleTime.QuadPart = idle; sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr; + sppi->UserTime.QuadPart = usr+nice; + sppi->Reserved1[0].QuadPart = 0; + sppi->Reserved1[1].QuadPart = 0; cpus = 1; len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); } @@ -1613,12 +1622,20 @@ NTSTATUS WINAPI NtQuerySystemInformation( do { if (fgets(line, 255, cpuinfo)) - count = sscanf(line, "%s %u %u %u %lu", name, &usr, - &nice, &sys, &idle); + count = sscanf(line, "%s %lu %lu %lu %lu " + "%lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], + &remainder[3], &remainder[4], &remainder[5], + &remainder[6], &remainder[7]); else count = 0; - if (count == 5 && strncmp(name, "cpu", 3)==0) + if (count >= 5 && strncmp(name, "cpu", 3)==0) { + int i; + for (i = 0; i + 5 < count; ++i) + sys += remainder[i]; + usr += nice; out_cpus --; if (name[3]=='0') /* first cpu */ { @@ -1633,6 +1650,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( sppi[cpus].IdleTime.QuadPart = idle; sppi[cpus].KernelTime.QuadPart = sys; sppi[cpus].UserTime.QuadPart = usr; + sppi[cpus].Reserved1[0].QuadPart = 0; + sppi[cpus].Reserved1[1].QuadPart = 0; cpus++; } }

1 0

Dmitry Timoshkov : gdi32: EnumFontFamilies should also match against fully qualified face name.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 2aaf6c2c8cdde2e09ddfa745f1dab48cbf693769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaf6c2c8cdde2e09ddfa745f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:54:25 2011 +0800 gdi32: EnumFontFamilies should also match against fully qualified face name. --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 506c994..512e08b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4064,6 +4064,54 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static BOOL family_matches(Family *family, const LOGFONTW *lf) +{ + struct list *face_elem_ptr; + + if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (strlenW(family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + continue; + } + + strcpyW(full_family_name, family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; + } + + return FALSE; +} + +static BOOL face_matches(Face *face, const LOGFONTW *lf) +{ + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + + if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + + if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + return FALSE; + } + + strcpyW(full_family_name, face->family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + return !strcmpiW(lf->lfFaceName, full_family_name); +} + /************************************************************* * WineEngEnumFonts * @@ -4107,9 +4155,12 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(plf->lfFaceName, family->FamilyName)) { + if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (!face_matches(face, plf)) continue; + GetEnumStructs(face, &elf, &ntm, &type); for(i = 0; i < 32; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */

1 0

Dmitry Timoshkov : gdi32: Add a EnumFontFamilies test to see how it handles various font faces.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 1b041c92cb770d2bcb9ef00d93599d542cdc9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b041c92cb770d2bcb9ef00d9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:55:03 2011 +0800 gdi32: Add a EnumFontFamilies test to see how it handles various font faces. --- dlls/gdi32/tests/font.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8bce92b..a9a8755 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3483,6 +3483,101 @@ static void test_AddFontMemResource(void) free_font(font); } +static INT CALLBACK enum_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + + lf = (LOGFONT *)lparam; + *lf = *elf; + return 0; +} + +static INT CALLBACK enum_all_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + int ret; + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + lf = (LOGFONT *)lparam; + ret = strcmp(lf->lfFaceName, elf->lfFaceName); + if(ret == 0) + { + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + *lf = *elf; + return 0; + } + return 1; +} + +static void test_EnumFonts(void) +{ + int ret; + LOGFONT lf; + HDC hdc; + + if (!is_truetype_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + /* Windows uses localized font face names, so Arial Bold won't be found */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("User locale is not English, skipping the test\n"); + return; + } + + hdc = CreateCompatibleDC(0); + + ret = EnumFontFamilies(hdc, "Arial", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + ret = EnumFontFamilies(hdc, "Arial Bold", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Bold Italic", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold Italic is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold Italic"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold Italic should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Italic Bold", enum_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + lstrcpy(lf.lfFaceName, "Arial Italic Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -3504,6 +3599,7 @@ START_TEST(font) test_orientation(); test_height_selection(); test_AddFontMemResource(); + test_EnumFonts(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test.

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: c796ae653c4483949988119950ff1d60c4b68924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c796ae653c448394998811995… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 00:56:37 2011 -0800 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/bitmap.c | 300 +++++++++++++++----------------------------- 1 files changed, 102 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c796ae653c44839499881…

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 291949cbc48fb8217734aa7837004a6a08c34f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291949cbc48fb8217734aa783… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 01:38:49 2011 -0800 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/path.c | 35 ++++++----------------------------- 1 files changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 741f47f..ba47910 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1564,8 +1564,7 @@ static void test_SearchPathA(void) SetLastError(0xdeadbeef); ret = pSearchPathA(pathA, fileA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER || - broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* win9x */, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); } @@ -1581,16 +1580,6 @@ static void test_SearchPathW(void) return; } - /* SearchPathW is a stub on win9x and doesn't return sane error, - so quess if it's implemented indirectly */ - SetLastError(0xdeadbeef); - GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("SearchPathW not implemented\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ @@ -1609,7 +1598,7 @@ static void test_GetFullPathNameA(void) { char output[MAX_PATH], *filepart; DWORD ret; - int is_win9x, i; + int i; const struct { @@ -1617,31 +1606,20 @@ static void test_GetFullPathNameA(void) DWORD len; LPSTR buffer; LPSTR *lastpart; - int win9x_crash; } invalid_parameters[] = { - {NULL, 0, NULL, NULL, 1}, - {NULL, MAX_PATH, NULL, NULL, 1}, - {NULL, MAX_PATH, output, NULL, 1}, - {NULL, MAX_PATH, output, &filepart, 1}, + {NULL, 0, NULL, NULL}, + {NULL, MAX_PATH, NULL, NULL}, + {NULL, MAX_PATH, output, NULL}, + {NULL, MAX_PATH, output, &filepart}, {"", 0, NULL, NULL}, {"", MAX_PATH, NULL, NULL}, {"", MAX_PATH, output, NULL}, {"", MAX_PATH, output, &filepart}, }; - SetLastError(0xdeadbeef); - ret = GetFullPathNameW(NULL, 0, NULL, NULL); - is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; - - if (is_win9x) - win_skip("Skipping some tests that cause GetFullPathNameA to crash on Win9x\n"); - for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) { - if (is_win9x && invalid_parameters[i].win9x_crash) - continue; - SetLastError(0xdeadbeef); strcpy(output, "deadbeef"); filepart = (char *)0xdeadbeef; @@ -1653,7 +1631,6 @@ static void test_GetFullPathNameA(void) ok(!strcmp(output, "deadbeef"), "[%d] Expected the output buffer to be unchanged, got \"%s\"\n", i, output); ok(filepart == (char *)0xdeadbeef, "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart); ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_BAD_PATHNAME || /* Win9x */ GetLastError() == ERROR_INVALID_NAME, /* Win7 */ "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", i, GetLastError());

1 0

Austin English : version/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 35a39e3cf6afa2ded91b96369597ff4d974c16bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a39e3cf6afa2ded91b96369… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 19:12:33 2011 -0800 version/tests: Remove win9x hacks. --- dlls/version/tests/info.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e4badbe..e689017 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -178,7 +178,6 @@ static void test_info_size(void) ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || - GetLastError() == ERROR_BAD_FORMAT || /* win9x */ GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); @@ -501,12 +500,10 @@ static void test_VerQueryValue(void) ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 got %x\n", len); + ok(len == 0, "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -570,12 +567,10 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 or 0xbeef, got %x\n", len); + ok(len == 0, "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver);

1 0