[MSTASK]

* 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=61418

diff --git a/reactos/dll/win32/mstask/factory.c b/reactos/dll/win32/mstask/factory.c
index 7459f51..25ec76f 100644 (file)
--- a/reactos/dll/win32/mstask/factory.c
+++ b/reactos/dll/win32/mstask/factory.c
@@ -17,9 +17,6 @@
  */
 
 #include "mstask_private.h"
  */
 
 #include "mstask_private.h"

-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);

 
 struct ClassFactoryImpl
 {
 
 struct ClassFactoryImpl
 {

diff --git a/reactos/dll/win32/mstask/mstask_main.c b/reactos/dll/win32/mstask/mstask_main.c
index 48d9788..512e0b2 100644 (file)
--- a/reactos/dll/win32/mstask/mstask_main.c
+++ b/reactos/dll/win32/mstask/mstask_main.c
@@ -16,16 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-//#include <stdio.h>
-

 #include "mstask_private.h"
 #include "mstask_private.h"

-//#include "objbase.h"
-#include <rpcproxy.h>
-
-#include <wine/debug.h>

 
 

-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+#include <rpcproxy.h>

 
 static HINSTANCE hInst;
 LONG dll_ref = 0;
 
 static HINSTANCE hInst;
 LONG dll_ref = 0;

diff --git a/reactos/dll/win32/mstask/mstask_private.h b/reactos/dll/win32/mstask/mstask_private.h
index 6ef0cae..b8f5042 100644 (file)
--- a/reactos/dll/win32/mstask/mstask_private.h
+++ b/reactos/dll/win32/mstask/mstask_private.h
@@ -19,20 +19,22 @@
 #ifndef __MSTASK_PRIVATE_H__
 #define __MSTASK_PRIVATE_H__
 
 #ifndef __MSTASK_PRIVATE_H__
 #define __MSTASK_PRIVATE_H__
 

+#include <stdarg.h>
+

 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 

-#include <stdarg.h>
-

 #define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>
 #define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>

-//#include "winuser.h"
-#include <ole2.h>
+#include <objbase.h>

 #include <mstask.h>
 
 #include <mstask.h>
 

+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+

 extern LONG dll_ref DECLSPEC_HIDDEN;
 
 typedef struct ClassFactoryImpl ClassFactoryImpl;
 extern LONG dll_ref DECLSPEC_HIDDEN;
 
 typedef struct ClassFactoryImpl ClassFactoryImpl;

diff --git a/reactos/dll/win32/mstask/task.c b/reactos/dll/win32/mstask/task.c
index c88b65b..fa4d098 100644 (file)
--- a/reactos/dll/win32/mstask/task.c
+++ b/reactos/dll/win32/mstask/task.c
@@ -17,9 +17,6 @@
  */
 
 #include "mstask_private.h"
  */
 
 #include "mstask_private.h"

-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/reactos/dll/win32/mstask/task_scheduler.c b/reactos/dll/win32/mstask/task_scheduler.c
index 20ff0e0..9b98108 100644 (file)
--- a/reactos/dll/win32/mstask/task_scheduler.c
+++ b/reactos/dll/win32/mstask/task_scheduler.c
@@ -16,15 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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 <corerror.h>

 #include "mstask_private.h"
 #include "mstask_private.h"

-#include <wine/debug.h>

 
 

-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+#include <corerror.h>

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/reactos/dll/win32/mstask/task_trigger.c b/reactos/dll/win32/mstask/task_trigger.c
index 9ef185b..9e98232 100644 (file)
--- a/reactos/dll/win32/mstask/task_trigger.c
+++ b/reactos/dll/win32/mstask/task_trigger.c
@@ -16,16 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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>
-#include <winternl.h>

 #include "mstask_private.h"
 #include "mstask_private.h"

-#include <wine/debug.h>

 
 

-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+#include <winternl.h>

 
 typedef struct
 {
 
 typedef struct
 {