[ros-diffs] [winesync] 31784: Autosyncing with Wine HEAD

Author: winesync
Date: Mon Jan 14 18:39:30 2008
New Revision: 31784

URL: http://svn.reactos.org/svn/reactos?rev=31784&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/netapi32/access.c
    trunk/reactos/dll/win32/netapi32/local_group.c
    trunk/reactos/dll/win32/netapi32/netapi32.rbuild

Modified: trunk/reactos/dll/win32/netapi32/access.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.c...
==============================================================================
--- trunk/reactos/dll/win32/netapi32/access.c (original)
+++ trunk/reactos/dll/win32/netapi32/access.c Mon Jan 14 18:39:30 2008
@@ -57,10 +57,6 @@
     DWORD user_flags;
     LPWSTR user_logon_script_path;
 };
-
-static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t',
-                                'o','r',0};
-static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0};

static struct list user_list = LIST_INIT( user_list );

@@ -604,7 +600,7 @@
         NetApiBufferAllocate(dwSize +
                              admin_size - sizeof(NET_DISPLAY_USER) +
                              guest_size - sizeof(NET_DISPLAY_USER),
-                             (LPVOID *) SortedBuffer);
+                             SortedBuffer);
         inf = (PNET_DISPLAY_USER) *SortedBuffer;
         str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records);
         inf->usri1_name = str;

Modified: trunk/reactos/dll/win32/netapi32/local_group.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_gr...
==============================================================================
--- trunk/reactos/dll/win32/netapi32/local_group.c (original)
+++ trunk/reactos/dll/win32/netapi32/local_group.c Mon Jan 14 18:39:30 2008
@@ -166,6 +166,39 @@
     FIXME("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername),
           debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread,
           totalentries, resumehandle);
+
+    if (level == 3)
+    {
+        WCHAR userName[MAX_COMPUTERNAME_LENGTH + 1];
+        DWORD userNameLen;
+        DWORD len,needlen;
+        PLOCALGROUP_MEMBERS_INFO_3 ptr;
+
+        /* still a stub,  current user is belonging to all groups */
+
+        *totalentries = 1;
+        *entriesread = 0;
+
+        userNameLen = MAX_COMPUTERNAME_LENGTH + 1;
+        GetUserNameW(userName,&userNameLen);
+        needlen = sizeof(LOCALGROUP_MEMBERS_INFO_3) +
+             (userNameLen+2) * sizeof(WCHAR);
+        if (prefmaxlen != MAX_PREFERRED_LENGTH)
+            len = min(prefmaxlen,needlen);
+        else
+            len = needlen;
+
+        NetApiBufferAllocate(len, (LPVOID *) bufptr);
+        if (len < needlen)
+            return ERROR_MORE_DATA;
+
+        ptr = (PLOCALGROUP_MEMBERS_INFO_3)*bufptr;
+        ptr->lgrmi3_domainandname = (LPWSTR)(*bufptr+sizeof(LOCALGROUP_MEMBERS_INFO_3));
+        lstrcpyW(ptr->lgrmi3_domainandname,userName);
+
+        *entriesread = 1;
+    }
+
     return NERR_Success;
 }

Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32...
==============================================================================
--- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original)
+++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Mon Jan 14 18:39:30 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
    <importlibrary definition="netapi32.spec.def" />
    <include base="netapi32">.</include>
@@ -27,3 +28,4 @@
    <file>wksta.c</file>
    <file>netapi32.spec</file>
 </module>
+</group>