[usp10/tests] Make tests run on win9x and NT4 again

Paul Vriens paul.vriens.wine at gmail.com
Sun Dec 17 12:18:41 CST 2006


Hi,

EnumLanguageGroupLocalesA is not available on win9x and NT4. This patch checks
the availability.

Changelog
  Make tests run on win9x and NT4 again

Cheers,

Paul.
---
 dlls/usp10/tests/usp10.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index c6ffd8a..dd26492 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -1237,11 +1237,22 @@ static void test_digit_substitution(void)
         LGRPID_GEORGIAN,
         LGRPID_ARMENIAN
     };
+    HMODULE hKernel32;
+    static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC,LGRPID,DWORD,LONG_PTR);
+
+    hKernel32 = GetModuleHandleA("kernel32.dll");
+    pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA");
+
+    if (!pEnumLanguageGroupLocalesA)
+    {
+        trace("EnumLanguageGroupLocalesA not available on this platform\n");
+        return;
+    }
 
     for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++)
     {
-        ret = EnumLanguageGroupLocales(enum_proc, groups[i], 0, 0);
-        ok(ret, "EnumLanguageGroupLocales failed unexpectedly: 0x%08x\n", GetLastError());
+        ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0);
+        ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: 0x%08x\n", GetLastError());
     }
 }
 
-- 
1.4.4.2




More information about the wine-patches mailing list