* Improve header inclusions.
* 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=61339
This commit is contained in:
Amine Khaldi 2013-12-22 18:01:43 +00:00
parent 9bf098744c
commit 7291616d83
3 changed files with 8 additions and 25 deletions

View file

@ -21,11 +21,6 @@
#include "objsel_private.h" #include "objsel_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(objsel);
static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
{ {
return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);

View file

@ -21,10 +21,6 @@
#include "objsel_private.h" #include "objsel_private.h"
#include <rpcproxy.h> #include <rpcproxy.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(objsel);
LONG dll_refs = 0; LONG dll_refs = 0;
static HINSTANCE hInstance; static HINSTANCE hInstance;

View file

@ -18,29 +18,21 @@
* 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 <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 <string.h>
#include <stdarg.h>
//#include <stdio.h>
//#include "winerror.h"
#include <windef.h>
#include <winbase.h>
//#include "winreg.h"
//#include "wingdi.h"
//#include "winuser.h"
#define COBJMACROS #define COBJMACROS
#include <ole2.h> #include <windef.h>
//#include "strmif.h" #include <winbase.h>
//#include "olectl.h" #include <objbase.h>
//#include "unknwn.h"
#include <objsel.h> #include <objsel.h>
//#include "wine/unicode.h"
//#include "uuids.h" #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(objsel);
/********************************************************************** /**********************************************************************
* Dll lifetime tracking declaration for objsel.dll * Dll lifetime tracking declaration for objsel.dll