Francois Gouget : mshtml/tests: GetUserDefaultUILanguage() is not available in NT4.
Module: wine Branch: master Commit: c571be83da04c2276468805d6c92b4520e8afc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c571be83da04c2276468805d6c... Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 17:32:25 2011 +0200 mshtml/tests: GetUserDefaultUILanguage() is not available in NT4. --- dlls/mshtml/tests/dom.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ab9e8b5..107fbb5 100644 --- 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);
participants (1)
-
Alexandre Julliard