[akhaldi] 61443: [SETUPAPI] * Set the default debugging channel globally through the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

Author: akhaldi
Date: Fri Dec 27 11:32:40 2013
New Revision: 61443

URL: http://svn.reactos.org/svn/reactos?rev=61443&view=rev
Log:
[SETUPAPI]
* Set the default debugging channel globally through the main header.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

Modified:
    trunk/reactos/dll/win32/setupapi/cfgmgr.c
    trunk/reactos/dll/win32/setupapi/devclass.c
    trunk/reactos/dll/win32/setupapi/devinst.c
    trunk/reactos/dll/win32/setupapi/dirid.c
    trunk/reactos/dll/win32/setupapi/diskspace.c
    trunk/reactos/dll/win32/setupapi/driver.c
    trunk/reactos/dll/win32/setupapi/install.c
    trunk/reactos/dll/win32/setupapi/interface.c
    trunk/reactos/dll/win32/setupapi/misc.c
    trunk/reactos/dll/win32/setupapi/parser.c
    trunk/reactos/dll/win32/setupapi/query.c
    trunk/reactos/dll/win32/setupapi/queue.c
    trunk/reactos/dll/win32/setupapi/rpc.c
    trunk/reactos/dll/win32/setupapi/setupapi_private.h
    trunk/reactos/dll/win32/setupapi/setupcab.c
    trunk/reactos/dll/win32/setupapi/stringtable.c
    trunk/reactos/dll/win32/setupapi/stubs.c

Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/cfgmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/cfgmgr.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,7 +21,9 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#include <pnp_c.h>
+
+#include "rpc_private.h"

/* Registry key and value names */
 static const WCHAR Backslash[] = {'\', 0};

Modified: trunk/reactos/dll/win32/setupapi/devclass.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/devclass.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/devclass.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,7 +21,7 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#include <wingdi.h>

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/devinst.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst....
==============================================================================
--- trunk/reactos/dll/win32/setupapi/devinst.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/devinst.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -20,8 +20,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/dirid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dirid.c?...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/dirid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/dirid.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -19,8 +19,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

#define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR
 #define MIN_CSIDL_DIRID 0x4000

Modified: trunk/reactos/dll/win32/setupapi/diskspace.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspac...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/diskspace.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/diskspace.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -19,8 +19,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

typedef struct {
     WCHAR   lpzName[20];

Modified: trunk/reactos/dll/win32/setupapi/driver.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.c...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/driver.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/driver.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -19,8 +19,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install....
==============================================================================
--- trunk/reactos/dll/win32/setupapi/install.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/install.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,7 +21,8 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#include <winsvc.h>
+#include <ndk/cmfuncs.h>

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/interface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfac...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/interface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/interface.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -20,8 +20,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

/* Unicode constants */
 static const WCHAR AddInterface[]  = {'A','d','d','I','n','t','e','r','f','a','c','e',0};

Modified: trunk/reactos/dll/win32/setupapi/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?r...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/misc.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,7 +21,8 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#include <winver.h>
+#include <lzexpand.h>

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/parser.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.c...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/parser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/parser.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,7 +21,7 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+#include <ndk/obfuncs.h>

/* Unicode constants */
 static const WCHAR BackSlash[] = {'\',0};

Modified: trunk/reactos/dll/win32/setupapi/query.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c?...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/query.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/query.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -20,8 +20,6 @@

#include "setupapi_private.h"

-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
-
 static const WCHAR source_disks_names[] =
     {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};
 static const WCHAR source_disks_files[] =

Modified: trunk/reactos/dll/win32/setupapi/queue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c?...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/queue.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/queue.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,8 +21,6 @@
 #include "setupapi_private.h"

#include <aclapi.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

/* Unicode constants */
 static const WCHAR DotSecurity[]     = {'.','S','e','c','u','r','i','t','y',0};

Modified: trunk/reactos/dll/win32/setupapi/rpc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/rpc.c?re...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/rpc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/rpc.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -19,8 +19,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

static RPC_BINDING_HANDLE LocalBindingHandle = NULL;
 static HSTRING_TABLE LocalStringTable = NULL;

Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi_private.h	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -20,42 +20,29 @@
 #ifndef __SETUPAPI_PRIVATE_H
 #define __SETUPAPI_PRIVATE_H

-#include <fcntl.h>
-#include <share.h>
 #include <wchar.h>

#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 #define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <winsvc.h>
-#include <winver.h>
-#include <wingdi.h>
 #include <wincon.h>
 #include <objbase.h>
-#include <lzexpand.h>
 #include <cfgmgr32.h>
-#include <fdi.h>
 #include <regstr.h>
 #include <sddl.h>
 #include <setupapi.h>
 #include <shlobj.h>
-#include <wine/debug.h>
 #include <wine/unicode.h>
 #define NTOS_MODE_USER
-#include <ndk/cmfuncs.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>

-//#include <pseh/pseh2.h>
-
-#include <pnp_c.h>
-
-#include "rpc_private.h"
-//#include "resource.h"
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

#ifdef __REACTOS__
 #undef __WINESRC__

Modified: trunk/reactos/dll/win32/setupapi/setupcab.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupcab...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupcab.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupcab.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -24,6 +24,10 @@
  */

#include "setupapi_private.h"
+
+#include <fcntl.h>
+#include <share.h>
+#include <fdi.h>

HINSTANCE hInstance = 0;
 OSVERSIONINFOW OsVersionInfo;
@@ -55,8 +59,6 @@
   PVOID context;
   WCHAR most_recent_cabinet_name[MAX_PATH];
 } SC_HSC_W, *PSC_HSC_W;
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

static BOOL LoadCABINETDll(void)
 {

Modified: trunk/reactos/dll/win32/setupapi/stringtable.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringta...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/stringtable.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/stringtable.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -21,8 +21,6 @@
 #include "setupapi_private.h"

#define TABLE_DEFAULT_SIZE 256
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

typedef struct _TABLE_SLOT
 {

Modified: trunk/reactos/dll/win32/setupapi/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c?...
==============================================================================
--- trunk/reactos/dll/win32/setupapi/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/stubs.c	[iso-8859-1] Fri Dec 27 11:32:40 2013
@@ -19,8 +19,6 @@
  */

#include "setupapi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

/***********************************************************************
  *		pSetupRegistryDelnode(SETUPAPI.@)