From f0c9ed8f21f97ce6ccca11970555b68de3d47cb8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 8 Jun 2013 11:04:18 +0000
Subject: [PATCH] [NETAPI32] NetLocalGroupGetMembers: Implement levels 2 and 3.
 Fixes netapi32:access winetest failures.

svn path=/trunk/; revision=59190
---
 reactos/dll/win32/netapi32/local_group.c | 72 +++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/netapi32/local_group.c b/reactos/dll/win32/netapi32/local_group.c
index 8f40d3ed068..f6e7073b4b1 100644
--- a/reactos/dll/win32/netapi32/local_group.c
+++ b/reactos/dll/win32/netapi32/local_group.c
@@ -946,6 +946,8 @@ NetLocalGroupGetMembers(
     LPVOID Buffer = NULL;
     PLOCALGROUP_MEMBERS_INFO_0 MembersInfo0;
     PLOCALGROUP_MEMBERS_INFO_1 MembersInfo1;
+    PLOCALGROUP_MEMBERS_INFO_2 MembersInfo2;
+    PLOCALGROUP_MEMBERS_INFO_3 MembersInfo3;
     LPWSTR Ptr;
     ULONG Size = 0;
     ULONG SidLength;
@@ -1060,7 +1062,7 @@ NetLocalGroupGetMembers(
             goto done;
         }
 
-
+        /* Get name and domain information for all members */
         if (level != 0)
         {
             InitializeObjectAttributes(&ObjectAttributes,
@@ -1108,6 +1110,19 @@ NetLocalGroupGetMembers(
                        EnumContext->Names[i].Name.Length + sizeof(WCHAR);
                 break;
 
+            case 2:
+                Size = sizeof(LOCALGROUP_MEMBERS_INFO_2) +
+                       RtlLengthSid(EnumContext->Sids[i]) +
+                       EnumContext->Names[i].Name.Length + sizeof(WCHAR) +
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR);
+                break;
+
+            case 3:
+                Size = sizeof(LOCALGROUP_MEMBERS_INFO_3) +
+                       EnumContext->Names[i].Name.Length + sizeof(WCHAR) +
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR);
+                break;
+
             default:
                 ApiStatus = ERROR_INVALID_LEVEL;
                 goto done;
@@ -1133,6 +1148,16 @@ NetLocalGroupGetMembers(
             MembersInfo1 = (PLOCALGROUP_MEMBERS_INFO_1)Buffer;
             Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_1) * EnumContext->Count);
             break;
+
+        case 2:
+            MembersInfo2 = (PLOCALGROUP_MEMBERS_INFO_2)Buffer;
+            Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_2) * EnumContext->Count);
+            break;
+
+        case 3:
+            MembersInfo3 = (PLOCALGROUP_MEMBERS_INFO_3)Buffer;
+            Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_3) * EnumContext->Count);
+            break;
     }
 
     for (i = 0; i < EnumContext->Count; i++)
@@ -1169,6 +1194,51 @@ NetLocalGroupGetMembers(
                        EnumContext->Names[i].Name.Buffer,
                        EnumContext->Names[i].Name.Length);
                 break;
+
+            case 2:
+                MembersInfo2->lgrmi2_sid = (PSID)Ptr;
+
+                SidLength = RtlLengthSid(EnumContext->Sids[i]);
+                memcpy(MembersInfo2->lgrmi2_sid,
+                       EnumContext->Sids[i],
+                       SidLength);
+
+                Ptr = (PVOID)((ULONG_PTR)Ptr + SidLength);
+
+                MembersInfo2->lgrmi2_sidusage = EnumContext->Names[i].Use;
+
+                MembersInfo2->lgrmi2_domainandname = (LPWSTR)Ptr;
+                memcpy(MembersInfo2->lgrmi2_domainandname,
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
+
+                Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
+
+                *((LPWSTR)Ptr) = L'\\';
+
+                Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR));
+
+                memcpy(Ptr,
+                       EnumContext->Names[i].Name.Buffer,
+                       EnumContext->Names[i].Name.Length);
+                break;
+
+            case 3:
+                MembersInfo3->lgrmi3_domainandname = (PSID)Ptr;
+                memcpy(MembersInfo2->lgrmi2_domainandname,
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
+                       EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
+
+                Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
+
+                *((LPWSTR)Ptr) = L'\\';
+
+                Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR));
+
+                memcpy(Ptr,
+                       EnumContext->Names[i].Name.Buffer,
+                       EnumContext->Names[i].Name.Length);
+                break;
         }
     }