http://git.etersoft.ru/projects / wine / eterwine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3b7fb23)
mshtml/tests: GetUserDefaultUILanguage() is not available in NT4.
authorFrancois Gouget <fgouget@free.fr>
Tue, 13 Sep 2011 15:32:25 +0000 (17:32 +0200)
committerAlexandre Julliard <julliard@winehq.org>
Tue, 13 Sep 2011 16:13:49 +0000 (18:13 +0200)
dlls/mshtml/tests/dom.c patch | blob | blame | history

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index ab9e8b55589baebc5919c6a46768e8c1213909b6..107fbb57cf9470815f2b7f5e9503742326f92f28 100644 (file)
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -35,6 +35,7 @@
 #include "objsafe.h"
 
 static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD);
+static LANGID (WINAPI *pGetUserDefaultUILanguage)(void);
 
 static const char doc_blank[] = "<html></html>";
 static const char doc_str1[] = "<html><body>test</body></html>";
@@ -4133,11 +4134,16 @@ static void test_navigator(IHTMLDocument2 *doc)
     test_language_string(bstr, LOCALE_SYSTEM_DEFAULT);
     SysFreeString(bstr);
 
-    bstr = NULL;
-    hres = IOmNavigator_get_browserLanguage(navigator, &bstr);
-    ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres);
-    test_language_string(bstr, GetUserDefaultUILanguage());
-    SysFreeString(bstr);
+    if (pGetUserDefaultUILanguage)
+    {
+        bstr = NULL;
+        hres = IOmNavigator_get_browserLanguage(navigator, &bstr);
+        ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres);
+        test_language_string(bstr, pGetUserDefaultUILanguage());
+        SysFreeString(bstr);
+    }
+    else
+        win_skip("GetUserDefaultUILanguage not available\n");
 
     bstr = NULL;
     hres = IOmNavigator_get_userLanguage(navigator, &bstr);
@@ -6155,7 +6161,9 @@ static void run_domtest(const char *str, domtest_t test)
 
 START_TEST(dom)
 {
-    pLCIDToLocaleName = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "LCIDToLocaleName");
+    HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
+    pLCIDToLocaleName = (void*)GetProcAddress(hkernel32, "LCIDToLocaleName");
+    pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage");
 
     CoInitialize(NULL);
 
eterwine