[NETAPI32]

- Add DsValidateSubnetNameA/W stubs.
- Move DsRoleFreeMemory to a better location.

[SDK/INCLUDE]
Add DsValidateSubnetNameA/W prototypes to dsgetdc.h.

svn path=/trunk/; revision=75306

diff --git a/reactos/dll/win32/netapi32/dssetup.c b/reactos/dll/win32/netapi32/dssetup.c
index 2163a0c..18b9303 100644 (file)
--- a/reactos/dll/win32/netapi32/dssetup.c
+++ b/reactos/dll/win32/netapi32/dssetup.c
@@ -77,6 +77,16 @@ DsSetupUnbind(
 }
 
 
+VOID
+WINAPI
+DsRoleFreeMemory(
+    _In_ PVOID Buffer)
+{
+    TRACE("DsRoleFreeMemory(%p)\n", Buffer);
+    HeapFree(GetProcessHeap(), 0, Buffer);
+}
+
+
 DWORD
 WINAPI
 DsRoleGetPrimaryDomainInformation(

diff --git a/reactos/dll/win32/netapi32/netapi32.spec b/reactos/dll/win32/netapi32/netapi32.spec
index db6f208..c209814 100644 (file)
--- a/reactos/dll/win32/netapi32/netapi32.spec
+++ b/reactos/dll/win32/netapi32/netapi32.spec
@@ -36,8 +36,8 @@
 @ stub DsRoleIfmHandleFree
 @ stub DsRoleServerSaveStateForUpgrade
 @ stub DsRoleUpgradeDownlevelServer
-@ stub DsValidateSubnetNameA
-@ stub DsValidateSubnetNameW
+@ stdcall DsValidateSubnetNameA(str)
+@ stdcall DsValidateSubnetNameW(wstr)
 @ stub I_BrowserDebugCall
 @ stdcall I_BrowserDebugTrace(wstr str)
 @ stdcall I_BrowserQueryEmulatedDomains(wstr ptr ptr)

diff --git a/reactos/dll/win32/netapi32/netlogon.c b/reactos/dll/win32/netapi32/netlogon.c
index 236c8a9..adacab9 100644 (file)
--- a/reactos/dll/win32/netapi32/netlogon.c
+++ b/reactos/dll/win32/netapi32/netlogon.c
@@ -436,13 +436,25 @@ DsMergeForestTrustInformationW(
 }
 
 
-VOID
+DWORD
 WINAPI
-DsRoleFreeMemory(
-    _In_ PVOID Buffer)
+DsValidateSubnetNameA(
+    _In_ LPCSTR SubnetName)
 {
-    TRACE("DsRoleFreeMemory(%p)\n", Buffer);
-    HeapFree(GetProcessHeap(), 0, Buffer);
+    FIXME("DsValidateSubnetNameA(%s)\n",
+          debugstr_a(SubnetName));
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+DWORD
+WINAPI
+DsValidateSubnetNameW(
+    _In_ LPCWSTR SubnetName)
+{
+    FIXME("DsValidateSubnetNameW(%s)\n",
+          debugstr_w(SubnetName));
+    return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 

diff --git a/reactos/sdk/include/psdk/dsgetdc.h b/reactos/sdk/include/psdk/dsgetdc.h
index 214c6f9..aad07ab 100644 (file)
--- a/reactos/sdk/include/psdk/dsgetdc.h
+++ b/reactos/sdk/include/psdk/dsgetdc.h
@@ -176,6 +176,14 @@ DsMergeForestTrustInformationW(
        PLSA_FOREST_TRUST_INFORMATION OldForestTrustInfo,
        PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo);
 
+DWORD WINAPI
+DsValidateSubnetNameA(
+       LPCSTR SubnetName);
+
+DWORD WINAPI
+DsValidateSubnetNameW(
+       LPCWSTR SubnetName);
+
 #ifdef UNICODE
 typedef DOMAIN_CONTROLLER_INFOW DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO;
 typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS;
@@ -185,6 +193,7 @@ typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS;
 #define DsGetDcName DsGetDcNameW
 #define DsGetDcSiteCoverage DsGetDcSiteCoverageW
 #define DsGetSiteName DsGetSiteNameW
+#define DsValidateSubnetName DsValidateSubnetNameW
 #else
 typedef DOMAIN_CONTROLLER_INFOA DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO;
 typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS;
@@ -194,6 +203,7 @@ typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS;
 #define DsGetDcName DsGetDcNameA
 #define DsGetDcSiteCoverage DsGetDcSiteCoverageA
 #define DsGetSiteName DsGetSiteNameA
+#define DsValidateSubnetName DsValidateSubnetNameA
 #endif
 
 #ifdef __cplusplus