[ros-diffs] [akhaldi] 61432: [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 th...

Author: akhaldi
Date: Thu Dec 26 19:19:09 2013
New Revision: 61432

URL: http://svn.reactos.org/svn/reactos?rev=61432&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/qmgr/enum_files.c
    trunk/reactos/dll/win32/qmgr/enum_jobs.c
    trunk/reactos/dll/win32/qmgr/factory.c
    trunk/reactos/dll/win32/qmgr/file.c
    trunk/reactos/dll/win32/qmgr/job.c
    trunk/reactos/dll/win32/qmgr/qmgr.c
    trunk/reactos/dll/win32/qmgr/qmgr.h
    trunk/reactos/dll/win32/qmgr/qmgr_main.c
    trunk/reactos/dll/win32/qmgr/service.c

Modified: trunk/reactos/dll/win32/qmgr/enum_files.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_files.…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/enum_files.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/enum_files.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/qmgr/enum_jobs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/enum_jobs.c…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/enum_jobs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/enum_jobs.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/qmgr/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/factory.c?r…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/factory.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/factory.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -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)

Modified: trunk/reactos/dll/win32/qmgr/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/file.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/file.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -18,26 +18,10 @@
  * 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 <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
+#include "qmgr.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)
 {

Modified: trunk/reactos/dll/win32/qmgr/job.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/job.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/job.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -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)
 {

Modified: trunk/reactos/dll/win32/qmgr/qmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/qmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/qmgr.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -19,9 +19,6 @@
  */
 
 #include "qmgr.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
 
 BackgroundCopyManagerImpl globalMgr;
 

Modified: trunk/reactos/dll/win32/qmgr/qmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.h?rev=…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/qmgr.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/qmgr.h	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -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

Modified: trunk/reactos/dll/win32/qmgr/qmgr_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr_main.c…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/qmgr_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/qmgr_main.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -21,28 +21,15 @@
  * 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;

Modified: trunk/reactos/dll/win32/qmgr/service.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/service.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/service.c	[iso-8859-1] Thu Dec 26 19:19:09 2013
@@ -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;