[ros-diffs] [cwittich] 45825: [NETAPI32] sync netapi32 to wine 1.1.39

cwittich at svn.reactos.org cwittich at svn.reactos.org
Thu Mar 4 13:28:24 CET 2010


Author: cwittich
Date: Thu Mar  4 13:28:24 2010
New Revision: 45825

URL: http://svn.reactos.org/svn/reactos?rev=45825&view=rev
Log:
[NETAPI32]
sync netapi32 to wine 1.1.39

Modified:
    trunk/reactos/dll/win32/netapi32/netapi32.c

Modified: trunk/reactos/dll/win32/netapi32/netapi32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32.c?rev=45825&r1=45824&r2=45825&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Thu Mar  4 13:28:24 2010
@@ -26,6 +26,8 @@
 
 static HMODULE NETAPI32_hModule;
 
+BOOL NETAPI_IsLocalComputer(LMCSTR ServerName);
+
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
@@ -97,8 +99,59 @@
  */
 NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr)
 {
-    FIXME("stub (%s, %d, %p)\n", debugstr_w(servername), level, bufptr);
-    return ERROR_ACCESS_DENIED;
+    NET_API_STATUS ret;
+
+    TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr );
+    if (servername)
+    {
+        if (!NETAPI_IsLocalComputer(servername))
+        {
+            FIXME("remote computers not supported\n");
+            return ERROR_INVALID_LEVEL;
+        }
+    }
+    if (!bufptr) return ERROR_INVALID_PARAMETER;
+
+    switch (level)
+    {
+        case 100:
+        case 101:
+        {
+            DWORD computerNameLen, size;
+            WCHAR computerName[MAX_COMPUTERNAME_LENGTH + 1];
+
+            computerNameLen = MAX_COMPUTERNAME_LENGTH + 1;
+            GetComputerNameW(computerName, &computerNameLen);
+            computerNameLen++; /* include NULL terminator */
+
+            size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR);
+            ret = NetApiBufferAllocate(size, (LPVOID *)bufptr);
+            if (ret == NERR_Success)
+            {
+                /* INFO_100 structure is a subset of INFO_101 */
+                PSERVER_INFO_101 info = (PSERVER_INFO_101)*bufptr;
+                OSVERSIONINFOW verInfo;
+
+                info->sv101_platform_id = PLATFORM_ID_NT;
+                info->sv101_name = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101));
+                memcpy(info->sv101_name, computerName,
+                       computerNameLen * sizeof(WCHAR));
+                verInfo.dwOSVersionInfoSize = sizeof(verInfo);
+                GetVersionExW(&verInfo);
+                info->sv101_version_major = verInfo.dwMajorVersion;
+                info->sv101_version_minor = verInfo.dwMinorVersion;
+                 /* Use generic type as no wine equivalent of DC / Server */
+                info->sv101_type = SV_TYPE_NT;
+                info->sv101_comment = NULL;
+            }
+            break;
+        }
+
+        default:
+            FIXME("level %d unimplemented\n", level);
+            ret = ERROR_INVALID_LEVEL;
+    }
+    return ret;
 }
 
 




More information about the Ros-diffs mailing list