November 2023 - Wine-Commits

Dmitry Timoshkov : shell32: Improve FolderView2::GetViewModeAndIconSize() stub.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: a8e1ab6422f6028a260fafde40ddfdc24f334a61 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e1ab6422f6028a260fafde40ddfd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 4 11:11:04 2022 +0300 shell32: Improve FolderView2::GetViewModeAndIconSize() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shlview.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d6b917496c2..83fb206af52 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3038,8 +3038,13 @@ static HRESULT WINAPI FolderView2_GetViewModeAndIconSize(IFolderView2 *iface, FO int *size) { IShellViewImpl *This = impl_from_IFolderView2(iface); + FIXME("(%p)->(%p %p), stub\n", This, mode, size); - return E_NOTIMPL; + + *size = 16; /* FIXME */ + *mode = This->FolderSettings.ViewMode; + + return S_OK; } static HRESULT WINAPI FolderView2_SetGroupSubsetCount(IFolderView2 *iface, UINT visible_rows)

1 0

Michael Stefaniuc : quartz: Remove redudant NULL checks before CoTaskMemFree().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 466c97008c197fa4304a219f12c6c55cc9697cec URL: https://gitlab.winehq.org/wine/wine/-/commit/466c97008c197fa4304a219f12c6c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:30:35 2023 +0100 quartz: Remove redudant NULL checks before CoTaskMemFree(). --- dlls/quartz/tests/mpegsplit.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index f002d0228e2..73d021b6297 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -2004,9 +2004,7 @@ static void test_streamselect(IAMStreamSelect *sel) todo_wine ok(name && !wcscmp(name, L"Stream(E0)"), "Got name %ls.\n", name ? name : L"(null)"); todo_wine ok(object == unk_video, "Got object %p, expected %p.\n", object, unk_video); ok(unk == NULL, "Got unknown %p.\n", unk); - - if (name) - CoTaskMemFree(name); + CoTaskMemFree(name); if (mt) DeleteMediaType(mt); if (object) @@ -2023,9 +2021,7 @@ static void test_streamselect(IAMStreamSelect *sel) todo_wine ok(name && !wcscmp(name, L"Stream(C0)"), "Got name %ls.\n", name ? name : L"(null)"); todo_wine ok(object == unk_audio, "Got object %p, expected %p.\n", object, unk_audio); ok(unk == NULL, "Got unknown %p.\n", unk); - - if (name) - CoTaskMemFree(name); + CoTaskMemFree(name); if (mt) DeleteMediaType(mt); if (object)

1 0

Nell Hardcastle : hidclass.sys: Add DualSense Edge to device_strings.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 12f50afe9a1bce267ca0d154e53d71a837929419 URL: https://gitlab.winehq.org/wine/wine/-/commit/12f50afe9a1bce267ca0d154e53d71… Author: Nell Hardcastle <nell(a)dev-nell.com> Date: Sun Nov 19 09:27:41 2023 -0800 hidclass.sys: Add DualSense Edge to device_strings. --- dlls/hidclass.sys/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d673a8c2e88..8fde1fe10a5 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -403,6 +403,7 @@ static const struct device_strings device_strings[] = { .id = L"VID_054C&PID_09CC", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0BA0", .product = L"Wireless Controller" }, { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, + { .id = L"VID_054C&PID_0DF2", .product = L"Wireless Controller" }, }; static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index )

1 0

Marc-Aurel Zent : ntdll: Use IOPowerSources API to fill battery info on macOS.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: f715f400dc44c58035f6cbcb410a4b30d8cce58d URL: https://gitlab.winehq.org/wine/wine/-/commit/f715f400dc44c58035f6cbcb410a4b… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Sat Feb 25 01:29:15 2023 +0100 ntdll: Use IOPowerSources API to fill battery info on macOS. --- dlls/ntdll/unix/system.c | 107 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 501b6997a6d..a6f1382a5fa 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -57,8 +57,7 @@ #ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> -# include <IOKit/pwr_mgt/IOPM.h> -# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPSKeys.h> # include <IOKit/ps/IOPowerSources.h> # include <mach/mach.h> # include <mach/machine.h> @@ -3580,66 +3579,106 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { - CFArrayRef batteries; - CFDictionaryRef battery; - CFNumberRef prop; - uint32_t value, voltage; - CFTimeInterval remain; + CFTypeRef blob = IOPSCopyPowerSourcesInfo(); + CFArrayRef sources = IOPSCopyPowerSourcesList( blob ); + CFIndex count, i; + CFDictionaryRef source = NULL; + CFTypeRef prop; + Boolean is_charging, is_internal, is_present; + int32_t value, voltage; - if (IOPMCopyBatteryInfo( 0, &batteries ) != kIOReturnSuccess) + if (!sources) + { + if (blob) CFRelease( blob ); return STATUS_ACCESS_DENIED; + } + + count = CFArrayGetCount( sources ); + + for (i = 0; i < count; i++) + { + source = IOPSGetPowerSourceDescription( blob, CFArrayGetValueAtIndex( sources, i ) ); + + if (!source) + continue; + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSTransportTypeKey) ); + is_internal = !CFStringCompare( prop, CFSTR(kIOPSInternalType), 0 ); + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSIsPresentKey) ); + is_present = CFBooleanGetValue( prop ); + + if (is_internal && is_present) + break; + } - if (CFArrayGetCount( batteries ) == 0) + CFRelease( blob ); + + if (!source) { - /* Just assume we're on AC with no battery. */ + /* Just assume we're on AC with no internal power source. */ bs->AcOnLine = TRUE; + CFRelease( sources ); return STATUS_SUCCESS; } - /* Just use the first battery. */ - battery = CFArrayGetValueAtIndex( batteries, 0 ); - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->BatteryPresent = TRUE; - if (value & kIOBatteryInstalled) - bs->BatteryPresent = TRUE; - else - /* Since we are executing code, we must have AC power. */ - bs->AcOnLine = TRUE; - if (value & kIOBatteryChargerConnect) + prop = CFDictionaryGetValue( source, CFSTR(kIOPSIsChargingKey) ); + is_charging = CFBooleanGetValue( prop ); + + prop = CFDictionaryGetValue( source, CFSTR(kIOPSPowerSourceStateKey) ); + + if (!CFStringCompare( prop, CFSTR(kIOPSACPowerValue), 0 )) { bs->AcOnLine = TRUE; - if (value & kIOBatteryCharge) + if (is_charging) bs->Charging = TRUE; } else bs->Discharging = TRUE; /* We'll need the voltage to be able to interpret the other values. */ - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSVoltageKey) ); + if (prop) + CFNumberGetValue( prop, kCFNumberIntType, &voltage ); + else + /* kIOPSVoltageKey is optional and might not be populated. + * Assume 11.4 V then, which is a common value for Apple laptops. */ + voltage = 11400; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSMaxCapacityKey) ); + CFNumberGetValue( prop, kCFNumberIntType, &value ); bs->MaxCapacity = value * voltage; /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow * Windows for now (5% and 33%). */ bs->DefaultAlert1 = bs->MaxCapacity / 20; bs->DefaultAlert2 = bs->MaxCapacity / 3; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + prop = CFDictionaryGetValue( source, CFSTR(kIOPSCurrentCapacityKey) ); + CFNumberGetValue( prop, kCFNumberIntType, &value ); bs->RemainingCapacity = value * voltage; - prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); - CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); - bs->Rate = value * voltage; + prop = CFDictionaryGetValue( source, CFSTR(kIOPSCurrentKey) ); + if (prop) + CFNumberGetValue( prop, kCFNumberIntType, &value ); + else + /* kIOPSCurrentKey is optional and might not be populated. */ + value = 0; + + bs->Rate = value * voltage / 1000; - remain = IOPSGetTimeRemainingEstimate(); - if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) - bs->EstimatedTime = (ULONG)remain; + prop = CFDictionaryGetValue( source, CFSTR(kIOPSTimeToEmptyKey) ); + if (prop) + { + CFNumberGetValue( prop, kCFNumberIntType, &value ); + if (value > 0) + /* A value of -1 indicates "Still Calculating the Time", + * otherwise estimated minutes left on the battery. */ + bs->EstimatedTime = value * 60; + } - CFRelease( batteries ); + CFRelease( sources ); return STATUS_SUCCESS; }

1 0

Nikolay Sivov : dxva2/tests: Skip tests if D3D9 is unusable.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 2dd3a20520dd2a3f18140a0f89ce87b1349caaea URL: https://gitlab.winehq.org/wine/wine/-/commit/2dd3a20520dd2a3f18140a0f89ce87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 19 15:07:53 2023 +0100 dxva2/tests: Skip tests if D3D9 is unusable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index db48f331772..96368602f4a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -695,6 +695,16 @@ done: START_TEST(dxva2) { + IDirect3D9 *d3d; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Failed to initialize D3D9. Skipping tests.\n"); + return; + } + IDirect3D9_Release(d3d); + test_device_manager(); test_video_processor(); test_progressive_device();

1 0

Bernhard Übelacker : uxtheme: Add stub for RefreshImmersiveColorPolicyState.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 71b3d10f953fe6f970d7991666287340ac489130 URL: https://gitlab.winehq.org/wine/wine/-/commit/71b3d10f953fe6f970d79916662873… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Nov 14 17:58:12 2023 +0100 uxtheme: Add stub for RefreshImmersiveColorPolicyState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55898 --- dlls/uxtheme/system.c | 9 +++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index f95a5d598ae..adf90a12cfb 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1253,6 +1253,15 @@ BOOL WINAPI ThemeHooksRemove(void) return TRUE; } +/********************************************************************** + * RefreshImmersiveColorPolicyState (UXTHEME.104) + * + */ +void WINAPI RefreshImmersiveColorPolicyState(void) +{ + FIXME("stub\n"); +} + /********************************************************************** * ShouldSystemUseDarkMode (UXTHEME.138) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 1cf8ae7e418..26dc54d5805 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -42,6 +42,7 @@ 61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection +104 stdcall -noname RefreshImmersiveColorPolicyState() 132 stdcall -noname ShouldAppsUseDarkMode() 133 stdcall -noname AllowDarkModeForWindow(ptr long) 135 stdcall -noname SetPreferredAppMode(long)

1 0

Piotr Caban : msvcrt: Avoid temporary buffer allocation in _mbsrev_l.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: c180a902c066de6e9f55d7486b3189b5ec0c4b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/c180a902c066de6e9f55d7486b3189… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 17 20:28:55 2023 +0100 msvcrt: Avoid temporary buffer allocation in _mbsrev_l. --- dlls/msvcrt/mbcs.c | 50 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e6c0e944255..2e228d77811 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2889,9 +2889,8 @@ size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp) */ unsigned char* CDECL _mbsrev_l(unsigned char* str, _locale_t locale) { - int i, len; - unsigned char *p, *temp; pthreadmbcinfo mbcinfo; + unsigned char *p, tmp; if (!MSVCRT_CHECK_PMT(str)) return NULL; @@ -2904,44 +2903,25 @@ unsigned char* CDECL _mbsrev_l(unsigned char* str, _locale_t locale) if (!mbcinfo->ismbcodepage) return u__strrev(str); - len = _mbslen_l(str, locale); - temp = malloc(len * 2); - if (!temp) - return str; - - /* unpack multibyte string to temp buffer */ - p = str; - for (i = 0; i < len; i++) + for (p = str; *p; p++) { if (_ismbblead_l(*p, locale)) { - temp[i * 2] = *p++; - temp[i * 2 + 1] = *p++; - } - else - { - temp[i * 2] = *p++; - temp[i * 2 + 1] = 0; - } - } - - /* repack it in the reverse order */ - p = str; - for (i = len - 1; i >= 0; i--) - { - if (_ismbblead_l(temp[i * 2], locale)) - { - *p++ = temp[i * 2]; - *p++ = temp[i * 2 + 1]; - } - else - { - *p++ = temp[i * 2]; + if (p[1]) + { + tmp = p[0]; + p[0] = p[1]; + p[1] = tmp; + p++; + } + else + { + /* drop trailing lead char */ + p[0] = 0; + } } } - - free(temp); - return str; + return u__strrev(str); } /*********************************************************************

1 0

Michael Stefaniuc : winegstreamer: Remove redundant NULL check before free().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 7113bef649db0c6006b05aa0a92f58f42651f61b URL: https://gitlab.winehq.org/wine/wine/-/commit/7113bef649db0c6006b05aa0a92f58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:30:11 2023 +0100 winegstreamer: Remove redundant NULL check before free(). --- dlls/winegstreamer/wg_parser.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a526b15712..247810b7796 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1747,11 +1747,8 @@ static NTSTATUS wg_parser_disconnect(void *args) for (i = 0; i < ARRAY_SIZE(parser->input_cache_chunks); i++) { - if (parser->input_cache_chunks[i].data) - { - free(parser->input_cache_chunks[i].data); - parser->input_cache_chunks[i].data = NULL; - } + free(parser->input_cache_chunks[i].data); + parser->input_cache_chunks[i].data = NULL; } return S_OK;

1 0

Piotr Caban : msvcrt: Add _mbsrev tests.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 4623c41100dd4d910829fc10c20ce4474f5d27ae URL: https://gitlab.winehq.org/wine/wine/-/commit/4623c41100dd4d910829fc10c20ce4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 19 12:05:00 2023 +0100 msvcrt: Add _mbsrev tests. --- dlls/msvcrt/tests/string.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b63df4b846d..34338fd4a39 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4671,6 +4671,27 @@ static void test_wcsncpy(void) wine_dbgstr_wn(dst, ARRAY_SIZE(dst))); } +static void test_mbsrev(void) +{ + unsigned char buf[64], *ret; + int cp = _getmbcp(); + + _setmbcp(932); + + strcpy((char *)buf, "\x36\x8c\x8e"); + ret = _mbsrev(buf); + ok(ret == buf, "ret = %p, expected %p\n", ret, buf); + ok(!memcmp(buf, "\x8c\x8e\x36", 4), "buf = %s\n", wine_dbgstr_a((char *)buf)); + + /* test string that ends with leading byte */ + strcpy((char *)buf, "\x36\x8c"); + ret = _mbsrev(buf); + ok(ret == buf, "ret = %p, expected %p\n", ret, buf); + ok(!memcmp(buf, "\x36", 2), "buf = %s\n", wine_dbgstr_a((char *)buf)); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -4831,4 +4852,5 @@ START_TEST(string) test_SpecialCasing(); test__mbbtype(); test_wcsncpy(); + test_mbsrev(); }

1 0

Daniel Lehman : msxml4/tests: Add tests for default namespace.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 712b33c171e1049f94a5cc5b48a5da1aa94bfadb URL: https://gitlab.winehq.org/wine/wine/-/commit/712b33c171e1049f94a5cc5b48a5da… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml4/tests: Add tests for default namespace. --- dlls/msxml4/tests/domdoc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 1784804c0c6..530a481679f 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -67,6 +67,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; + BOOL todo; }; static const struct test tests[] = { @@ -99,6 +100,17 @@ static void test_namespaces_as_attributes(void) { L"nshref" }, /* text */ { L"xmlns:ns=\"nshref\"" }, /* xml */ }, + /* default namespace */ + { + L"<a xmlns=\"nshref\" />", 1, + { L"xmlns" }, /* nodeName */ + { L"xmlns" }, /* prefix */ + { L"" }, /* baseName */ + { L"" }, /* namespaceURI */ + { L"nshref" }, /* text */ + { L"xmlns=\"nshref\"" }, /* xml */ + TRUE, /* todo */ + }, /* no properties or namespaces */ { L"<a />", 0, @@ -125,7 +137,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); + hr = IXMLDOMDocument2_get_firstChild(doc, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -145,7 +157,9 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); @@ -157,8 +171,10 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); + /* MSXML4 can report different results with different service packs */ + ok(hr == S_OK || broken(hr == S_FALSE), "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->prefixes[i]) || broken(!str), + "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -166,8 +182,10 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); + /* MSXML4 can report different results with different service packs */ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]) || broken(!lstrcmpW(str, L"xmlns")), + "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL;

1 0