Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove global -DCOBJMACROS for winedll's since they #define it themselves

Browse source 
now when needed

svn path=/trunk/; revision=11354
This commit is contained in:
Gé van Geldorp 2004-10-20 20:31:36 +00:00
parent 5df79e4eec
commit ef42acd73f
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/include/wine/shlwapi.h
View file

@ -1,4 +1,4 @@
/* $Id: shlwapi.h,v 1.8 2004/10/20 16:20:22 gvg Exp $ /* $Id: shlwapi.h,v 1.9 2004/10/20 20:31:36 gvg Exp $
* *
* Compatibility header * Compatibility header
* *
@ -13,17 +13,22 @@
#define __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H
#define INTERFACE IQueryAssociations #define INTERFACE IQueryAssociations
#define IQueryAssociations_METHODS \ DECLARE_INTERFACE_(IQueryAssociations,IUnknown)
IUnknown_METHODS \ {
STDMETHOD(Init)(THIS_ ASSOCF flags, LPCWSTR pszAssoc, HKEY hkProgid, HWND hwnd) PURE; \ /*** IUnknown methods ***/
STDMETHOD(GetString)(THIS_ ASSOCF flags, ASSOCSTR str, LPCWSTR pszExtra, LPWSTR pszOut, DWORD * pcchOut) PURE; \ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
STDMETHOD(GetKey)(THIS_ ASSOCF flags, ASSOCKEY key, LPCWSTR pszExtra, HKEY * phkeyOut) PURE; \ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD(GetData)(THIS_ ASSOCF flags, ASSOCDATA data, LPCWSTR pszExtra, LPVOID pvOut, DWORD * pcbOut) PURE; \ STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IQueryAssociations methods ***/
STDMETHOD(Init)(THIS_ ASSOCF flags, LPCWSTR pszAssoc, HKEY hkProgid, HWND hwnd) PURE;
STDMETHOD(GetString)(THIS_ ASSOCF flags, ASSOCSTR str, LPCWSTR pszExtra, LPWSTR pszOut, DWORD * pcchOut) PURE;
STDMETHOD(GetKey)(THIS_ ASSOCF flags, ASSOCKEY key, LPCWSTR pszExtra, HKEY * phkeyOut) PURE;
STDMETHOD(GetData)(THIS_ ASSOCF flags, ASSOCDATA data, LPCWSTR pszExtra, LPVOID pvOut, DWORD * pcbOut) PURE;
STDMETHOD(GetEnum)(THIS_ ASSOCF flags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID * ppvOut) PURE; STDMETHOD(GetEnum)(THIS_ ASSOCF flags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID * ppvOut) PURE;
DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { IQueryAssociations_METHODS }; };
#undef INTERFACE #undef INTERFACE
#ifdef COBJMACROS #if !defined(__cplusplus) || defined(CINTERFACE)
#define IQueryAssociations_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IQueryAssociations_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IQueryAssociations_AddRef(p) (p)->lpVtbl->AddRef(p) #define IQueryAssociations_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IQueryAssociations_Release(p) (p)->lpVtbl->Release(p) #define IQueryAssociations_Release(p) (p)->lpVtbl->Release(p)

4
reactos/lib/oleaut32/Makefile.ros-template
View file

@ -1,10 +1,10 @@
# $Id: Makefile.ros-template,v 1.4 2004/05/29 21:24:45 hbirr Exp $ # $Id: Makefile.ros-template,v 1.5 2004/10/20 20:31:36 gvg Exp $
TARGET_NAME = oleaut32 TARGET_NAME = oleaut32
TARGET_OBJECTS = @C_SRCS@ TARGET_OBJECTS = @C_SRCS@
TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -DCOBJMACROS
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a

10
reactos/tools/helper.mk
View file

@ -1,4 +1,4 @@
# $Id: helper.mk,v 1.87 2004/10/18 19:11:09 chorns Exp $ # $Id: helper.mk,v 1.88 2004/10/20 20:31:35 gvg Exp $
# #
# Helper makefile for ReactOS modules # Helper makefile for ReactOS modules
# Variables this makefile accepts: # Variables this makefile accepts:
@ -448,8 +448,8 @@ ifeq ($(TARGET_TYPE),winedll)
MK_DEFENTRY := _DllMain@12 MK_DEFENTRY := _DllMain@12
MK_DDKLIBS := MK_DDKLIBS :=
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D_STDDEF_H -DCOBJMACROS -I$(PATH_TO_TOP)/include/wine MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D_STDDEF_H -I$(PATH_TO_TOP)/include/wine
MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -DCOBJMACROS -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine
MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine
MK_IMPLIB := yes MK_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
@ -478,8 +478,8 @@ ifeq ($(TARGET_TYPE),winedrv)
MK_DEFENTRY := _DllMain@12 MK_DEFENTRY := _DllMain@12
MK_DDKLIBS := MK_DDKLIBS :=
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -DCOBJMACROS -I$(PATH_TO_TOP)/include/wine MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include/wine
MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -DCOBJMACROS -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine
MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine
MK_IMPLIB := yes MK_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no