Author: akhaldi Date: Wed Dec 25 21:09:20 2013 New Revision: 61418
URL: http://svn.reactos.org/svn/reactos?rev=61418&view=rev Log: [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
Modified: trunk/reactos/dll/win32/mstask/factory.c trunk/reactos/dll/win32/mstask/mstask_main.c trunk/reactos/dll/win32/mstask/mstask_private.h trunk/reactos/dll/win32/mstask/task.c trunk/reactos/dll/win32/mstask/task_scheduler.c trunk/reactos/dll/win32/mstask/task_trigger.c
Modified: trunk/reactos/dll/win32/mstask/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/factory.c?... ============================================================================== --- trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -17,9 +17,6 @@ */
#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask);
struct ClassFactoryImpl {
Modified: trunk/reactos/dll/win32/mstask/mstask_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/mstask_mai... ============================================================================== --- trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,16 +16,9 @@ * 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);
static HINSTANCE hInst; LONG dll_ref = 0;
Modified: trunk/reactos/dll/win32/mstask/mstask_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/mstask_pri... ============================================================================== --- trunk/reactos/dll/win32/mstask/mstask_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/mstask_private.h [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -19,19 +19,21 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_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 "winuser.h" -#include <ole2.h> +#include <objbase.h> #include <mstask.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mstask);
extern LONG dll_ref DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/mstask/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task.c?rev... ============================================================================== --- trunk/reactos/dll/win32/mstask/task.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -17,9 +17,6 @@ */
#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask);
typedef struct {
Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_sched... ============================================================================== --- trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,15 +16,9 @@ * 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 "mstask_private.h"
#include <corerror.h> -#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask);
typedef struct {
Modified: trunk/reactos/dll/win32/mstask/task_trigger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_trigg... ============================================================================== --- trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] Wed Dec 25 21:09:20 2013 @@ -16,16 +16,9 @@ * 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 "mstask_private.h" + #include <winternl.h> -#include "mstask_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mstask);
typedef struct {