From a1d23f5da6ba3ad6a6ca6fa1869e0345e94b4b9f Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Thu, 4 Jan 2001 22:59:48 +0000 Subject: [PATCH] Removed the 'fn' prefix (i.e. ICOM_FN). --- dlls/ddraw/d3dmaterial.c | 2 +- dlls/ddraw/d3dtexture.c | 2 +- dlls/ddraw/direct3d/mesa.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/joystick/linux.c | 2 +- dlls/dinput/joystick/linuxinput.c | 2 +- dlls/dinput/keyboard/main.c | 2 +- dlls/dinput/mouse/main.c | 2 +- dlls/dplayx/dplay.c | 12 +-- dlls/dplayx/dplobby.c | 12 +-- dlls/ole32/compobj.c | 2 +- dlls/ole32/ifs.c | 6 +- dlls/ole32/storage.c | 12 +-- include/wine/obj_base.h | 153 ++++++++++++++---------------- include/wine/obj_control.h | 4 + include/wine/obj_inplace.h | 4 + include/wine/obj_moniker.h | 4 + 17 files changed, 115 insertions(+), 110 deletions(-) diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c index bb702fe3671..70c77e0d0f3 100644 --- a/dlls/ddraw/d3dmaterial.c +++ b/dlls/ddraw/d3dmaterial.c @@ -217,7 +217,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_Initialize(LPDIRECT3DMATERIAL iface, * IDirect3DMaterial VTable */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(material_vtable.fn##fun)) +# define XCAST(fun) (typeof(material_vtable.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c index 73b6f6d68e8..c4b52aef661 100644 --- a/dlls/ddraw/d3dtexture.c +++ b/dlls/ddraw/d3dtexture.c @@ -611,7 +611,7 @@ ICOM_VTABLE(IDirect3DTexture2) mesa_texture2_vtable = * IDirect3DTexture VTable */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(mesa_texture_vtable.fn##fun)) +# define XCAST(fun) (typeof(mesa_texture_vtable.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d/mesa.c index d7fa735af48..71efa267b92 100644 --- a/dlls/ddraw/direct3d/mesa.c +++ b/dlls/ddraw/direct3d/mesa.c @@ -316,7 +316,7 @@ static HRESULT WINAPI MESA_IDirect3D3Impl_EvictManagedTextures( #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(mesa_d3d3vt.fn##fun)) +# define XCAST(fun) (typeof(mesa_d3d3vt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 01eab8976b2..1bfb489207b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -259,7 +259,7 @@ static ICOM_VTABLE(IDirectInputA) ddiavt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(ddi7avt.fn##fun)) +# define XCAST(fun) (typeof(ddi7avt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c index 48b4ce11529..f0499a81895 100644 --- a/dlls/dinput/joystick/linux.c +++ b/dlls/dinput/joystick/linux.c @@ -571,7 +571,7 @@ static ICOM_VTABLE(IDirectInputDevice2A) JoystickAvt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(Joystick7Avt.fn##fun)) +# define XCAST(fun) (typeof(Joystick7Avt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c index 179b99d0db6..2094572aa3d 100644 --- a/dlls/dinput/joystick/linuxinput.c +++ b/dlls/dinput/joystick/linuxinput.c @@ -841,7 +841,7 @@ static ICOM_VTABLE(IDirectInputDevice2A) JoystickAvt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(Joystick7Avt.fn##fun)) +# define XCAST(fun) (typeof(Joystick7Avt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard/main.c index df171db9f2f..698436b0084 100644 --- a/dlls/dinput/keyboard/main.c +++ b/dlls/dinput/keyboard/main.c @@ -266,7 +266,7 @@ static ICOM_VTABLE(IDirectInputDevice2A) SysKeyboardAvt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysKeyboard7Avt.fn##fun)) +# define XCAST(fun) (typeof(SysKeyboard7Avt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c index 90cd1252af3..ad3f008fd73 100644 --- a/dlls/dinput/mouse/main.c +++ b/dlls/dinput/mouse/main.c @@ -928,7 +928,7 @@ static ICOM_VTABLE(IDirectInputDevice2A) SysMouseAvt = }; #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysMouse7Avt.fn##fun)) +# define XCAST(fun) (typeof(SysMouse7Avt.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 28a62ec381c..4b63f0616bb 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4540,7 +4540,7 @@ static HRESULT WINAPI DirectPlay4WImpl_CancelPriority /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay2WVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay2WVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -4586,7 +4586,7 @@ static ICOM_VTABLE(IDirectPlay2) directPlay2WVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay2AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay2AVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -4633,7 +4633,7 @@ static ICOM_VTABLE(IDirectPlay2) directPlay2AVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay3AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay3AVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -4695,7 +4695,7 @@ static ICOM_VTABLE(IDirectPlay3) directPlay3AVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay3WVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay3WVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -4756,7 +4756,7 @@ static ICOM_VTABLE(IDirectPlay3) directPlay3WVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay4WVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay4WVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -4825,7 +4825,7 @@ static ICOM_VTABLE(IDirectPlay4) directPlay4WVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay4AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlay4AVT.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 5c44e694929..8fa426d0f84 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1737,7 +1737,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobbyAVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobbyAVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -1769,7 +1769,7 @@ static struct ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyAVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobbyWVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobbyWVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -1799,7 +1799,7 @@ static ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyWVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby2AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobby2AVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -1831,7 +1831,7 @@ static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2AVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby2AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobby2AVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -1865,7 +1865,7 @@ static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2WVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby3AVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobby3AVT.fun)) #else # define XCAST(fun) (void*) #endif @@ -1902,7 +1902,7 @@ static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3AVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby3WVT.fn##fun)) +# define XCAST(fun) (typeof(directPlayLobby3WVT.fun)) #else # define XCAST(fun) (void*) #endif diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 31607b80318..d8c8e3e02fe 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -598,7 +598,7 @@ HRESULT WINAPI StringFromCLSID16( if (!K32WOWCallback16Ex( (DWORD)((ICOM_VTABLE(IMalloc16)*)MapSL( (SEGPTR)ICOM_VTBL(((LPMALLOC16)MapSL((SEGPTR)mllc)))) - )->fnAlloc, + )->Alloc, WCB16_CDECL, 2*sizeof(DWORD), (LPVOID)args, diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index debe2709dbe..c915f7b814a 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -201,7 +201,7 @@ IMalloc16_Constructor() { if (!msegvt16) { msegvt16 = SEGPTR_NEW(ICOM_VTABLE(IMalloc16)); -#define VTENT(x) msegvt16->fn##x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(msegvt16->fn##x) +#define VTENT(x) msegvt16->x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(msegvt16->x) VTENT(QueryInterface); VTENT(AddRef); VTENT(Release); @@ -360,7 +360,7 @@ BOOL WINAPI IsValidInterface( return !( IsBadReadPtr(punk,4) || IsBadReadPtr(ICOM_VTBL(punk),4) || - IsBadReadPtr(ICOM_VTBL(punk)->fnQueryInterface,9) || - IsBadCodePtr(ICOM_VTBL(punk)->fnQueryInterface) + IsBadReadPtr(ICOM_VTBL(punk)->QueryInterface,9) || + IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->QueryInterface) ); } diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index d004e6beb0f..20982653b91 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -1097,11 +1097,11 @@ HRESULT WINAPI IStream16_fnWrite( static void _create_istream16(LPSTREAM16 *str) { IStream16Impl* lpst; - if (!strvt16.fnQueryInterface) { + if (!strvt16.QueryInterface) { HMODULE16 wp = GetModuleHandle16("STORAGE"); if (wp>=32) { /* FIXME: what is This GetProcAddress16. Should the name be IStream16_QueryInterface of IStream16_fnQueryInterface */ -#define VTENT(xfn) strvt16.fn##xfn = (void*)GetProcAddress16(wp,"IStream16_"#xfn);assert(strvt16.fn##xfn) +#define VTENT(xfn) strvt16.xfn = (void*)GetProcAddress16(wp,"IStream16_"#xfn);assert(strvt16.xfn) VTENT(QueryInterface); VTENT(AddRef); VTENT(Release); @@ -1121,7 +1121,7 @@ static void _create_istream16(LPSTREAM16 *str) { memcpy(segstrvt16,&strvt16,sizeof(strvt16)); segstrvt16 = (ICOM_VTABLE(IStream16)*)SEGPTR_GET(segstrvt16); } else { -#define VTENT(xfn) strvt16.fn##xfn = IStream16_fn##xfn; +#define VTENT(xfn) strvt16.xfn = IStream16_fn##xfn; VTENT(QueryInterface); VTENT(AddRef); VTENT(Release); @@ -1497,10 +1497,10 @@ HRESULT WINAPI IStorage16_fnOpenStream( static void _create_istorage16(LPSTORAGE16 *stg) { IStorage16Impl* lpst; - if (!stvt16.fnQueryInterface) { + if (!stvt16.QueryInterface) { HMODULE16 wp = GetModuleHandle16("STORAGE"); if (wp>=32) { -#define VTENT(xfn) stvt16.fn##xfn = (void*)GetProcAddress16(wp,"IStorage16_"#xfn); +#define VTENT(xfn) stvt16.xfn = (void*)GetProcAddress16(wp,"IStorage16_"#xfn); VTENT(QueryInterface) VTENT(AddRef) VTENT(Release) @@ -1524,7 +1524,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) { memcpy(segstvt16,&stvt16,sizeof(stvt16)); segstvt16 = (ICOM_VTABLE(IStorage16)*)SEGPTR_GET(segstvt16); } else { -#define VTENT(xfn) stvt16.fn##xfn = IStorage16_fn##xfn; +#define VTENT(xfn) stvt16.xfn = IStorage16_fn##xfn; VTENT(QueryInterface) VTENT(AddRef) VTENT(Release) diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h index 74982b860df..f31f0533a31 100644 --- a/include/wine/obj_base.h +++ b/include/wine/obj_base.h @@ -166,29 +166,29 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); * IDirect3DVtbl* lpVtbl; * }; * struct IDirect3DVtbl { - * HRESULT (*fnQueryInterface)(IDirect3D* me, REFIID riid, LPVOID* ppvObj); - * ULONG (*fnQueryInterface)(IDirect3D* me); - * ULONG (*fnQueryInterface)(IDirect3D* me); - * HRESULT (*fnInitialize)(IDirect3D* me, REFIID a); - * HRESULT (*fnEnumDevices)(IDirect3D* me, LPD3DENUMDEVICESCALLBACK a, LPVOID b); - * HRESULT (*fnCreateLight)(IDirect3D* me, LPDIRECT3DLIGHT* a, IUnknown* b); - * HRESULT (*fnCreateMaterial)(IDirect3D* me, LPDIRECT3DMATERIAL* a, IUnknown* b); - * HRESULT (*fnCreateViewport)(IDirect3D* me, LPDIRECT3DVIEWPORT* a, IUnknown* b); - * HRESULT (*fnFindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b); + * HRESULT (*QueryInterface)(IDirect3D* me, REFIID riid, LPVOID* ppvObj); + * ULONG (*QueryInterface)(IDirect3D* me); + * ULONG (*QueryInterface)(IDirect3D* me); + * HRESULT (*Initialize)(IDirect3D* me, REFIID a); + * HRESULT (*EnumDevices)(IDirect3D* me, LPD3DENUMDEVICESCALLBACK a, LPVOID b); + * HRESULT (*CreateLight)(IDirect3D* me, LPDIRECT3DLIGHT* a, IUnknown* b); + * HRESULT (*CreateMaterial)(IDirect3D* me, LPDIRECT3DMATERIAL* a, IUnknown* b); + * HRESULT (*CreateViewport)(IDirect3D* me, LPDIRECT3DVIEWPORT* a, IUnknown* b); + * HRESULT (*FindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b); * }; * * #ifdef ICOM_CINTERFACE * // *** IUnknown methods *** // - * #define IDirect3D_QueryInterface(p,a,b) (p)->lpVtbl->fnQueryInterface(p,a,b) - * #define IDirect3D_AddRef(p) (p)->lpVtbl->fnAddRef(p) - * #define IDirect3D_Release(p) (p)->lpVtbl->fnRelease(p) + * #define IDirect3D_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + * #define IDirect3D_AddRef(p) (p)->lpVtbl->AddRef(p) + * #define IDirect3D_Release(p) (p)->lpVtbl->Release(p) * // *** IDirect3D methods *** // - * #define IDirect3D_Initialize(p,a) (p)->lpVtbl->fnInitialize(p,a) - * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->fnEnumDevice(p,a,b) - * #define IDirect3D_CreateLight(p,a,b) (p)->lpVtbl->fnCreateLight(p,a,b) - * #define IDirect3D_CreateMaterial(p,a,b) (p)->lpVtbl->fnCreateMaterial(p,a,b) - * #define IDirect3D_CreateViewport(p,a,b) (p)->lpVtbl->fnCreateViewport(p,a,b) - * #define IDirect3D_FindDevice(p,a,b) (p)->lpVtbl->fnFindDevice(p,a,b) + * #define IDirect3D_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) + * #define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevice(p,a,b) + * #define IDirect3D_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b) + * #define IDirect3D_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b) + * #define IDirect3D_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b) + * #define IDirect3D_FindDevice(p,a,b) (p)->lpVtbl->FindDevice(p,a,b) * #endif * * Comments: @@ -212,23 +212,23 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); * And in C++ (with gcc's g++): * * typedef struct IDirect3D: public IUnknown { - * private: HRESULT (*fnInitialize)(IDirect3D* me, REFIID a); - * public: inline HRESULT Initialize(REFIID a) { return ((IDirect3D*)t.lpVtbl)->fnInitialize(this,a); }; - * private: HRESULT (*fnEnumDevices)(IDirect3D* me, LPD3DENUMDEVICESCALLBACK a, LPVOID b); + * private: HRESULT (*Initialize)(IDirect3D* me, REFIID a); + * public: inline HRESULT Initialize(REFIID a) { return ((IDirect3D*)t.lpVtbl)->Initialize(this,a); }; + * private: HRESULT (*EnumDevices)(IDirect3D* me, LPD3DENUMDEVICESCALLBACK a, LPVOID b); * public: inline HRESULT EnumDevices(LPD3DENUMDEVICESCALLBACK a, LPVOID b) - * { return ((IDirect3D*)t.lpVtbl)->fnEnumDevices(this,a,b); }; - * private: HRESULT (*fnCreateLight)(IDirect3D* me, LPDIRECT3DLIGHT* a, IUnknown* b); + * { return ((IDirect3D*)t.lpVtbl)->EnumDevices(this,a,b); }; + * private: HRESULT (*freateLight)(IDirect3D* me, LPDIRECT3DLIGHT* a, IUnknown* b); * public: inline HRESULT CreateLight(LPDIRECT3DLIGHT* a, IUnknown* b) - * { return ((IDirect3D*)t.lpVtbl)->fnCreateLight(this,a,b); }; - * private: HRESULT (*fnCreateMaterial)(IDirect3D* me, LPDIRECT3DMATERIAL* a, IUnknown* b); + * { return ((IDirect3D*)t.lpVtbl)->CreateLight(this,a,b); }; + * private: HRESULT (*CreateMaterial)(IDirect3D* me, LPDIRECT3DMATERIAL* a, IUnknown* b); * public: inline HRESULT CreateMaterial(LPDIRECT3DMATERIAL* a, IUnknown* b) - * { return ((IDirect3D*)t.lpVtbl)->fnCreateMaterial(this,a,b); }; - * private: HRESULT (*fnCreateViewport)(IDirect3D* me, LPDIRECT3DVIEWPORT* a, IUnknown* b); + * { return ((IDirect3D*)t.lpVtbl)->CreateMaterial(this,a,b); }; + * private: HRESULT (*CreateViewport)(IDirect3D* me, LPDIRECT3DVIEWPORT* a, IUnknown* b); * public: inline HRESULT CreateViewport(LPDIRECT3DVIEWPORT* a, IUnknown* b) - * { return ((IDirect3D*)t.lpVtbl)->fnCreateViewport(this,a,b); }; - * private: HRESULT (*fnFindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b); + * { return ((IDirect3D*)t.lpVtbl)->CreateViewport(this,a,b); }; + * private: HRESULT (*FindDevice)(IDirect3D* me, LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b); * public: inline HRESULT FindDevice(LPD3DFINDDEVICESEARCH a, LPD3DFINDDEVICERESULT b) - * { return ((IDirect3D*)t.lpVtbl)->fnFindDevice(this,a,b); }; + * { return ((IDirect3D*)t.lpVtbl)->FindDevice(this,a,b); }; * }; * * Comments: @@ -238,7 +238,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); * class. Here one macro can generate both. This means though that the first pointer, t.lpVtbl * defined in IUnknown, must be interpreted as the jump table pointer if we interpret the * structure as the the interface class, and as the function pointer to the QueryInterface - * method, t.fnQueryInterface, if we interpret the structure as the jump table. Fortunately this + * method, t.QueryInterface, if we interpret the structure as the jump table. Fortunately this * gymnastic is entirely taken care of in the header of IUnknown. * - Of course in C++ we use inheritance so that we don't have to duplicate the method definitions. * - Since IDirect3D does double duty, each ICOM_METHOD macro defines both a function pointer and @@ -271,7 +271,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); * * // implement the IDirect3D methods here * - * int IDirect3D_fnQueryInterface(IDirect3D* me) + * int IDirect3D_QueryInterface(IDirect3D* me) * { * ICOM_THIS(IDirect3D,me); * // ... @@ -281,11 +281,11 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); * * static ICOM_VTABLE(IDirect3D) d3dvt = { * ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE - * IDirect3D_fnQueryInterface, - * IDirect3D_fnAdd, - * IDirect3D_fnAdd2, - * IDirect3D_fnInitialize, - * IDirect3D_fnSetWidth + * IDirect3D_QueryInterface, + * IDirect3D_Add, + * IDirect3D_Add2, + * IDirect3D_Initialize, + * IDirect3D_SetWidth * }; * * Comments: @@ -376,67 +376,60 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); #endif /* ICOM_USE_COM_INTERFACE_ATTRIBUTE */ -#define ICOM_FN(xfn) xfn #define ICOM_VTBL(iface) (iface) #else /* C interface */ -#ifdef __WINE__ -#define ICOM_FN(xfn) fn##xfn -#else -#define ICOM_FN(xfn) xfn -#endif - #define ICOM_METHOD(ret,xfn) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me); #define ICOM_METHOD1(ret,xfn,ta,na) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a); #define ICOM_METHOD2(ret,xfn,ta,na,tb,nb) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b); #define ICOM_METHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c); #define ICOM_METHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d); #define ICOM_METHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e); #define ICOM_METHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f); #define ICOM_METHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g); #define ICOM_METHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h); #define ICOM_METHOD9(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i); #define ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j); #define ICOM_METHOD11(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk) \ - ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k); + ret CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k); #define ICOM_VMETHOD(xfn) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me); + void CALLBACK (*xfn)(ICOM_INTERFACE* me); #define ICOM_VMETHOD1(xfn,ta,na) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a); #define ICOM_VMETHOD2(xfn,ta,na,tb,nb) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b); #define ICOM_VMETHOD3(xfn,ta,na,tb,nb,tc,nc) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c); #define ICOM_VMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d); #define ICOM_VMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e); #define ICOM_VMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f); #define ICOM_VMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g); #define ICOM_VMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,nh) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h); #define ICOM_VMETHOD9(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ni) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i); #define ICOM_VMETHOD10(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,nj) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j); #define ICOM_VMETHOD11(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,nk) \ - void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k); + void CALLBACK (*xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k); #define ICOM_VTABLE(iface) iface##Vtbl @@ -476,18 +469,18 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax); #endif /*ICOM_CINTERFACE */ -#define ICOM_CALL(xfn, p) ICOM_VTBL(p)->ICOM_FN(##xfn)(p) -#define ICOM_CALL1(xfn, p,a) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a) -#define ICOM_CALL2(xfn, p,a,b) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b) -#define ICOM_CALL3(xfn, p,a,b,c) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c) -#define ICOM_CALL4(xfn, p,a,b,c,d) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d) -#define ICOM_CALL5(xfn, p,a,b,c,d,e) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e) -#define ICOM_CALL6(xfn, p,a,b,c,d,e,f) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f) -#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g) -#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h) -#define ICOM_CALL9(xfn, p,a,b,c,d,e,f,g,h,i) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i) -#define ICOM_CALL10(xfn, p,a,b,c,d,e,f,g,h,i,j) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i,j) -#define ICOM_CALL11(xfn, p,a,b,c,d,e,f,g,h,i,j,k) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i,j,k) +#define ICOM_CALL(xfn, p) ICOM_VTBL(p)->xfn(p) +#define ICOM_CALL1(xfn, p,a) ICOM_VTBL(p)->xfn(p,a) +#define ICOM_CALL2(xfn, p,a,b) ICOM_VTBL(p)->xfn(p,a,b) +#define ICOM_CALL3(xfn, p,a,b,c) ICOM_VTBL(p)->xfn(p,a,b,c) +#define ICOM_CALL4(xfn, p,a,b,c,d) ICOM_VTBL(p)->xfn(p,a,b,c,d) +#define ICOM_CALL5(xfn, p,a,b,c,d,e) ICOM_VTBL(p)->xfn(p,a,b,c,d,e) +#define ICOM_CALL6(xfn, p,a,b,c,d,e,f) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f) +#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f,g) +#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f,g,h) +#define ICOM_CALL9(xfn, p,a,b,c,d,e,f,g,h,i) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f,g,h,i) +#define ICOM_CALL10(xfn, p,a,b,c,d,e,f,g,h,i,j) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f,g,h,i,j) +#define ICOM_CALL11(xfn, p,a,b,c,d,e,f,g,h,i,j,k) ICOM_VTBL(p)->xfn(p,a,b,c,d,e,f,g,h,i,j,k) /***************************************************************************** diff --git a/include/wine/obj_control.h b/include/wine/obj_control.h index d3c38cf5384..e08d307b757 100644 --- a/include/wine/obj_control.h +++ b/include/wine/obj_control.h @@ -408,6 +408,10 @@ ICOM_DEFINE(IViewObjectEx,IViewObject2) /***************************************************************************** * IProvideClassInfo interface */ +#ifdef __WINE__ +#undef GetClassInfo +#endif + #define ICOM_INTERFACE IProvideClassInfo #define IProvideClassInfo_METHODS \ ICOM_METHOD1(HRESULT,GetClassInfo, ITypeInfo**,ppTI) diff --git a/include/wine/obj_inplace.h b/include/wine/obj_inplace.h index 146e24df23b..344238b0fef 100644 --- a/include/wine/obj_inplace.h +++ b/include/wine/obj_inplace.h @@ -409,6 +409,10 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName) /***************************************************************************** * IOleItemContainer interface */ +#ifdef __WINE__ +#undef GetObject +#endif + #define ICOM_INTERFACE IOleItemContainer #define IOleItemContainer_METHODS \ ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void**,ppvObject) \ diff --git a/include/wine/obj_moniker.h b/include/wine/obj_moniker.h index 83d5b1b3393..cb4bfce512b 100644 --- a/include/wine/obj_moniker.h +++ b/include/wine/obj_moniker.h @@ -298,6 +298,10 @@ ICOM_DEFINE(IRunnableObject,IUnknown) /***************************************************************************** * IRunningObjectTable interface */ +#ifdef __WINE__ +#undef GetObject +#endif + #define ICOM_INTERFACE IRunningObjectTable #define IRunningObjectTable_METHODS \ ICOM_METHOD4(HRESULT,Register, DWORD,grfFlags, IUnknown*,punkObject, IMoniker*,pmkObjectName, DWORD*,pdwRegister) \