[ros-diffs] [ekohl] 67182: [NETAPI32] Disable some functions in wksta_new.c and re-enable their counterparts in wksta.c. For some reason I cannot get the wine dummy code working in the workstation service. Per...

Author: ekohl
Date: Sun Apr 12 22:07:22 2015
New Revision: 67182

URL: http://svn.reactos.org/svn/reactos?rev=67182&view=rev
Log:
[NETAPI32]
Disable some functions in wksta_new.c and re-enable their counterparts in wksta.c. For
some reason I cannot get the wine dummy code working in the workstation service. Perhaps
it is yet another RPC bug.

CORE-9415

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

Modified: trunk/reactos/dll/win32/netapi32/wksta.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/wksta.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/wksta.c	[iso-8859-1] Sun Apr 12 22:07:22 2015
@@ -43,7 +43,6 @@
     return ret && !strcmpiW( name, buf );
 }
 
-#if 0
 static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow)
 {
     int i;
@@ -73,7 +72,6 @@
     }
     buffer[2*i]=0;
 }
-#endif
 
 /* Theoretically this could be too short, except that MS defines
  * MAX_ADAPTER_NAME as 128, and MAX_INTERFACE_NAME_LEN as 256, and both
@@ -86,7 +84,6 @@
 #define NBT_TRANSPORT_NAME_HEADER "\\Device\\NetBT_Tcpip_"
 #define UNKNOWN_TRANSPORT_NAME_HEADER "\\Device\\UnknownTransport_"
 
-#if 0
 static void wprint_name(WCHAR *buffer, int len, ULONG transport,
  PMIB_IFROW ifRow)
 {
@@ -112,7 +109,6 @@
         *ptr1 = *ptr2;
     *ptr1 = '\0';
 }
-#endif
 
 /***********************************************************************
  *                NetWkstaTransportEnum  (NETAPI32.@)
@@ -129,7 +125,6 @@
 
 /**********************************************************************/
 
-#if 0
 static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
  ULONG transport, const NetBIOSAdapterImpl *data, void *closure)
 {
@@ -219,11 +214,9 @@
         ret = FALSE;
     return ret;
 }
-#endif
 
 /**********************************************************************/
 
-#if 0
 NET_API_STATUS WINAPI 
 NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf,
       DWORD prefmaxlen, LPDWORD read_entries,
@@ -278,13 +271,11 @@
     }
     return ret;
 }
-#endif
 
 
 /************************************************************
  *                NetWkstaUserGetInfo  (NETAPI32.@)
  */
-#if 0
 NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level,
                                           PBYTE* bufptr)
 {
@@ -422,12 +413,10 @@
     }
     return NERR_Success;
 }
-#endif
 
 /************************************************************
  *                NetWkstaUserEnum  (NETAPI32.@)
  */
-#if 0
 NET_API_STATUS WINAPI
 NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr,
                  DWORD prefmaxlen, LPDWORD entriesread,
@@ -437,7 +426,6 @@
           level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle);
     return ERROR_INVALID_PARAMETER;
 }
-#endif
 
 /************************************************************
  *                NetpGetComputerName  (NETAPI32.@)
@@ -476,7 +464,6 @@
     return ERROR_INVALID_PARAMETER;
 }
 
-#if 0
 NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level,
                                        LPBYTE* bufptr)
 {
@@ -579,4 +566,3 @@
 
     return NERR_Success;
 }
-#endif

Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/wksta_new.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/wksta_new.c	[iso-8859-1] Sun Apr 12 22:07:22 2015
@@ -138,6 +138,7 @@
 }
 
 
+#if 0
 NET_API_STATUS
 NET_API_FUNCTION
 NetGetJoinInformation(
@@ -167,6 +168,7 @@
 
     return status;
 }
+#endif
 
 
 NET_API_STATUS
@@ -342,6 +344,7 @@
 }
 
 
+#if 0
 NET_API_STATUS
 WINAPI
 NetWkstaGetInfo(
@@ -354,6 +357,9 @@
     TRACE("NetWkstaGetInfo(%s, %d, %p)\n", debugstr_w(servername),
           level, bufptr);
 
+    if (bufptr == NULL)
+        return ERROR_INVALID_PARAMETER;
+
     *bufptr = NULL;
 
     RpcTryExcept
@@ -370,6 +376,7 @@
 
     return status;
 }
+#endif
 
 
 NET_API_STATUS
@@ -460,6 +467,7 @@
 }
 
 
+#if 0
 NET_API_STATUS
 WINAPI
 NetWkstaTransportEnum(
@@ -621,6 +629,7 @@
 
     return status;
 }
+#endif
 
 
 NET_API_STATUS