[NETAPI32] Add more DFS stubs

diff --git a/dll/win32/netapi32/dfs.c b/dll/win32/netapi32/dfs.c
index af4bcdd..3d1a2de 100644 (file)
--- a/dll/win32/netapi32/dfs.c
+++ b/dll/win32/netapi32/dfs.c
@@ -27,13 +27,35 @@ NetDfsAdd(
     _In_ DWORD Flags)
 {
 #if 0
-    NET_API_STATUS
-    __stdcall
-    status = NetrDfsAdd(DfsEntryPath,
-                        ServerName,
-                        PathName,
-                        Comment,
-                        Flags);
+    NET_API_STATUS Status;
+
+    TRACE("NetDfsAdd(%s %s %s %s 0x%lx)\n",
+          debugstr_w(DfsEntryPath), debugstr_w(ServerName), debugstr_w(PathName),
+          debugstr_w(Comment), Flags);
+
+    if (DfsEntryPath == NULL ||
+        *DfsEntryPath == UNICODE_NULL ||
+        ServerName == NULL ||
+        *ServerName == UNICODE_NULL ||
+        PathName == NULL ||
+        *PathName == UNICODE_NULL)
+        return ERROR_INVALID_PARAMETER;
+
+    RpcTryExcept
+    {
+        Status = NetrDfsAdd(DfsEntryPath,
+                            ServerName,
+                            PathName,
+                            Comment,
+                            Flags);
+    }
+    RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = I_RpcMapWin32Status(RpcExceptionCode());
+    }
+    RpcEndExcept;
+
+    return Status;
 #endif
     UNIMPLEMENTED;
     return 0;
@@ -88,7 +110,7 @@ NetDfsEnum(
     _In_ DWORD PrefMaxLen,
     _Out_ LPBYTE *Buffer,
     _Out_ LPDWORD EntriesRead,
-    _Out_ LPDWORD ResumeHandle)
+    _Inout_ LPDWORD ResumeHandle)
 {
     UNIMPLEMENTED;
     return 0;
@@ -99,8 +121,8 @@ NET_API_STATUS
 WINAPI
 NetDfsGetClientInfo(
     _In_ LPWSTR DfsEntryPath,
-    _In_ LPWSTR ServerName,
-    _In_ LPWSTR ShareName,
+    _In_opt_ LPWSTR ServerName,
+    _In_opt_ LPWSTR ShareName,
     _In_ DWORD Level,
     _Out_ LPBYTE *Buffer)
 {
@@ -109,7 +131,17 @@ NetDfsGetClientInfo(
 }
 
 
-/* NetDfsGetDcAddress */
+NET_API_STATUS
+WINAPI
+NetDfsGetDcAddress(
+    _In_ LPWSTR ServerName,
+    _Out_ LPWSTR *DcIpAddress,
+    _Out_ PBOOLEAN IsRoot,
+    _Out_ PULONG Timeout)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
 
 
 NET_API_STATUS
@@ -125,4 +157,198 @@ NetDfsGetFtContainerSecurity(
 }
 
 
+NET_API_STATUS
+WINAPI
+NetDfsGetInfo(
+    _In_ LPWSTR DfsEntryPath,
+    _In_opt_ LPWSTR ServerName,
+    _In_opt_ LPWSTR ShareName,
+    _In_ DWORD Level,
+    _Out_ LPBYTE *Buffer)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsGetSecurity(
+    _In_ LPWSTR DfsEntryPath,
+    _In_ SECURITY_INFORMATION SecurityInformation,
+    _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor,
+    _Out_ LPDWORD lpcbSecurityDescriptor)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsGetStdContainerSecurity(
+    _In_ LPWSTR MachineName,
+    _In_ SECURITY_INFORMATION SecurityInformation,
+    _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor,
+    _Out_ LPDWORD lpcbSecurityDescriptor)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+/* NetDfsManagerGetConfigInfo */
+
+
+NET_API_STATUS
+WINAPI
+NetDfsManagerInitialize(
+    _In_ LPWSTR ServerName,
+    _Reserved_ DWORD Flags)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+/* NetDfsManagerSendSiteInfo */
+
+
+NET_API_STATUS
+WINAPI
+NetDfsMove(
+    _In_ LPWSTR Path,
+    _In_ LPWSTR NewPath,
+    _In_ ULONG Flags)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsRemove(
+    _In_ LPWSTR DfsEntryPath,
+    _In_opt_ LPWSTR ServerName,
+    _In_opt_ LPWSTR ShareName)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsRemoveFtRoot(
+    _In_ LPWSTR ServerName,
+    _In_ LPWSTR RootShare,
+    _In_ LPWSTR FtDfsName,
+    _Reserved_ DWORD Flags)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsRemoveFtRootForced(
+    _In_ LPWSTR DomainName,
+    _In_ LPWSTR ServerName,
+    _In_ LPWSTR RootShare,
+    _In_ LPWSTR FtDfsName,
+    _Reserved_ DWORD Flags)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsRemoveStdRoot(
+    _In_ LPWSTR ServerName,
+    _In_ LPWSTR RootShare,
+    _In_ DWORD Flags)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsRename(
+    _In_ LPWSTR Path,
+    _In_ LPWSTR NewPath)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsSetClientInfo(
+    _In_ LPWSTR DfsEntryPath,
+    _In_opt_ LPWSTR ServerName,
+    _In_opt_ LPWSTR ShareName,
+    _In_ DWORD Level,
+    _In_ LPBYTE Buffer)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsSetFtContainerSecurity(
+    _In_ LPWSTR DomainName,
+    _In_ SECURITY_INFORMATION SecurityInformation,
+    _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsSetInfo(
+    _In_ LPWSTR DfsEntryPath,
+    _In_opt_ LPWSTR ServerName,
+    _In_opt_ LPWSTR ShareName,
+    _In_ DWORD Level,
+    _In_ LPBYTE Buffer)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsSetSecurity(
+    _In_ LPWSTR DfsEntryPath,
+    _In_ SECURITY_INFORMATION SecurityInformation,
+    _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetDfsSetStdContainerSecurity(
+    _In_ LPWSTR MachineName,
+    _In_ SECURITY_INFORMATION SecurityInformation,
+    _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
+
 /* EOF */

diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec
index 3b476e9..7c5b07e 100644 (file)
--- a/dll/win32/netapi32/netapi32.spec
+++ b/dll/win32/netapi32/netapi32.spec
@@ -120,25 +120,25 @@
 @ stdcall NetDfsAddStdRootForced(wstr wstr wstr wstr)
 @ stdcall NetDfsEnum(wstr long long ptr ptr ptr)
 @ stdcall NetDfsGetClientInfo(wstr wstr wstr long ptr)
-@ stub NetDfsGetDcAddress
+@ stdcall NetDfsGetDcAddress(wstr ptr ptr ptr)
 @ stdcall NetDfsGetFtContainerSecurity(wstr long ptr ptr);
-@ stub NetDfsGetInfo
-@ stub NetDfsGetSecurity
-@ stub NetDfsGetStdContainerSecurity
+@ stdcall NetDfsGetInfo(wstr wstr wstr long ptr)
+@ stdcall NetDfsGetSecurity(wstr ptr ptr ptr)
+@ stdcall NetDfsGetStdContainerSecurity(wstr ptr ptr ptr)
 @ stub NetDfsManagerGetConfigInfo
-@ stub NetDfsManagerInitialize
+@ stdcall NetDfsManagerInitialize(wstr long)
 @ stub NetDfsManagerSendSiteInfo
-@ stub NetDfsMove
-@ stub NetDfsRemove
-@ stub NetDfsRemoveFtRoot
-@ stub NetDfsRemoveFtRootForced
-@ stub NetDfsRemoveStdRoot
-@ stub NetDfsRename
-@ stub NetDfsSetClientInfo
-@ stub NetDfsSetFtContainerSecurity
-@ stub NetDfsSetInfo
-@ stub NetDfsSetSecurity
-@ stub NetDfsSetStdContainerSecurity
+@ stdcall NetDfsMove(wstr wstr long)
+@ stdcall NetDfsRemove(wstr wstr wstr)
+@ stdcall NetDfsRemoveFtRoot(wstr wstr wstr long)
+@ stdcall NetDfsRemoveFtRootForced(wstr wstr wstr wstr long)
+@ stdcall NetDfsRemoveStdRoot(wstr wstr long)
+@ stdcall NetDfsRename(wstr wstr)
+@ stdcall NetDfsSetClientInfo(wstr wstr wstr long ptr)
+@ stdcall NetDfsSetFtContainerSecurity(wstr ptr ptr)
+@ stdcall NetDfsSetInfo(wstr wstr wstr long ptr)
+@ stdcall NetDfsSetSecurity(wstr ptr ptr)
+@ stdcall NetDfsSetStdContainerSecurity(wstr ptr ptr)
 @ stdcall NetEnumerateComputerNames(wstr long long ptr ptr)
 @ stdcall NetEnumerateTrustedDomains(wstr ptr)
 @ stdcall NetErrorLogClear(wstr wstr ptr)