Author: akhaldi Date: Fri Jan 24 20:24:47 2014 New Revision: 61793
URL: http://svn.reactos.org/svn/reactos?rev=61793&view=rev Log: [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
Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/browsr.c trunk/reactos/dll/win32/netapi32/ds.c trunk/reactos/dll/win32/netapi32/group.c trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/nbcmdqueue.c trunk/reactos/dll/win32/netapi32/nbcmdqueue.h trunk/reactos/dll/win32/netapi32/nbnamecache.c trunk/reactos/dll/win32/netapi32/nbnamecache.h trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/netbios.c trunk/reactos/dll/win32/netapi32/netbios.h trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/dll/win32/netapi32/user.c trunk/reactos/dll/win32/netapi32/wksta.c
Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.c... ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h"
WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -
/************************************************************ * ACCESS_QueryAdminDisplayInformation
Modified: trunk/reactos/dll/win32/netapi32/browsr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/browsr.c... ============================================================================== --- trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -20,6 +20,8 @@
#include "netapi32.h"
+#include <lmbrowsr.h> + /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) */
Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?rev... ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -19,6 +19,9 @@ */
#include "netapi32.h" + +#include <dsrole.h> +#include <dsgetdc.h>
WINE_DEFAULT_DEBUG_CHANNEL(ds);
Modified: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c?... ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h"
WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -
/************************************************************ * NetGroupAdd (NETAPI32.@)
Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_gr... ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h"
WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -
typedef enum _ENUM_PHASE {
Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?r... ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -11,14 +11,11 @@
#include "netapi32.h"
- WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
- /* GLOBALS *******************************************************************/
static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; -
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/netapi32/nbcmdqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbcmdque... ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbcmdqueue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbcmdqueue.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -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);
Modified: trunk/reactos/dll/win32/netapi32/nbcmdqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbcmdque... ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbcmdqueue.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbcmdqueue.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,15 +16,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
Modified: trunk/reactos/dll/win32/netapi32/nbnamecache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbnameca... ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbnamecache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbnamecache.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -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 {
Modified: trunk/reactos/dll/win32/netapi32/nbnamecache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbnameca... ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbnamecache.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbnamecache.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,16 +16,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;
Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?re... ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -65,22 +65,10 @@ * See also other FIXMEs in the code. */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> +#include "netapi32.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);
Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32... ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,16 +16,9 @@ * 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);
Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32... ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -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 @@ BOOL NETAPI_IsLocalComputer(LMCSTR ServerName);
-#endif +#endif /* __WINE_NETAPI32_H__ */
Modified: trunk/reactos/dll/win32/netapi32/netbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netbios.... ============================================================================== --- trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -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);
Modified: trunk/reactos/dll/win32/netapi32/netbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netbios.... ============================================================================== --- trunk/reactos/dll/win32/netapi32/netbios.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netbios.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,12 +16,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
Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c?... ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -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);
Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?r... ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -29,8 +29,10 @@
#include "netapi32.h"
+#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> + WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -
typedef struct _ENUM_CONTEXT {
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] Fri Jan 24 20:24:47 2014 @@ -18,28 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -//#include "wine/port.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 "netapi32.h" + +#include <lmwksta.h> +#include <lmjoin.h>
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);