Replaced references to interfaces.h by wine/obj_xxx.h headers instead

dlls/shell32/brsfolder.c

@@ -16,7 +16,7 @@
 #include "commctrl.h"
 #include "spy.h"
 
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "shell.h"
 #include "pidl.h"
 #include "shlobj.h"

graphics/d3dcommon.c

@@ -7,7 +7,7 @@
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"

graphics/d3ddevices.c

@@ -8,7 +8,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3dexecutebuffer.c

@@ -8,7 +8,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3dlight.c

@@ -8,7 +8,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3dmaterial.c

@@ -7,7 +7,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3dtexture.c

@@ -8,7 +8,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3dviewport.c

@@ -7,7 +7,7 @@
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"

include/interfaces.h

 #ifndef _WINE_INTERFACES_H
 #define _WINE_INTERFACES_H
 
+/* FIXME: This is not a standard Windows header. Move the contents of this file to the right place and then delete it. */
+
 #include "ole.h"
 #include "ole2.h"
 #include "compobj.h"
 
-#define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn)
-#define STDMETHOD_(ret,xfn) ret (CALLBACK *fn##xfn)
-#define PURE
-#define FAR
-#define	THIS_ THIS,
-
-/* fixme move to wine/obj_*.h */
+/* FIXME: move to the right place. Some belong to aoidl.h some to oleauto.h */
 DEFINE_OLEGUID(IID_IDispatch,       0x00020400,0,0);
 DEFINE_OLEGUID(IID_ITypeInfo,       0x00020401,0,0);
 DEFINE_OLEGUID(IID_ITypeLib,        0x00020402,0,0);
@@ -33,61 +29,5 @@ DEFINE_GUID(IID_ISupportErrorInfo,  0xDF0B3D60,0x547D,0x101B,0x8E,0x65,
 
 #include "objbase.h"
 
-#define THIS LPCLASSFACTORY this
-typedef struct {
-	STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
-	STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG,Release) (THIS) PURE;
-	STDMETHOD(CreateInstance) (THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID FAR* ppvObject) PURE;
-	STDMETHOD(LockServer) (THIS_ BOOL32) PURE;
-} *LPCLASSFACTORY_VTABLE,IClassFactory_VTable;
-
-#undef THIS
-
-#define THIS LPMALLOC32 this
-typedef struct {
-	STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
-	STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG,Release) (THIS) PURE;
-
-	STDMETHOD_(LPVOID,Alloc) ( THIS_ DWORD cb);
-	STDMETHOD_(LPVOID,Realloc) ( THIS_ LPVOID pv,DWORD cb);
-	STDMETHOD_(VOID,Free) ( THIS_ LPVOID pv);
-	STDMETHOD_(DWORD,GetSize) ( THIS_ LPVOID pv);
-	STDMETHOD_(INT32,DidAlloc) ( THIS_ LPVOID pv);
-	STDMETHOD_(LPVOID,HeapMinimize) ( THIS );
-} *LPMALLOC32_VTABLE,IMalloc32_VTable;
-
-#undef THIS
-
-#define THIS LPMALLOC16 this
-typedef struct {
-	STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
-	STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG,Release) (THIS) PURE;
-
-	STDMETHOD_(LPVOID,Alloc) ( THIS_ DWORD cb);
-	STDMETHOD_(LPVOID,Realloc) ( THIS_ LPVOID pv,DWORD cb);
-	STDMETHOD_(VOID,Free) ( THIS_ LPVOID pv);
-	STDMETHOD_(DWORD,GetSize) ( THIS_ LPVOID pv);
-	STDMETHOD_(INT16,DidAlloc) ( THIS_ LPVOID pv);
-	STDMETHOD_(LPVOID,HeapMinimize) ( THIS );
-} *LPMALLOC16_VTABLE,IMalloc16_VTable;
-
-#undef THIS
-
-/* private prototypes for the constructors */
-#ifdef __WINE__
-LPUNKNOWN	IUnknown_Constructor(void);
-LPMALLOC16	IMalloc16_Constructor(void);
-LPMALLOC32	IMalloc32_Constructor(void);
-#endif
-
-HRESULT WINAPI CoGetMalloc32(DWORD, LPMALLOC32*);
 
-#undef STDMETHOD
-#undef STDMETHOD_
-#undef PURE
-#undef FAR
-#undef THIS_
 #endif /*_WINE_INTERFACES_H*/

ole/safearray.c

@@ -15,7 +15,7 @@
 #include <strings.h>
 #include <stdio.h>
 #include <debug.h>
-#include <interfaces.h>
+#include "wine/obj_base.h"
 
 /* Localy used methods */
 static INT32  

ole/stg_bigblockfile.c

@@ -27,8 +27,8 @@
 #include "winerror.h"
 #include "ole.h"
 #include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 
 #include "storage32.h"
 

ole/stg_stream.c

@@ -17,8 +17,8 @@
 #include "winerror.h"
 #include "ole.h"
 #include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 
 #include "storage32.h"
 

ole/storage32.c

@@ -20,9 +20,8 @@
 #include "file.h"
 #include "ole.h"
 #include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
-#include "storage.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 #include "crtdll.h"
 #include "tchar.h"
 #include "heap.h"