Don't define BEGIN_INTERFACE in unknwn.h.

dlls/dbghelp/dbghelp_private.h

@@ -26,6 +26,7 @@
 #include "winbase.h"
 #include "winver.h"
 #include "dbghelp.h"
+#include "objbase.h"
 #include "oaidl.h"
 
 #include "cvconst.h"

dlls/dmband/dmband_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmband/dmutils.c

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmcompos/dmcompos_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmime/dmime_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmime/dmutils.c

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmloader/dmloader_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmscript/dmscript_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmstyle/dmstyle_private.h

@@ -36,6 +36,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmstyle/dmutils.c

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmsynth/dmsynth_private.h

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmusic/dmusic_private.h

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dmusic32/dmusic32_main.c

@@ -29,6 +29,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dswave/dswave_private.h

@@ -34,6 +34,7 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "winreg.h"
+#include "objbase.h"
 
 #include "dmusici.h"
 #include "dmusicf.h"

dlls/dxdiagn/dxdiag_private.h

@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "objbase.h"
 #include "oleauto.h"
 
 #include "dxdiag.h"

dlls/msi/msipriv.h

@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "msi.h"
 #include "msiquery.h"
+#include "objbase.h"
 #include "objidl.h"
 
 #define MSI_DATASIZEMASK 0x00ff

dlls/msi/query.h

@@ -25,6 +25,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "objbase.h"
 #include "objidl.h"
 #include "msi.h"
 #include "msiquery.h"

dlls/ole32/errorinfo.c

@@ -30,10 +30,10 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "objbase.h"
 #include "oleauto.h"
 #include "winerror.h"
 
-#include "objbase.h"
 #include "wine/unicode.h"
 #include "compobj_private.h"
 

dlls/oleaut32/hash.c

@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
+#include "objbase.h"
 #include "oaidl.h"
 #include "wine/debug.h"
 

dlls/oleaut32/olefont.c

@@ -34,8 +34,8 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"
-#include "oleauto.h"    /* for SysAllocString(....) */
 #include "objbase.h"
+#include "oleauto.h"    /* for SysAllocString(....) */
 #include "ole2.h"
 #include "olectl.h"
 #include "wine/debug.h"

dlls/oleaut32/safearray.c

@@ -42,9 +42,8 @@
 #include "windef.h"
 #include "winerror.h"
 #include "winbase.h"
-#include "oleauto.h"
-#include "wine/debug.h"
 #include "variant.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

dlls/oleaut32/varformat.c

@@ -35,11 +35,10 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "oleauto.h"
-#include "wine/debug.h"
 #include "wine/unicode.h"
 #include "winerror.h"
 #include "variant.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

dlls/oleaut32/variant.c

@@ -34,11 +34,10 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "oleauto.h"
-#include "wine/debug.h"
 #include "wine/unicode.h"
 #include "winerror.h"
 #include "variant.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(variant);
 

dlls/oleaut32/variant.h

@@ -21,6 +21,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winerror.h"
+#include "objbase.h"
 #include "oleauto.h"
 #include <math.h>
 

dlls/shell32/shell32_main.h

@@ -30,6 +30,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "commctrl.h"
+#include "objbase.h"
 #include "docobj.h"
 #include "undocshell.h"
 #include "shlobj.h"

dlls/shell32/shlview.c

@@ -51,6 +51,7 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "winnls.h"
+#include "objbase.h"
 #include "servprov.h"
 #include "shlguid.h"
 #include "wingdi.h"

dlls/shlwapi/ordinal.c

@@ -36,6 +36,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "objbase.h"
 #include "docobj.h"
 #include "exdisp.h"
 #include "shlguid.h"

include/objbase.h

@@ -290,7 +290,11 @@
 #endif
 #define DECLARE_INTERFACE_(iface,ibase) DECLARE_INTERFACE(iface)
 
-#define BEGIN_INTERFACE
+#ifdef ICOM_MSVTABLE_COMPAT
+# define BEGIN_INTERFACE long dummyRTTI1, dummyRTTI2;
+#else
+# define BEGIN_INTERFACE
+#endif
 #define END_INTERFACE
 
 #endif  /* __cplusplus && !CINTERFACE */

include/unknwn.h

@@ -11,13 +11,9 @@ extern "C" {
 #if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
 # define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
 # define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-# define BEGIN_INTERFACE ICOM_MSVTABLE_COMPAT_FIELDS
-# define END_INTERFACE
 #else
 # define ICOM_MSVTABLE_COMPAT_FIELDS
 # define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-# define BEGIN_INTERFACE
-# define END_INTERFACE
 #endif
 #ifndef __IUnknown_FWD_DEFINED__
 #define __IUnknown_FWD_DEFINED__

include/unknwn.idl

@@ -24,13 +24,9 @@ import "wtypes.idl";
 cpp_quote("#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))")
 cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;")
 cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,")
-cpp_quote("# define BEGIN_INTERFACE ICOM_MSVTABLE_COMPAT_FIELDS")
-cpp_quote("# define END_INTERFACE")
 cpp_quote("#else")
 cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS")
 cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE")
-cpp_quote("# define BEGIN_INTERFACE")
-cpp_quote("# define END_INTERFACE")
 cpp_quote("#endif")
 
 /* Interfaces */

programs/winedbg/debugger.h

@@ -33,6 +33,7 @@
 #include "winver.h"
 #include "dbghelp.h"
 #include "cvconst.h"
+#include "objbase.h"
 #include "oaidl.h"
 
 /* the debugger uses these exceptions for it's internal use */