Removed the 'fn' prefix (i.e. ICOM_FN).

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

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

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

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

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

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

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

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

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

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

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,

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)
 	);
 }

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)

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) 

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

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