Qian Hong : advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0024d18430db6d2ee44ec92973ab65d7744dc768
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0024d18430db6d2ee44ec9297...

Author: Qian Hong <qhong(a)codeweavers.com>
Date:   Sat Feb  1 12:10:57 2020 -0600

advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/advapi32/security.c       | 5 +++--
 dlls/advapi32/tests/security.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index a7707f15d3..700ee7d8ea 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
 static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
 static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
 static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
-static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
+static const WCHAR None[] = { 'N','o','n','e',0 };
 static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
 static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
 static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
@@ -1185,7 +1185,8 @@ LookupAccountSidW(
                             ac = Domain_Admins;
                             break;
                         case DOMAIN_GROUP_RID_USERS:
-                            ac = Domain_Users;
+                            ac = None;
+                            use = SidTypeGroup;
                             break;
                         case DOMAIN_GROUP_RID_GUESTS:
                             ac = Domain_Guests;
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 6d73300c1d..afcdb6328e 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2928,11 +2928,11 @@ static void test_process_security(void)
     dom_size = sizeof(domain);
     ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
     ok(ret, "LookupAccountSid failed with %d\n", ret);
-    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
+    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
     if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
         skip("Non-English locale (test with hardcoded 'None')\n");
     else
-        todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+        ok(!strcmp(account, "None"), "expect None, got %s\n", account);
 
     res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
     ok(!res, "Expected failure, got %d\n", res);