Hans Leidekker : netapi32: Move NetBios functions to netbios.c.
Alexandre Julliard
julliard at winehq.org
Tue Nov 12 14:26:36 CST 2013
Module: wine
Branch: master
Commit: fe3669e823d2e815733d51da271954c6da5649d4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3669e823d2e815733d51da271954c6da5649d4
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Nov 12 09:59:03 2013 +0100
netapi32: Move NetBios functions to netbios.c.
---
dlls/netapi32/netapi32.c | 47 +---------------------------------------------
dlls/netapi32/netbios.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
index a5f1c03..6d3e913 100644
--- a/dlls/netapi32/netapi32.c
+++ b/dlls/netapi32/netapi32.c
@@ -23,7 +23,7 @@
#include "lmat.h"
#include "netbios.h"
-WINE_DEFAULT_DEBUG_CHANNEL(netbios);
+WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
BOOL NETAPI_IsLocalComputer(LMCSTR ServerName);
@@ -179,51 +179,6 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service,
return NERR_InternalError;
}
-DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc)
-{
- DWORD ret;
-
- switch (nrc)
- {
- case NRC_GOODRET:
- ret = NO_ERROR;
- break;
- case NRC_NORES:
- ret = NERR_NoNetworkResource;
- break;
- case NRC_DUPNAME:
- ret = NERR_AlreadyExists;
- break;
- case NRC_NAMTFUL:
- ret = NERR_TooManyNames;
- break;
- case NRC_ACTSES:
- ret = NERR_DeleteLater;
- break;
- case NRC_REMTFUL:
- ret = ERROR_REM_NOT_LIST;
- break;
- case NRC_NOCALL:
- ret = NERR_NameNotFound;
- break;
- case NRC_NOWILD:
- ret = ERROR_INVALID_PARAMETER;
- break;
- case NRC_INUSE:
- ret = NERR_DuplicateName;
- break;
- case NRC_NAMERR:
- ret = ERROR_INVALID_PARAMETER;
- break;
- case NRC_NAMCONF:
- ret = NERR_DuplicateName;
- break;
- default:
- ret = NERR_NetworkError;
- }
- return ret;
-}
-
NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize,
LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle)
{
diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c
index 94f0ae6..e16c5dc 100644
--- a/dlls/netapi32/netbios.c
+++ b/dlls/netapi32/netbios.c
@@ -858,3 +858,48 @@ UCHAR WINAPI Netbios(PNCB ncb)
TRACE("returning 0x%02x\n", ret);
return ret;
}
+
+DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc)
+{
+ DWORD ret;
+
+ switch (nrc)
+ {
+ case NRC_GOODRET:
+ ret = NO_ERROR;
+ break;
+ case NRC_NORES:
+ ret = NERR_NoNetworkResource;
+ break;
+ case NRC_DUPNAME:
+ ret = NERR_AlreadyExists;
+ break;
+ case NRC_NAMTFUL:
+ ret = NERR_TooManyNames;
+ break;
+ case NRC_ACTSES:
+ ret = NERR_DeleteLater;
+ break;
+ case NRC_REMTFUL:
+ ret = ERROR_REM_NOT_LIST;
+ break;
+ case NRC_NOCALL:
+ ret = NERR_NameNotFound;
+ break;
+ case NRC_NOWILD:
+ ret = ERROR_INVALID_PARAMETER;
+ break;
+ case NRC_INUSE:
+ ret = NERR_DuplicateName;
+ break;
+ case NRC_NAMERR:
+ ret = ERROR_INVALID_PARAMETER;
+ break;
+ case NRC_NAMCONF:
+ ret = NERR_DuplicateName;
+ break;
+ default:
+ ret = NERR_NetworkError;
+ }
+ return ret;
+}
More information about the wine-cvs
mailing list