[NETAPI32]

- Add stubs for missing NetGroup functions.
- Update header file.

svn path=/trunk/; revision=59070

diff --git a/reactos/dll/win32/netapi32/group.c b/reactos/dll/win32/netapi32/group.c
index b7cd359..e8d1a92 100644 (file)
--- a/reactos/dll/win32/netapi32/group.c
+++ b/reactos/dll/win32/netapi32/group.c
@@ -22,12 +22,70 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-/*
-@ stub NetGroupAdd
-@ stub NetGroupAddUser
-@ stub NetGroupDel
-@ stub NetGroupDelUser
-*/
+
+/************************************************************
+ * NetGroupAdd  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupAdd(IN LPCWSTR servername,
+            IN DWORD level,
+            IN LPBYTE buf,
+            OUT LPDWORD parm_err)
+{
+    FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername),
+          level, buf, parm_err);
+    return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ * NetGroupAddUser  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupAddUser(IN LPCWSTR servername,
+                IN LPCWSTR groupname,
+                IN LPCWSTR username)
+{
+    FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), debugstr_w(username));
+    return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ * NetGroupDel  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupDel(IN LPCWSTR servername,
+            IN LPCWSTR groupname)
+{
+    FIXME("(%s, %s) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname));
+    return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ * NetGroupDelUser  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupDelUser(IN LPCWSTR servername,
+                IN LPCWSTR groupname,
+                IN LPCWSTR username)
+{
+    FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), debugstr_w(username));
+    return ERROR_ACCESS_DENIED;
+}
+
 
 /************************************************************
  * NetGroupEnum  (NETAPI32.@)
@@ -35,36 +93,92 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
  */
 NET_API_STATUS
 WINAPI
-NetGroupEnum(LPCWSTR servername,
-             DWORD level,
-             LPBYTE *bufptr,
-             DWORD prefmaxlen,
-             LPDWORD entriesread,
-             LPDWORD totalentries,
-             LPDWORD resume_handle)
+NetGroupEnum(IN LPCWSTR servername,
+             IN DWORD level,
+             OUT LPBYTE *bufptr,
+             IN DWORD prefmaxlen,
+             OUT LPDWORD entriesread,
+             OUT LPDWORD totalentries,
+             IN OUT PDWORD_PTR resume_handle)
 {
     FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername),
           level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
     return ERROR_ACCESS_DENIED;
 }
 
+
 /************************************************************
  * NetGroupGetInfo  (NETAPI32.@)
  *
  */
 NET_API_STATUS
 WINAPI
-NetGroupGetInfo(LPCWSTR servername,
-                LPCWSTR groupname,
-                DWORD level,
-                LPBYTE *bufptr)
+NetGroupGetInfo(IN LPCWSTR servername,
+                IN LPCWSTR groupname,
+                IN DWORD level,
+                OUT LPBYTE *bufptr)
 {
-    FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr);
+    FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), level, bufptr);
     return ERROR_ACCESS_DENIED;
 }
 
-/*
-@ stub NetGroupGetUsers
-@ stub NetGroupSetInfo
-@ stub NetGroupSetUsers
-*/
\ No newline at end of file
+
+/************************************************************
+ * NetGroupGetUsers  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupGetUsers(IN LPCWSTR servername,
+                 IN LPCWSTR groupname,
+                 IN DWORD level,
+                 OUT LPBYTE *bufptr,
+                 IN DWORD prefmaxlen,
+                 OUT LPDWORD entriesread,
+                 OUT LPDWORD totalentries,
+                 IN OUT PDWORD_PTR resume_handle)
+{
+    FIXME("(%s, %s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), level, bufptr, prefmaxlen, entriesread,
+          totalentries, resume_handle);
+    return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ * NetGroupSetInfo  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupSetInfo(IN LPCWSTR servername,
+                IN LPCWSTR groupname,
+                IN DWORD level,
+                IN LPBYTE buf,
+                OUT LPDWORD parm_err)
+{
+    FIXME("(%s, %s, %d, %p, %p) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), level, buf, parm_err);
+    return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ * NetGroupSetUsers  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupSetUsers(IN LPCWSTR servername,
+                 IN LPCWSTR groupname,
+                 IN DWORD level,
+                 IN LPBYTE buf,
+                 IN DWORD totalentries)
+{
+    FIXME("(%s, %s, %d, %p, %d) stub!\n", debugstr_w(servername),
+          debugstr_w(groupname), level, buf, totalentries);
+    return ERROR_ACCESS_DENIED;
+}
+
+/* EOF */

diff --git a/reactos/dll/win32/netapi32/netapi32.spec b/reactos/dll/win32/netapi32/netapi32.spec
index 4d1c9f9..20ac5fe 100644 (file)
--- a/reactos/dll/win32/netapi32/netapi32.spec
+++ b/reactos/dll/win32/netapi32/netapi32.spec
@@ -94,15 +94,15 @@
 @ stdcall NetGetDCName(wstr wstr ptr)
 @ stub NetGetDisplayInformationIndex
 @ stdcall NetGetJoinInformation(wstr ptr ptr)
-@ stub NetGroupAdd
-@ stub NetGroupAddUser
-@ stub NetGroupDel
-@ stub NetGroupDelUser
+@ stdcall NetGroupAdd(wstr long ptr ptr)
+@ stdcall NetGroupAddUser(wstr wstr wstr)
+@ stdcall NetGroupDel(wstr wstr)
+@ stdcall NetGroupDelUser(wstr wstr wstr)
 @ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr)
 @ stdcall NetGroupGetInfo(wstr wstr long ptr)
-@ stub NetGroupGetUsers
-@ stub NetGroupSetInfo
-@ stub NetGroupSetUsers
+@ stdcall NetGroupGetUsers(wstr wstr long ptr long ptr ptr ptr)
+@ stdcall NetGroupSetInfo(wstr wstr long ptr ptr)
+@ stdcall NetGroupSetUsers(wstr wstr long ptr long)
 @ stdcall NetLocalGroupAdd(wstr long ptr ptr)
 @ stdcall NetLocalGroupAddMember(wstr wstr ptr)
 @ stdcall NetLocalGroupAddMembers(wstr wstr long ptr long)

diff --git a/reactos/include/psdk/lmaccess.h b/reactos/include/psdk/lmaccess.h
index 1f63d7b..bbec723 100644 (file)
--- a/reactos/include/psdk/lmaccess.h
+++ b/reactos/include/psdk/lmaccess.h
@@ -614,12 +614,12 @@ NET_API_STATUS WINAPI NetUserModalsSet(LPCWSTR,DWORD,PBYTE,PDWORD);
 NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
 NET_API_STATUS WINAPI NetGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
 NET_API_STATUS WINAPI NetGroupAddUser(LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR);
 NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
 NET_API_STATUS WINAPI NetGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
 NET_API_STATUS WINAPI NetGroupDel(LPCWSTR,LPCWSTR);
 NET_API_STATUS WINAPI NetGroupDelUser(LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupGetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetGroupGetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR);
 NET_API_STATUS WINAPI NetGroupSetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
 NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
 NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID);