[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

svn path=/trunk/; revision=67182
This commit is contained in:
Eric Kohl
2015-04-12 22:07:22 +00:00
parent 5dee29daa3
commit 90529d6033
2 changed files with 9 additions and 14 deletions
-14
View File
@@ -43,7 +43,6 @@ DECLSPEC_HIDDEN BOOL NETAPI_IsLocalComputer( LMCSTR name )
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 @@ static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow)
}
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 @@ static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow)
#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 @@ static void wprint_name(WCHAR *buffer, int len, ULONG transport,
*ptr1 = *ptr2;
*ptr1 = '\0';
}
#endif
/***********************************************************************
* NetWkstaTransportEnum (NETAPI32.@)
@@ -129,7 +125,6 @@ struct WkstaTransportEnumData
/**********************************************************************/
#if 0
static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
ULONG transport, const NetBIOSAdapterImpl *data, void *closure)
{
@@ -219,11 +214,9 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
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 @@ NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf,
}
return ret;
}
#endif
/************************************************************
* NetWkstaUserGetInfo (NETAPI32.@)
*/
#if 0
NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level,
PBYTE* bufptr)
{
@@ -422,12 +413,10 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level,
}
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 @@ NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr,
level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle);
return ERROR_INVALID_PARAMETER;
}
#endif
/************************************************************
* NetpGetComputerName (NETAPI32.@)
@@ -476,7 +464,6 @@ NET_API_STATUS WINAPI I_NetNameValidate(LPVOID p1, LPWSTR wkgrp, LPVOID p3,
return ERROR_INVALID_PARAMETER;
}
#if 0
NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level,
LPBYTE* bufptr)
{
@@ -579,4 +566,3 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation(
return NERR_Success;
}
#endif
+9
View File
@@ -138,6 +138,7 @@ WKSSVC_IMPERSONATE_HANDLE_unbind(WKSSVC_IMPERSONATE_HANDLE pszSystemName,
}
#if 0
NET_API_STATUS
NET_API_FUNCTION
NetGetJoinInformation(
@@ -167,6 +168,7 @@ NetGetJoinInformation(
return status;
}
#endif
NET_API_STATUS
@@ -342,6 +344,7 @@ NetUseGetInfo(
}
#if 0
NET_API_STATUS
WINAPI
NetWkstaGetInfo(
@@ -354,6 +357,9 @@ NetWkstaGetInfo(
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 @@ NetWkstaGetInfo(
return status;
}
#endif
NET_API_STATUS
@@ -460,6 +467,7 @@ NetWkstaTransportDel(
}
#if 0
NET_API_STATUS
WINAPI
NetWkstaTransportEnum(
@@ -621,6 +629,7 @@ NetWkstaUserGetInfo(
return status;
}
#endif
NET_API_STATUS