pdh/tests: Some tests require that the user interface be in English.
Francois Gouget
fgouget at free.fr
Tue Sep 13 17:12:33 CDT 2011
With MUI versions of Windows checking for the default user language id is insufficient.
---
See also:
http://www.winehq.org/pipermail/wine-patches/2011-September/106732.html
dlls/pdh/tests/pdh.c | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c
index 094ad74..2e9b922 100644
--- a/dlls/pdh/tests/pdh.c
+++ b/dlls/pdh/tests/pdh.c
@@ -37,6 +37,23 @@ static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR);
#define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func );
+
+static BOOL is_english(void)
+{
+ 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;
+}
+
static void init_function_ptrs( void )
{
pdh = GetModuleHandle( "pdh" );
@@ -958,7 +975,7 @@ static void test_PdhGetDllVersion(void)
START_TEST(pdh)
{
- if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+ if (!is_english())
{
skip("non-english locale\n");
return;
--
1.7.5.4
More information about the wine-patches
mailing list