* 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
This commit is contained in:
Amine Khaldi 2013-12-25 21:09:20 +00:00
parent 83cc61d079
commit 61bfe69c9b
6 changed files with 9 additions and 33 deletions

View file

@ -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
{ {

View file

@ -16,17 +16,10 @@
* 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 <rpcproxy.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mstask);
static HINSTANCE hInst; static HINSTANCE hInst;
LONG dll_ref = 0; LONG dll_ref = 0;

View file

@ -19,20 +19,22 @@
#ifndef __MSTASK_PRIVATE_H__ #ifndef __MSTASK_PRIVATE_H__
#define __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__
#include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
//#include "winuser.h" #include <objbase.h>
#include <ole2.h>
#include <mstask.h> #include <mstask.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mstask);
extern LONG dll_ref DECLSPEC_HIDDEN; extern LONG dll_ref DECLSPEC_HIDDEN;
typedef struct ClassFactoryImpl ClassFactoryImpl; typedef struct ClassFactoryImpl ClassFactoryImpl;

View file

@ -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
{ {

View file

@ -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 #include "mstask_private.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <corerror.h> #include <corerror.h>
#include "mstask_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mstask);
typedef struct typedef struct
{ {

View file

@ -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
{ {