[QMGR]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61432

diff --git a/reactos/dll/win32/qmgr/enum_files.c b/reactos/dll/win32/qmgr/enum_files.c
index 16106f8..8b01fd3 100644 (file)
--- a/reactos/dll/win32/qmgr/enum_files.c
+++ b/reactos/dll/win32/qmgr/enum_files.c
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 typedef struct
 {

diff --git a/reactos/dll/win32/qmgr/enum_jobs.c b/reactos/dll/win32/qmgr/enum_jobs.c
index e361555..6af19be 100644 (file)
--- a/reactos/dll/win32/qmgr/enum_jobs.c
+++ b/reactos/dll/win32/qmgr/enum_jobs.c
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 typedef struct
 {

diff --git a/reactos/dll/win32/qmgr/factory.c b/reactos/dll/win32/qmgr/factory.c
index 842b054..7a069f3 100644 (file)
--- a/reactos/dll/win32/qmgr/factory.c
+++ b/reactos/dll/win32/qmgr/factory.c
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 static ULONG WINAPI
 BITS_IClassFactory_AddRef(IClassFactory *iface)

diff --git a/reactos/dll/win32/qmgr/file.c b/reactos/dll/win32/qmgr/file.c
index 70caccf..6ba493a 100644 (file)
--- a/reactos/dll/win32/qmgr/file.c
+++ b/reactos/dll/win32/qmgr/file.c
@@ -18,27 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
+#include "qmgr.h"
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
 #include <urlmon.h>
 #include <wininet.h>
 
-#include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
-
 static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundCopyFile *iface)
 {
     return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface);

diff --git a/reactos/dll/win32/qmgr/job.c b/reactos/dll/win32/qmgr/job.c
index cc7c4c4..c4a2325 100644 (file)
--- a/reactos/dll/win32/qmgr/job.c
+++ b/reactos/dll/win32/qmgr/job.c
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface)
 {

diff --git a/reactos/dll/win32/qmgr/qmgr.c b/reactos/dll/win32/qmgr/qmgr.c
index 1987dc5..28a90d7 100644 (file)
--- a/reactos/dll/win32/qmgr/qmgr.c
+++ b/reactos/dll/win32/qmgr/qmgr.c
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 BackgroundCopyManagerImpl globalMgr;
 

diff --git a/reactos/dll/win32/qmgr/qmgr.h b/reactos/dll/win32/qmgr/qmgr.h
index 8c3db3e..c93bcc2 100644 (file)
--- a/reactos/dll/win32/qmgr/qmgr.h
+++ b/reactos/dll/win32/qmgr/qmgr.h
@@ -21,21 +21,24 @@
 #ifndef __QMGR_H__
 #define __QMGR_H__
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
+#define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>
+#include <winsvc.h>
 #include <objbase.h>
-
-#define COBJMACROS
 #include <bits1_5.h>
 
-//#include <string.h>
 #include <wine/list.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 /* Background copy job vtbl and related data */
 typedef struct

diff --git a/reactos/dll/win32/qmgr/qmgr_main.c b/reactos/dll/win32/qmgr/qmgr_main.c
index e02e863..267bd1f 100644 (file)
--- a/reactos/dll/win32/qmgr/qmgr_main.c
+++ b/reactos/dll/win32/qmgr/qmgr_main.c
@@ -21,29 +21,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "qmgr.h"
 
 #include <stdio.h>
 
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
 #include <winuser.h>
 #include <winreg.h>
 #include <advpub.h>
 #include <olectl.h>
-#include <winsvc.h>
-
-//#include "bits.h"
-#include "qmgr.h"
 #include <initguid.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
-
 /* Handle to the base address of this DLL */
 static HINSTANCE hInst;
 

diff --git a/reactos/dll/win32/qmgr/service.c b/reactos/dll/win32/qmgr/service.c
index b012789..702a74e 100644 (file)
--- a/reactos/dll/win32/qmgr/service.c
+++ b/reactos/dll/win32/qmgr/service.c
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-//#include "objbase.h"
-#include <winsvc.h>
-//#include "bits.h"
-
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 HANDLE stop_event = NULL;