advapi32: Properly skip the tests that depend on English locale.

Dmitry Timoshkov dmitry at codeweavers.com
Mon Mar 14 04:35:04 CDT 2011


This patch makes the security tests pass under Russian Windows XP with
English user locale.
---
 dlls/advapi32/tests/security.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 3dae81b..130352e 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -1917,7 +1917,7 @@ static void test_LookupAccountName(void)
     domain_size = domain_save;
     sid_size = sid_save;
 
-    if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+    if (GetSystemDefaultLangID() != LANG_ENGLISH)
     {
         skip("Non-english locale (test with hardcoded 'Everyone')\n");
     }
@@ -2055,7 +2055,7 @@ static void test_LookupAccountName(void)
         return;
     }
 
-    if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+    if (GetSystemDefaultLangID() != LANG_ENGLISH)
     {
         skip("Non-english locale (skipping well known name creation tests)\n");
         return;
@@ -2542,7 +2542,7 @@ static void test_SetEntriesInAclW(void)
     ok(NewAcl != NULL, "returned acl was NULL\n");
     LocalFree(NewAcl);
 
-    if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+    if (GetSystemDefaultLangID() != LANG_ENGLISH)
     {
         skip("Non-english locale (test with hardcoded 'Everyone')\n");
     }
@@ -2673,7 +2673,7 @@ static void test_SetEntriesInAclA(void)
     ok(NewAcl != NULL, "returned acl was NULL\n");
     LocalFree(NewAcl);
 
-    if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+    if (GetSystemDefaultLangID() != LANG_ENGLISH)
     {
         skip("Non-english locale (test with hardcoded 'Everyone')\n");
     }
-- 
1.7.3.5




More information about the wine-patches mailing list