From 25e2a320a7f54ba0938868c6311a7e740e34ba70 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 22 Aug 2004 21:38:46 +0000
Subject: [PATCH] Don't define BEGIN_INTERFACE in unknwn.h.

---
 dlls/dbghelp/dbghelp_private.h   | 1 +
 dlls/dmband/dmband_private.h     | 1 +
 dlls/dmband/dmutils.c            | 1 +
 dlls/dmcompos/dmcompos_private.h | 1 +
 dlls/dmime/dmime_private.h       | 1 +
 dlls/dmime/dmutils.c             | 1 +
 dlls/dmloader/dmloader_private.h | 1 +
 dlls/dmscript/dmscript_private.h | 1 +
 dlls/dmstyle/dmstyle_private.h   | 1 +
 dlls/dmstyle/dmutils.c           | 1 +
 dlls/dmsynth/dmsynth_private.h   | 1 +
 dlls/dmusic/dmusic_private.h     | 1 +
 dlls/dmusic32/dmusic32_main.c    | 1 +
 dlls/dswave/dswave_private.h     | 1 +
 dlls/dxdiagn/dxdiag_private.h    | 1 +
 dlls/msi/msipriv.h               | 1 +
 dlls/msi/query.h                 | 1 +
 dlls/ole32/errorinfo.c           | 2 +-
 dlls/oleaut32/hash.c             | 1 +
 dlls/oleaut32/olefont.c          | 2 +-
 dlls/oleaut32/safearray.c        | 3 +--
 dlls/oleaut32/varformat.c        | 3 +--
 dlls/oleaut32/variant.c          | 3 +--
 dlls/oleaut32/variant.h          | 1 +
 dlls/shell32/shell32_main.h      | 1 +
 dlls/shell32/shlview.c           | 1 +
 dlls/shlwapi/ordinal.c           | 1 +
 include/objbase.h                | 6 +++++-
 include/unknwn.h                 | 4 ----
 include/unknwn.idl               | 4 ----
 programs/winedbg/debugger.h      | 1 +
 31 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index a9948b32276..ab8af1730c5 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/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"
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 6f579eb06b6..25a23b12e43 100644
--- a/dlls/dmband/dmband_private.h
+++ b/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"
diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c
index 852834b664a..19ae2d69235 100644
--- a/dlls/dmband/dmutils.c
+++ b/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"
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h
index 598a4f260d0..898b1b47dd8 100644
--- a/dlls/dmcompos/dmcompos_private.h
+++ b/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"
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index bc4f3dab3d1..0043cddb9bf 100644
--- a/dlls/dmime/dmime_private.h
+++ b/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"
diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c
index 852834b664a..19ae2d69235 100644
--- a/dlls/dmime/dmutils.c
+++ b/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"
diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h
index 32665114cc8..f26b48a53d5 100644
--- a/dlls/dmloader/dmloader_private.h
+++ b/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"
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 51f1c1cb3cf..b24020c8d3b 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/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"
diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h
index 76ea20aa69b..f4dc76590d7 100644
--- a/dlls/dmstyle/dmstyle_private.h
+++ b/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"
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index 852834b664a..19ae2d69235 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/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"
diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index f4a1e907af1..4c2da07f2cf 100644
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/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"
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index d6683a63c47..dbf6498fbdf 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/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"
diff --git a/dlls/dmusic32/dmusic32_main.c b/dlls/dmusic32/dmusic32_main.c
index bfc0f803811..bc851c8942c 100644
--- a/dlls/dmusic32/dmusic32_main.c
+++ b/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"
diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h
index 93bfc7638c0..6697c650320 100644
--- a/dlls/dswave/dswave_private.h
+++ b/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"
diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h
index ec6a0cb235e..2837226dc9c 100644
--- a/dlls/dxdiagn/dxdiag_private.h
+++ b/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"
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index e4154c0007d..ddedb8d434d 100644
--- a/dlls/msi/msipriv.h
+++ b/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
diff --git a/dlls/msi/query.h b/dlls/msi/query.h
index 39f3fabc4ca..6d949c61780 100644
--- a/dlls/msi/query.h
+++ b/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"
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index e24d9ca36e4..42b0c15ed0d 100644
--- a/dlls/ole32/errorinfo.c
+++ b/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"
 
diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c
index 4bc31316e9c..ce2f0e41232 100644
--- a/dlls/oleaut32/hash.c
+++ b/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"
 
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index 5a0c0b19194..c094c71d94d 100644
--- a/dlls/oleaut32/olefont.c
+++ b/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"
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 88763233181..6b61e514f52 100644
--- a/dlls/oleaut32/safearray.c
+++ b/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);
 
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 230cfff3f94..149a5c0a5c0 100644
--- a/dlls/oleaut32/varformat.c
+++ b/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);
 
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 45d0748bbea..3b785bfb173 100644
--- a/dlls/oleaut32/variant.c
+++ b/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);
 
diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h
index 15070b9c28b..237687a3209 100644
--- a/dlls/oleaut32/variant.h
+++ b/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>
 
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index d468eb18524..adb1103a13e 100644
--- a/dlls/shell32/shell32_main.h
+++ b/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"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index fee09ce3230..b3f973c0870 100644
--- a/dlls/shell32/shlview.c
+++ b/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"
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 2bec1b4d567..e4cdd7a1868 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/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"
diff --git a/include/objbase.h b/include/objbase.h
index b825f51c4bc..de745de9f48 100644
--- a/include/objbase.h
+++ b/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 */
diff --git a/include/unknwn.h b/include/unknwn.h
index 8ae8a5fdc6c..6046a4b184c 100644
--- a/include/unknwn.h
+++ b/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__
diff --git a/include/unknwn.idl b/include/unknwn.idl
index 6d4c186d029..922aae9cce1 100644
--- a/include/unknwn.idl
+++ b/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 */
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index 46d29607e78..23c9c9154d5 100644
--- a/programs/winedbg/debugger.h
+++ b/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 */
-- 
2.11.4.GIT