Francois Gouget : windows.globalization/tests: Fix the GetUserDefaultGeoName() test on Win10 1709.
Alexandre Julliard
julliard at winehq.org
Wed Apr 21 15:57:55 CDT 2021
Module: wine
Branch: master
Commit: 08c6114fbbdabe1873731356c51716e513a26348
URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c6114fbbdabe1873731356c51716e513a26348
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Apr 21 20:24:45 2021 +0200
windows.globalization/tests: Fix the GetUserDefaultGeoName() test on Win10 1709.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/windows.globalization/tests/globalization.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c
index 7746e93dc1a..631c7ad2449 100644
--- a/dlls/windows.globalization/tests/globalization.c
+++ b/dlls/windows.globalization/tests/globalization.c
@@ -108,8 +108,10 @@ static void test_GlobalizationPreferences(void)
if (pGetUserDefaultGeoName)
{
WCHAR country[16];
- pGetUserDefaultGeoName(country, ARRAY_SIZE(country));
- ok(wcslen(country) == len && !memcmp(buf, country, len),
+ DWORD geolen;
+ geolen = pGetUserDefaultGeoName(country, ARRAY_SIZE(country));
+ ok(broken(geolen == 1) || /* Win10 1709 */
+ (wcslen(country) == len && !memcmp(buf, country, len)),
"IGlobalizationPreferencesStatics_get_HomeGeographicRegion returned len %u, str %s, expected %s\n",
len, wine_dbgstr_w(buf), wine_dbgstr_w(country));
}
More information about the wine-cvs
mailing list