mirror of
https://github.com/reactos/reactos.git
synced 2024-12-30 19:14:31 +00:00
[NETAPI32]
* Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. CORE-7716 svn path=/trunk/; revision=61793
This commit is contained in:
parent
6e7e584589
commit
12519e3de8
18 changed files with 33 additions and 102 deletions
|
@ -22,7 +22,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
|
||||
/************************************************************
|
||||
* ACCESS_QueryAdminDisplayInformation
|
||||
*
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include "netapi32.h"
|
||||
|
||||
#include <lmbrowsr.h>
|
||||
|
||||
/************************************************************
|
||||
* I_BrowserSetNetlogonState (NETAPI32.@)
|
||||
*/
|
||||
|
|
|
@ -20,6 +20,9 @@
|
|||
|
||||
#include "netapi32.h"
|
||||
|
||||
#include <dsrole.h>
|
||||
#include <dsgetdc.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ds);
|
||||
|
||||
DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName,
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
|
||||
/************************************************************
|
||||
* NetGroupAdd (NETAPI32.@)
|
||||
*
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
|
||||
typedef enum _ENUM_PHASE
|
||||
{
|
||||
BuiltinPhase,
|
||||
|
|
|
@ -11,15 +11,12 @@
|
|||
|
||||
#include "netapi32.h"
|
||||
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
|
||||
/* GLOBALS *******************************************************************/
|
||||
|
||||
static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
|
||||
|
||||
|
||||
/* FUNCTIONS *****************************************************************/
|
||||
|
||||
NTSTATUS
|
||||
|
|
|
@ -14,9 +14,8 @@
|
|||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
#include "nbcmdqueue.h"
|
||||
|
||||
#include "netapi32.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netbios);
|
||||
|
||||
|
|
|
@ -17,15 +17,6 @@
|
|||
#ifndef __NBCMDQUEUE_H__
|
||||
#define __NBCMDQUEUE_H__
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <nb30.h>
|
||||
|
||||
/* This file defines a queue of pending NetBIOS commands. The queue operations
|
||||
* are thread safe, with the exception of NBCmdQueueDestroy: ensure no other
|
||||
* threads are manipulating the queue when calling NBCmdQueueDestroy.
|
||||
|
|
|
@ -19,10 +19,7 @@
|
|||
* rather more efficient than not having a name cache at all.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
//#include "wine/port.h"
|
||||
|
||||
#include "nbnamecache.h"
|
||||
#include "netapi32.h"
|
||||
|
||||
typedef struct _NBNameCacheNode
|
||||
{
|
||||
|
|
|
@ -17,16 +17,6 @@
|
|||
#ifndef __WINE_NBNAMECACHE_H
|
||||
#define __WINE_NBNAMECACHE_H
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <nb30.h>
|
||||
|
||||
struct NBNameCache;
|
||||
|
||||
/* Represents an entry in the name cache. If the NetBIOS name is known, it's
|
||||
|
|
|
@ -65,22 +65,10 @@
|
|||
* See also other FIXMEs in the code.
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
#include "netapi32.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winsock2.h>
|
||||
#include <wine/debug.h>
|
||||
#include <winreg.h>
|
||||
#include <iphlpapi.h>
|
||||
|
||||
#include "netbios.h"
|
||||
#include "nbnamecache.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netbios);
|
||||
|
||||
|
|
|
@ -16,17 +16,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#include <config.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
//#include "lm.h"
|
||||
#include "netbios.h"
|
||||
|
||||
#define NTOS_MODE_USER
|
||||
#include <ndk/rtlfuncs.h>
|
||||
#include "netapi32.h"
|
||||
|
||||
#include <lmserver.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netbios);
|
||||
|
||||
static HMODULE NETAPI32_hModule;
|
||||
|
|
|
@ -1,34 +1,32 @@
|
|||
|
||||
#ifndef __WINE_NETAPI32_H__
|
||||
#define __WINE_NETAPI32_H__
|
||||
|
||||
#include <wine/config.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include "ntstatus.h"
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winerror.h"
|
||||
//#include "lmcons.h"
|
||||
#include <lmaccess.h>
|
||||
#include <lmapibuf.h>
|
||||
#include <lmbrowsr.h>
|
||||
#include <lmerr.h>
|
||||
//#include "lmshare.h"
|
||||
//#include "lmuse.h"
|
||||
#include <ntsecapi.h>
|
||||
#include <dsrole.h>
|
||||
#include <dsgetdc.h>
|
||||
#include <nb30.h>
|
||||
#include <iphlpapi.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
//#include "wine/unicode.h"
|
||||
#include <wine/list.h>
|
||||
|
||||
#define NTOS_MODE_USER
|
||||
#include <ndk/kefuncs.h>
|
||||
#include <ndk/obfuncs.h>
|
||||
#include <ndk/rtlfuncs.h>
|
||||
|
||||
#include <ntsam.h>
|
||||
|
||||
#include "nbnamecache.h"
|
||||
#include "netbios.h"
|
||||
|
||||
NET_API_STATUS
|
||||
WINAPI
|
||||
|
@ -64,4 +62,4 @@ BuildSidFromSidAndRid(IN PSID SrcSid,
|
|||
BOOL
|
||||
NETAPI_IsLocalComputer(LMCSTR ServerName);
|
||||
|
||||
#endif
|
||||
#endif /* __WINE_NETAPI32_H__ */
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
|
||||
#include "netapi32.h"
|
||||
|
||||
#include "nbcmdqueue.h"
|
||||
#include "netbios.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netbios);
|
||||
|
||||
|
|
|
@ -17,12 +17,6 @@
|
|||
#ifndef __WINE_NETBIOS_H__
|
||||
#define __WINE_NETBIOS_H__
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <lm.h>
|
||||
#include <nb30.h>
|
||||
|
||||
/* This file describes the interface WINE's NetBIOS implementation uses to
|
||||
* interact with a transport implementation (where a transport might be
|
||||
* NetBIOS-over-TCP/IP (aka NetBT, NBT), NetBIOS-over-IPX, etc.)
|
||||
|
|
|
@ -15,9 +15,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include <lm.h>
|
||||
//#include "winerror.h"
|
||||
#include "netapi32.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(share);
|
||||
|
||||
|
|
|
@ -29,8 +29,10 @@
|
|||
|
||||
#include "netapi32.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
#include <ndk/kefuncs.h>
|
||||
#include <ndk/obfuncs.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
typedef struct _ENUM_CONTEXT
|
||||
{
|
||||
|
|
|
@ -18,28 +18,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
//#include "wine/port.h"
|
||||
#include "netapi32.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <stdlib.h>
|
||||
#include <ntstatus.h>
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winsock2.h"
|
||||
//#include "nb30.h"
|
||||
//#include "lmcons.h"
|
||||
//#include "lmapibuf.h"
|
||||
//#include "lmerr.h"
|
||||
//#include "lmwksta.h"
|
||||
#include <iphlpapi.h>
|
||||
//#include "winerror.h"
|
||||
#include <ntsecapi.h>
|
||||
#include "netbios.h"
|
||||
#include <wine/debug.h>
|
||||
#include <lmwksta.h>
|
||||
#include <lmjoin.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
|
||||
|
||||
|
|
Loading…
Reference in a new issue