wine/ dlls/netapi32/netapi32.c include/lm.h in ...
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 30 06:01:12 CST 2005
ChangeSet ID: 21563
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/30 06:01:12
Modified files:
dlls/netapi32 : netapi32.c
include : lm.h lmaccess.h lmserver.h lmwksta.h
Log message:
Vincent Béron <vberon at mecano.gme.usherb.ca>
Add some prototypes to include/ for already existing functions in
netapi32.
Patch: http://cvs.winehq.org/patch.py?id=21563
Old revision New revision Changes Path
1.22 1.23 +1 -0 wine/dlls/netapi32/netapi32.c
1.4 1.5 +1 -0 wine/include/lm.h
1.5 1.6 +9 -7 wine/include/lmaccess.h
1.2 1.3 +4 -3 wine/include/lmserver.h
1.4 1.5 +3 -2 wine/include/lmwksta.h
Index: wine/dlls/netapi32/netapi32.c
diff -u -p wine/dlls/netapi32/netapi32.c:1.22 wine/dlls/netapi32/netapi32.c:1.23
--- wine/dlls/netapi32/netapi32.c:1.22 30 Nov 2005 12: 1:12 -0000
+++ wine/dlls/netapi32/netapi32.c 30 Nov 2005 12: 1:12 -0000
@@ -19,6 +19,7 @@
#include "config.h"
#include "wine/debug.h"
+#include "lm.h"
#include "netbios.h"
WINE_DEFAULT_DEBUG_CHANNEL(netbios);
Index: wine/include/lm.h
diff -u -p wine/include/lm.h:1.4 wine/include/lm.h:1.5
--- wine/include/lm.h:1.4 30 Nov 2005 12: 1:12 -0000
+++ wine/include/lm.h 30 Nov 2005 12: 1:12 -0000
@@ -29,5 +29,6 @@
#include <lmapibuf.h>
#include <lmstats.h>
#include <lmjoin.h>
+#include <lmserver.h>
#endif
Index: wine/include/lmaccess.h
diff -u -p wine/include/lmaccess.h:1.5 wine/include/lmaccess.h:1.6
--- wine/include/lmaccess.h:1.5 30 Nov 2005 12: 1:12 -0000
+++ wine/include/lmaccess.h 30 Nov 2005 12: 1:12 -0000
@@ -403,13 +403,15 @@ typedef struct _NET_DISPLAY_GROUP {
DWORD grpi3_next_index;
} NET_DISPLAY_GROUP, *PNET_DISPLAY_GROUP;
-NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR servername, LPCWSTR username,
- DWORD level, LPBYTE* bufptr);
-
-NET_API_STATUS WINAPI NetQueryDisplayInformation(
- LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested,
- DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount,
- PVOID *SortedBuffer);
+NET_API_STATUS WINAPI NetGetDCName(LPCWSTR,LPCWSTR,LPBYTE*);
+NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,LPBYTE,DWORD);
+NET_API_STATUS WINAPI NetQueryDisplayInformation(LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*);
+NET_API_STATUS WINAPI NetUserAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*);
#ifdef __cplusplus
}
Index: wine/include/lmserver.h
diff -u -p wine/include/lmserver.h:1.2 wine/include/lmserver.h:1.3
--- wine/include/lmserver.h:1.2 30 Nov 2005 12: 1:12 -0000
+++ wine/include/lmserver.h 30 Nov 2005 12: 1:12 -0000
@@ -18,6 +18,8 @@
#ifndef _LMSERVER_
#define _LMSERVER_
+#include <winsvc.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -36,9 +38,8 @@ typedef struct _SERVER_INFO_101 {
LMSTR sv101_comment;
} SERVER_INFO_101, *PSERVER_INFO_101, *LPSERVER_INFO_101;
-NET_API_STATUS WINAPI NetServerEnum(LMCSTR servername, DWORD level,
- LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries,
- DWORD servertype, LMCSTR domain, LPDWORD resume_handle);
+NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPDWORD);
+NET_API_STATUS WINAPI NetServerGetInfo(LMSTR,DWORD,LPBYTE*);
BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL);
#define SV_TYPE_WORKSTATION 0x00000001
Index: wine/include/lmwksta.h
diff -u -p wine/include/lmwksta.h:1.4 wine/include/lmwksta.h:1.5
--- wine/include/lmwksta.h:1.4 30 Nov 2005 12: 1:12 -0000
+++ wine/include/lmwksta.h 30 Nov 2005 12: 1:12 -0000
@@ -76,8 +76,9 @@ typedef struct _WKSTA_INFO_102 {
} WKSTA_INFO_102, *PWKSTA_INFO_102, *LPWKSTA_INFO_102;
/* workstation */
-NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level, PBYTE* bufptr);
-NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR servername, DWORD level, PBYTE *bufptr);
+NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR,DWORD,LPBYTE*);
+NET_API_STATUS NET_API_FUNCTION NetWkstaTransportEnum(LPWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR,DWORD,LPBYTE*);
#ifdef __cplusplus
}
More information about the wine-cvs
mailing list