mshtml/tests: Some tests require that the user interface be in English.

With MUI versions of Windows checking for the default user language id is insufficient. Skip the system language id check as it is irrelevant here.

mshtml/tests: Some tests require that the user interface be in English.
e931ebc7 · Francois Gouget · Alexandre Julliard · c571be83 · e931ebc7
Commit e931ebc7 authored Sep 13, 2011 by Francois Gouget Committed by Alexandre Julliard Sep 13, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

htmldoc.c dlls/mshtml/tests/htmldoc.c +12 -2

No files found.
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -285,8 +285,18 @@ static BSTR a2bstr(const char *str)

 static BOOL is_english(void)
 {
-    return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH
-        && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH;
+    static HMODULE hkernel32 = NULL;
+    static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL;
+
+    if (!hkernel32)
+    {
+        hkernel32 = GetModuleHandleA("kernel32.dll");
+        pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage");
+    }
+    if (pGetUserDefaultUILanguage)
+        return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH;
+
+    return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH;
 }

 #define EXPECT_UPDATEUI  1