wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : ieframe/tests: Allow non-zero initial session counter value.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 5fac8fb5fd97919840bcdc2671d4be532007bf4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fac8fb5fd97919840bcdc26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:53:42 2021 +0100 ieframe/tests: Allow non-zero initial session counter value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 903c1062b6c..ab0345b79b5 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4419,25 +4419,22 @@ static void test_SetAdvise(void) static void test_SetQueryNetSessionCount(void) { - LONG count; + LONG count, init_count; - count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 0, "count = %d\n", count); + init_count = pSetQueryNetSessionCount(SESSION_QUERY); + trace("init_count %d\n", init_count); count = pSetQueryNetSessionCount(SESSION_INCREMENT); - ok(count == 1, "count = %d\n", count); + ok(count == init_count + 1, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 1, "count = %d\n", count); - - count = pSetQueryNetSessionCount(0xdeadbeef); - ok(count == 0, "count = %d\n", count); + ok(count == init_count + 1, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_DECREMENT); - ok(count == 0, "count = %d\n", count); + ok(count == init_count, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 0, "count = %d\n", count); + ok(count == init_count, "count = %d\n", count); } static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)

1 0

Francois Gouget : atl80/tests: Request an older version of atl80 for compatibility.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: ac0c8e805df689e9498e5171f25823dddb7be967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0c8e805df689e9498e5171… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 15:05:49 2021 +0100 atl80/tests: Request an older version of atl80 for compatibility. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl80/tests/atl80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest index 712793fcb1b..fa833e28927 100644 --- a/dlls/atl80/tests/atl80.manifest +++ b/dlls/atl80/tests/atl80.manifest @@ -12,7 +12,7 @@ <assemblyIdentity type="win32" name="microsoft.vc80.atl" - version="8.0.50727.4053" + version="8.0.50727.42" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b" language="*"

1 0

Jacek Caban : mshtml: Fix navigator.toString() in IE9+ compat modes.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 4238faa0a01548c22451c32c0fa892ce36277d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4238faa0a01548c22451c32c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:34:06 2021 +0100 mshtml: Fix navigator.toString() in IE9+ compat modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a98f6293d29..94616a7db78 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1315,7 +1315,8 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) if(!String) return E_INVALIDARG; - *String = SysAllocString(L"[object]"); + *String = SysAllocString(dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 + ? L"[object]" : L"[object Navigator]"); return *String ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c97e1b4f276..ec23ab8d494 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -375,4 +375,6 @@ sync_test("navigator", function() { ok(navigator.appCodeName === "Mozilla", "appCodeName = " + navigator.appCodeName); ok(navigator.appName === (v < 11 ? "Microsoft Internet Explorer" : "Netscape"), "appName = " + navigator.appName); + ok(navigator.toString() === (v < 9 ? "[object]" : "[object Navigator]"), + "navigator.toString() = " + navigator.toString()); });

1 0

Jacek Caban : mshtml: Use "Netscape" as appName in IE11 compat mode.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 53cc70caa494fe3dea1d650865411432153a0aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cc70caa494fe3dea1d6508… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:34:01 2021 +0100 mshtml: Use "Netscape" as appName in IE11 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 30333347e64..a98f6293d29 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1150,7 +1150,8 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(L"Microsoft Internet Explorer"); + *p = SysAllocString(dispex_compat_mode(&This->dispex) == COMPAT_MODE_IE11 + ? L"Netscape" : L"Microsoft Internet Explorer"); if(!*p) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 76c9b828805..c97e1b4f276 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -371,4 +371,8 @@ sync_test("navigator", function() { ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + "\\.0; Windows NT [^\$]*\\)$" : "^5.0 \$Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*rv:11.0\$ like Gecko$"; ok(new RegExp(re).test(app), "appVersion = " + app); + + ok(navigator.appCodeName === "Mozilla", "appCodeName = " + navigator.appCodeName); + ok(navigator.appName === (v < 11 ? "Microsoft Internet Explorer" : "Netscape"), + "appName = " + navigator.appName); });

1 0

Jacek Caban : mshtml: Report user agent matching current compat mode.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: bbb46e819d16ab18586e1d8745d61ce190c0c026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb46e819d16ab18586e1d87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:52 2021 +0100 mshtml: Report user agent matching current compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 25 +++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 12 ++++++++++++ dlls/mshtml/tests/dom.c | 12 ++---------- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e6ce680f08b..30333347e64 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1157,6 +1157,27 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) return S_OK; } +static unsigned int get_ua_version(OmNavigator *navigator) +{ + switch(dispex_compat_mode(&navigator->dispex)) { + case COMPAT_MODE_QUIRKS: + return UAS_EXACTLEGACY | 7; + case COMPAT_MODE_IE5: + case COMPAT_MODE_IE7: + return 7; + case COMPAT_MODE_IE8: + return 8; + case COMPAT_MODE_IE9: + return 9; + case COMPAT_MODE_IE10: + return 10; + case COMPAT_MODE_IE11: + return 11; + } + assert(0); + return 0; +} + static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); @@ -1169,7 +1190,7 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); size = sizeof(user_agent); - hres = ObtainUserAgentString(0, user_agent, &size); + hres = ObtainUserAgentString(get_ua_version(This), user_agent, &size); if(FAILED(hres)) return hres; @@ -1197,7 +1218,7 @@ static HRESULT WINAPI OmNavigator_get_userAgent(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); size = sizeof(user_agent); - hres = ObtainUserAgentString(0, user_agent, &size); + hres = ObtainUserAgentString(get_ua_version(This), user_agent, &size); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b079042afff..76c9b828805 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -360,3 +360,15 @@ async_test("script_load", function() { elem.src = "jsstream.php?simple"; external.writeStream("simple", "ready_states += 'exec,';"); }); + +sync_test("navigator", function() { + var v = document.documentMode, re; + var app = navigator.appVersion; + ok(navigator.userAgent === "Mozilla/" + app, + "userAgent = " + navigator.userAgent + " appVersion = " + app); + + re = v < 11 + ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + "\\.0; Windows NT [^\$]*\\)$" + : "^5.0 \$Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*rv:11.0\$ like Gecko$"; + ok(new RegExp(re).test(app), "appVersion = " + app); +}); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3c9deec7d0b..de33e6c73a5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6383,25 +6383,17 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); ok(hres == S_OK, "get_userAgent failed: %08x\n", hres); + todo_wine ok(!lstrcmpW(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); SysFreeString(bstr); - if(!wcsncmp(buf, L"Mozilla/", 8)) { - bstr = NULL; - hres = IOmNavigator_get_appVersion(navigator, &bstr); - ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); - ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); - SysFreeString(bstr); - }else { - skip("nonstandard user agent\n"); - } - hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + todo_wine ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); SysFreeString(bstr);

1 0

Jacek Caban : include: Add UAS_EXACTLEGACY define.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 5d11104689c6e0b21a13e450b9a04c89e1ea47e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11104689c6e0b21a13e450… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:40 2021 +0100 include: Add UAS_EXACTLEGACY define. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 4 ++-- dlls/urlmon/tests/misc.c | 4 ++-- include/urlmon.idl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 3a843cd6593..0596c1df75f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -514,8 +514,8 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) size_t len = 0; HKEY key; - if(version & 0x1000) { - version &= ~0x1000; + if(version & UAS_EXACTLEGACY) { + version &= ~UAS_EXACTLEGACY; if(version == 7) quirks = TRUE; else diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d64dcc5965d..2b3df65d5fc 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1515,7 +1515,7 @@ static void test_user_agent(void) if (i != 7) { size = sizeof(ua); - hres = pObtainUserAgentString(i | 0x1000, ua, &size); + hres = pObtainUserAgentString(i | UAS_EXACTLEGACY, ua, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", @@ -1523,7 +1523,7 @@ static void test_user_agent(void) } size = sizeof(ua); - hres = pObtainUserAgentString(i != 1 ? i : 0x1007, ua, &size); + hres = pObtainUserAgentString(i != 1 ? i : UAS_EXACTLEGACY | 7, ua, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); if(i < 8 && i != 1) diff --git a/include/urlmon.idl b/include/urlmon.idl index fd8d6ce7bc8..867d3ebc959 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2113,6 +2113,8 @@ struct CONFIRMSAFETY DWORD dwFlags; }; +cpp_quote("#define UAS_EXACTLEGACY 0x1000") + cpp_quote("EXTERN_C const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY;") cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);")

1 0

Jacek Caban : urlmon: Fix user agent suffix separator handling.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: c034da78df60c81edc9b2f91c8e13b5744b5dadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c034da78df60c81edc9b2f91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:20 2021 +0100 urlmon: Fix user agent suffix separator handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 19 +++++++++---------- dlls/urlmon/tests/misc.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 0a1be0ba367..3a843cd6593 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -550,22 +550,22 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) if(sizeof(void*) == 8) #ifdef __x86_64__ - os_type = L"Win64; x64; "; + os_type = L"; Win64; x64"; #else - os_type = L"Win64; "; + os_type = L"; Win64"; #endif else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) - os_type = L"WOW64; "; + os_type = L"; WOW64"; else os_type = L""; - swprintf(ret + len, size - len, L"Windows %s%d.%d; %s", is_nt, info.dwMajorVersion, + swprintf(ret + len, size - len, L"Windows %s%d.%d%s", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = lstrlenW(ret); if(!quirks) { - wcscpy(ret + len, L"Trident/7.0"); - len += ARRAY_SIZE(L"Trident/7.0") - 1; + wcscpy(ret + len, L"; Trident/7.0"); + len += ARRAY_SIZE(L"; Trident/7.0") - 1; } if(version < 9) { @@ -575,10 +575,9 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) DWORD value_len, idx; for(idx = 0;; idx++) { - if(idx) { - ret[len++] = ';'; - ret[len++] = ' '; - } + ret[len++] = ';'; + ret[len++] = ' '; + value_len = size - len - 2; res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5f468b80286..d64dcc5965d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1560,6 +1560,9 @@ static void test_user_agent(void) if(i == 11) { p += check_prefix(p, "; rv:11.0) like Gecko"); }else { + if(i != 1) + ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", + wine_dbgstr_a(p), i); if(i < 9) p = strchr(p, ')'); p += check_prefix(p, ")");

1 0

Jacek Caban : mshtml/tests: Allow typeof(localStorage) to be unknown.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: f2e50eedb98105a6f51088052497d4ac2036519f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e50eedb98105a6f5108805… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:14 2021 +0100 mshtml/tests: Allow typeof(localStorage) to be unknown. Fixes tests on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e1c60d6ea53..a18ce409a9b 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -398,7 +398,7 @@ sync_test("stylesheets", function() { sync_test("storage", function() { ok(typeof(window.sessionStorage) === "object", "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); - ok(typeof(window.localStorage) === "object", + ok(typeof(window.localStorage) === "object" || typeof(window.localStorage) === "unknown", "typeof(window.localStorage) = " + typeof(window.localStorage)); });

1 0

Jacek Caban : mshtml/tests: Allow error when loading an image in events.html.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 8979458f45aac9e7b39597497411a377f9bc818c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8979458f45aac9e7b3959749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:08 2021 +0100 mshtml/tests: Allow error when loading an image in events.html. Fixes tests on win8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index a58b0e361d6..955e4853b92 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -323,6 +323,10 @@ img.onload = function() { trace("img.onload"); img_onload_called = true; } +img.onerror = function() { + trace("img.onerror"); + img_onload_called = true; +} </script> </head> <body>

1 0

Rémi Bernon : windows.globalization: Fake empty IGlobalizationPreferencesStatics properties.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 6c7db4ba5e1bf0eb78f026e8d9403d83a1852e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c7db4ba5e1bf0eb78f026e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 26 10:24:59 2021 +0100 windows.globalization: Fake empty IGlobalizationPreferencesStatics properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/main.c | 6 ++-- dlls/windows.globalization/tests/globalization.c | 36 +++++++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 9aa07700310..1c41e77d41b 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -375,21 +375,21 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Calendars( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Clocks( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Currencies( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index a2b47e53be5..b824cfdf8ae 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -47,7 +47,7 @@ static void test_GlobalizationPreferences(void) static const WCHAR *class_name = L"Windows.System.UserProfile.GlobalizationPreferences"; IGlobalizationPreferencesStatics *preferences_statics = NULL; - IVectorView_HSTRING *languages = NULL; + IVectorView_HSTRING *languages = NULL, *calendars, *clocks, *currencies; IActivationFactory *factory = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; @@ -178,6 +178,40 @@ static void test_GlobalizationPreferences(void) IVectorView_HSTRING_Release(languages); + + hr = IGlobalizationPreferencesStatics_get_Calendars(preferences_statics, &calendars); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Calendars failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(calendars, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(calendars); + + + hr = IGlobalizationPreferencesStatics_get_Clocks(preferences_statics, &clocks); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Clocks failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(clocks, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(clocks); + + + hr = IGlobalizationPreferencesStatics_get_Currencies(preferences_statics, &currencies); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Currencies failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(currencies, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(currencies); + + IGlobalizationPreferencesStatics_Release(preferences_statics); IAgileObject_Release(agile_object);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021