* 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
This commit is contained in:
Amine Khaldi 2013-12-26 19:19:09 +00:00
parent 4e38168404
commit ecefc27d4b
9 changed files with 9 additions and 65 deletions

View file

@ -19,9 +19,6 @@
*/
#include "qmgr.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
typedef struct
{

View file

@ -19,9 +19,6 @@
*/
#include "qmgr.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
typedef struct
{

View file

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

View file

@ -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 "qmgr.h"
#include <stdarg.h>
#define COBJMACROS
#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);

View file

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

View file

@ -19,9 +19,6 @@
*/
#include "qmgr.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
BackgroundCopyManagerImpl globalMgr;

View file

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

View file

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

View file

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