* 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=61367
This commit is contained in:
Amine Khaldi 2013-12-24 11:32:15 +00:00
parent 570cbd0768
commit b975b24103
5 changed files with 6 additions and 22 deletions

View file

@ -20,11 +20,8 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <wine/debug.h>
#include <wine/list.h> #include <wine/list.h>
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
struct link_entry struct link_entry
{ {
struct list entry; struct list entry;

View file

@ -18,11 +18,6 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <wine/debug.h>
//#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
typedef struct { typedef struct {
IUnknown IUnknown_inner; IUnknown IUnknown_inner;
IAuthenticate IAuthenticate_iface; IAuthenticate IAuthenticate_iface;

View file

@ -22,11 +22,6 @@
#include <winreg.h> #include <winreg.h>
#include <rpcproxy.h> #include <rpcproxy.h>
#include <hlguids.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
static HINSTANCE instance; static HINSTANCE instance;

View file

@ -16,23 +16,25 @@
* 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 <stdarg.h>
#define COBJMACROS #define COBJMACROS
//#include "winerror.h"
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
//#include "winuser.h"
#include <ole2.h> #include <ole2.h>
#include <hlink.h> #include <hlink.h>
#include <hlguids.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

View file

@ -21,11 +21,6 @@
#include "hlink_private.h" #include "hlink_private.h"
#include <shellapi.h> #include <shellapi.h>
#include <hlguids.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
#define HLINK_SAVE_MAGIC 0x00000002 #define HLINK_SAVE_MAGIC 0x00000002
#define HLINK_SAVE_MONIKER_PRESENT 0x01 #define HLINK_SAVE_MONIKER_PRESENT 0x01