From d7b74d7460d63591f7b3fab85d6bf4fa8912bb16 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sat, 28 Feb 2004 20:14:33 +0000 Subject: [PATCH] move '#undef UNTERFACE' behind interface definitions svn path=/trunk/; revision=8458 --- reactos/include/wine/objidl.h | 74 +++++++++++++++---------------- reactos/lib/shell32/shellfolder.h | 1 - reactos/w32api/include/docobj.h | 8 ++-- reactos/w32api/include/exdisp.h | 8 ++-- reactos/w32api/include/intshcut.h | 2 +- reactos/w32api/include/mshtml.h | 16 +++---- reactos/w32api/include/oaidl.h | 24 +++++----- reactos/w32api/include/objidl.h | 74 +++++++++++++++---------------- reactos/w32api/include/ocidl.h | 74 +++++++++++++++---------------- reactos/w32api/include/oleacc.h | 2 +- reactos/w32api/include/oledlg.h | 2 +- reactos/w32api/include/oleidl.h | 38 ++++++++-------- reactos/w32api/include/richole.h | 4 +- reactos/w32api/include/servprov.h | 2 +- reactos/w32api/include/shlobj.h | 54 +++++++++++----------- reactos/w32api/include/unknwn.h | 4 +- reactos/w32api/include/vfw.h | 8 ++-- 17 files changed, 195 insertions(+), 200 deletions(-) diff --git a/reactos/include/wine/objidl.h b/reactos/include/wine/objidl.h index 48a62abeecc..848e5cf6fb2 100644 --- a/reactos/include/wine/objidl.h +++ b/reactos/include/wine/objidl.h @@ -440,7 +440,6 @@ DECLARE_ENUMERATOR_(IEnumMoniker,interface IMoniker*); DECLARE_ENUMERATOR_(IEnumUnknown,IUnknown*); EXTERN_C const IID IID_ISequentialStream; -#undef INTERFACE #define INTERFACE ISequentialStream DECLARE_INTERFACE_(ISequentialStream,IUnknown) { @@ -450,9 +449,9 @@ DECLARE_INTERFACE_(ISequentialStream,IUnknown) STDMETHOD(Read)(THIS_ void*,ULONG,ULONG*) PURE; STDMETHOD(Write)(THIS_ void const*,ULONG,ULONG*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStream; -#undef INTERFACE #define INTERFACE IStream DECLARE_INTERFACE_(IStream,ISequentialStream) { @@ -471,9 +470,9 @@ DECLARE_INTERFACE_(IStream,ISequentialStream) STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; STDMETHOD(Clone)(THIS_ LPSTREAM*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMarshal; -#undef INTERFACE #define INTERFACE IMarshal DECLARE_INTERFACE_(IMarshal,IUnknown) { @@ -487,9 +486,9 @@ DECLARE_INTERFACE_(IMarshal,IUnknown) STDMETHOD(ReleaseMarshalData) (THIS_ IStream*) PURE; STDMETHOD(DisconnectObject) (THIS_ DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStdMarshalInfo; -#undef INTERFACE #define INTERFACE IStdMarshalInfo DECLARE_INTERFACE_(IStdMarshalInfo,IUnknown) { @@ -498,9 +497,9 @@ DECLARE_INTERFACE_(IStdMarshalInfo,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassForHandler)(THIS_ DWORD,PVOID,CLSID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMalloc; -#undef INTERFACE #define INTERFACE IMalloc DECLARE_INTERFACE_(IMalloc,IUnknown) { @@ -514,9 +513,9 @@ DECLARE_INTERFACE_(IMalloc,IUnknown) STDMETHOD_(int,DidAlloc)(THIS_ void*) PURE; STDMETHOD_(void,HeapMinimize)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMallocSpy; -#undef INTERFACE #define INTERFACE IMallocSpy DECLARE_INTERFACE_(IMallocSpy,IUnknown) { @@ -536,9 +535,9 @@ DECLARE_INTERFACE_(IMallocSpy,IUnknown) STDMETHOD_(void,PreHeapMinimize)(THIS) PURE; STDMETHOD_(void,PostHeapMinimize)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMessageFilter; -#undef INTERFACE #define INTERFACE IMessageFilter DECLARE_INTERFACE_(IMessageFilter,IUnknown) { @@ -549,9 +548,9 @@ DECLARE_INTERFACE_(IMessageFilter,IUnknown) STDMETHOD_(DWORD,RetryRejectedCall)(THIS_ HTASK,DWORD,DWORD) PURE; STDMETHOD_(DWORD,MessagePending)(THIS_ HTASK,DWORD,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersist; -#undef INTERFACE #define INTERFACE IPersist DECLARE_INTERFACE_(IPersist,IUnknown) { @@ -560,9 +559,9 @@ DECLARE_INTERFACE_(IPersist,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassID)(THIS_ CLSID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistStream; -#undef INTERFACE #define INTERFACE IPersistStream DECLARE_INTERFACE_(IPersistStream,IPersist) { @@ -575,9 +574,9 @@ DECLARE_INTERFACE_(IPersistStream,IPersist) STDMETHOD(Save)(THIS_ IStream*,BOOL) PURE; STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRunningObjectTable; -#undef INTERFACE #define INTERFACE IRunningObjectTable DECLARE_INTERFACE_(IRunningObjectTable,IUnknown) { @@ -592,9 +591,9 @@ DECLARE_INTERFACE_(IRunningObjectTable,IUnknown) STDMETHOD(GetTimeOfLastChange)(THIS_ LPMONIKER,LPFILETIME) PURE; STDMETHOD(EnumRunning)(THIS_ IEnumMoniker**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IBindCtx; -#undef INTERFACE #define INTERFACE IBindCtx DECLARE_INTERFACE_(IBindCtx,IUnknown) { @@ -612,9 +611,9 @@ DECLARE_INTERFACE_(IBindCtx,IUnknown) STDMETHOD(EnumObjectParam)(THIS_ IEnumString**) PURE; STDMETHOD(RevokeObjectParam)(THIS_ LPOLESTR) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMoniker; -#undef INTERFACE #define INTERFACE IMoniker DECLARE_INTERFACE_(IMoniker,IPersistStream) { @@ -642,9 +641,9 @@ DECLARE_INTERFACE_(IMoniker,IPersistStream) STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,IMoniker*,LPOLESTR,ULONG*,IMoniker**) PURE; STDMETHOD(IsSystemMoniker)(THIS_ PDWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistStorage; -#undef INTERFACE #define INTERFACE IPersistStorage DECLARE_INTERFACE_(IPersistStorage,IPersist) { @@ -659,9 +658,9 @@ DECLARE_INTERFACE_(IPersistStorage,IPersist) STDMETHOD(SaveCompleted)(THIS_ LPSTORAGE) PURE; STDMETHOD(HandsOffStorage)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistFile; -#undef INTERFACE #define INTERFACE IPersistFile DECLARE_INTERFACE_(IPersistFile,IPersist) { @@ -675,9 +674,9 @@ DECLARE_INTERFACE_(IPersistFile,IPersist) STDMETHOD(SaveCompleted)(THIS_ LPCOLESTR) PURE; STDMETHOD(GetCurFile)(THIS_ LPOLESTR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IAdviseSink; -#undef INTERFACE #define INTERFACE IAdviseSink DECLARE_INTERFACE_(IAdviseSink,IUnknown) { @@ -690,9 +689,9 @@ DECLARE_INTERFACE_(IAdviseSink,IUnknown) STDMETHOD_(void,OnSave)(THIS) PURE; STDMETHOD_(void,OnClose)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IAdviseSink2; -#undef INTERFACE #define INTERFACE IAdviseSink2 DECLARE_INTERFACE_(IAdviseSink2,IAdviseSink) { @@ -706,9 +705,9 @@ DECLARE_INTERFACE_(IAdviseSink2,IAdviseSink) STDMETHOD_(void,OnClose)(THIS) PURE; STDMETHOD_(void,OnLinkSrcChange)(THIS_ IMoniker*); }; +#undef INTERFACE EXTERN_C const IID IID_IDataObject; -#undef INTERFACE #define INTERFACE IDataObject DECLARE_INTERFACE_(IDataObject,IUnknown) { @@ -725,9 +724,9 @@ DECLARE_INTERFACE_(IDataObject,IUnknown) STDMETHOD(DUnadvise)(THIS_ DWORD) PURE; STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IDataAdviseHolder; -#undef INTERFACE #define INTERFACE IDataAdviseHolder DECLARE_INTERFACE_(IDataAdviseHolder,IUnknown) { @@ -739,9 +738,9 @@ DECLARE_INTERFACE_(IDataAdviseHolder,IUnknown) STDMETHOD(EnumAdvise)(THIS_ IEnumSTATDATA**) PURE; STDMETHOD(SendOnDataChange)(THIS_ IDataObject*,DWORD,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStorage; -#undef INTERFACE #define INTERFACE IStorage DECLARE_INTERFACE_(IStorage,IUnknown) { @@ -764,9 +763,9 @@ DECLARE_INTERFACE_(IStorage,IUnknown) STDMETHOD(SetStateBits)(THIS_ DWORD,DWORD) PURE; STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRootStorage; -#undef INTERFACE #define INTERFACE IRootStorage DECLARE_INTERFACE_(IRootStorage,IPersist) { @@ -775,9 +774,9 @@ DECLARE_INTERFACE_(IRootStorage,IPersist) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(SwitchToFile)(THIS_ LPOLESTR) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcChannelBuffer; -#undef INTERFACE #define INTERFACE IRpcChannelBuffer DECLARE_INTERFACE_(IRpcChannelBuffer,IUnknown) { @@ -790,9 +789,9 @@ DECLARE_INTERFACE_(IRpcChannelBuffer,IUnknown) STDMETHOD(GetDestCtx)(THIS_ PDWORD,PVOID*) PURE; STDMETHOD(IsConnected)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcProxyBuffer; -#undef INTERFACE #define INTERFACE IRpcProxyBuffer DECLARE_INTERFACE_(IRpcProxyBuffer,IUnknown) { @@ -803,9 +802,9 @@ DECLARE_INTERFACE_(IRpcProxyBuffer,IUnknown) STDMETHOD_(void,Disconnect)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcStubBuffer; -#undef INTERFACE #define INTERFACE IRpcStubBuffer DECLARE_INTERFACE_(IRpcStubBuffer,IUnknown) { @@ -820,9 +819,9 @@ DECLARE_INTERFACE_(IRpcStubBuffer,IUnknown) STDMETHOD(DebugServerQueryInterface)(THIS_ PVOID*) PURE; STDMETHOD(DebugServerRelease)(THIS_ PVOID) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPSFactoryBuffer; -#undef INTERFACE #define INTERFACE IPSFactoryBuffer DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown) { @@ -832,9 +831,9 @@ DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown) STDMETHOD(CreateProxy)(THIS_ LPUNKNOWN,REFIID,LPRPCPROXYBUFFER*,PVOID*) PURE; STDMETHOD(CreateStub)(THIS_ REFIID,LPUNKNOWN,LPRPCSTUBBUFFER*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ILockBytes; -#undef INTERFACE #define INTERFACE ILockBytes DECLARE_INTERFACE_(ILockBytes,IUnknown) { @@ -849,9 +848,9 @@ DECLARE_INTERFACE_(ILockBytes,IUnknown) STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE; STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IExternalConnection; -#undef INTERFACE #define INTERFACE IExternalConnection DECLARE_INTERFACE_(IExternalConnection,IUnknown) { @@ -861,9 +860,9 @@ DECLARE_INTERFACE_(IExternalConnection,IUnknown) STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE; STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRunnableObject; -#undef INTERFACE #define INTERFACE IRunnableObject DECLARE_INTERFACE_(IRunnableObject,IUnknown) { @@ -876,9 +875,9 @@ DECLARE_INTERFACE_(IRunnableObject,IUnknown) STDMETHOD(LockRunning)(THIS_ BOOL,BOOL) PURE; STDMETHOD(SetContainedObject)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IROTData; -#undef INTERFACE #define INTERFACE IROTData DECLARE_INTERFACE_(IROTData,IUnknown) { @@ -887,9 +886,9 @@ DECLARE_INTERFACE_(IROTData,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetComparisonData)(THIS_ PVOID,ULONG,PULONG) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IChannelHook; -#undef INTERFACE #define INTERFACE IChannelHook DECLARE_INTERFACE_(IChannelHook,IUnknown) { @@ -903,9 +902,9 @@ DECLARE_INTERFACE_(IChannelHook,IUnknown) STDMETHOD_(void,ServerGetSize)(THIS_ REFGUID,REFIID,HRESULT,PULONG) PURE; STDMETHOD_(void,ServerFillBuffer)(THIS_ REFGUID,REFIID,PULONG,PVOID,HRESULT) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyStorage; -#undef INTERFACE #define INTERFACE IPropertyStorage DECLARE_INTERFACE_(IPropertyStorage,IUnknown) { @@ -925,9 +924,9 @@ DECLARE_INTERFACE_(IPropertyStorage,IUnknown) STDMETHOD(Stat)(THIS_ STATPROPSTG*) PURE; STDMETHOD(SetTimes)(THIS_ FILETIME const*,FILETIME const*,FILETIME const*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertySetStorage; -#undef INTERFACE #define INTERFACE IPropertySetStorage DECLARE_INTERFACE_(IPropertySetStorage,IUnknown) { @@ -939,9 +938,9 @@ DECLARE_INTERFACE_(IPropertySetStorage,IUnknown) STDMETHOD(Delete)(THIS_ REFFMTID) PURE; STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IClientSecurity; -#undef INTERFACE #define INTERFACE IClientSecurity DECLARE_INTERFACE_(IClientSecurity,IUnknown) { @@ -952,9 +951,9 @@ DECLARE_INTERFACE_(IClientSecurity,IUnknown) STDMETHOD(SetBlanket)(THIS_ PVOID,DWORD,DWORD,LPWSTR,DWORD,DWORD,RPC_AUTH_IDENTITY_HANDLE*,DWORD) PURE; STDMETHOD(CopyProxy)(THIS_ LPUNKNOWN,LPUNKNOWN*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IServerSecurity; -#undef INTERFACE #define INTERFACE IServerSecurity DECLARE_INTERFACE_(IServerSecurity,IUnknown) { @@ -966,9 +965,9 @@ DECLARE_INTERFACE_(IServerSecurity,IUnknown) STDMETHOD(RevertToSelf)(THIS) PURE; STDMETHOD(IsImpersonating)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IClassActivator; -#undef INTERFACE #define INTERFACE IClassActivator DECLARE_INTERFACE_(IClassActivator,IUnknown) { @@ -977,9 +976,9 @@ DECLARE_INTERFACE_(IClassActivator,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassObject)(THIS_ REFCLSID,DWORD,LCID,REFIID,PVOID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IFillLockBytes; -#undef INTERFACE #define INTERFACE IFillLockBytes DECLARE_INTERFACE_(IFillLockBytes,IUnknown) { @@ -991,9 +990,9 @@ DECLARE_INTERFACE_(IFillLockBytes,IUnknown) STDMETHOD(SetFillSize)(THIS_ ULARGE_INTEGER) PURE; STDMETHOD(Terminate)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IProgressNotify; -#undef INTERFACE #define INTERFACE IProgressNotify DECLARE_INTERFACE_(IProgressNotify,IUnknown) { @@ -1002,9 +1001,9 @@ DECLARE_INTERFACE_(IProgressNotify,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(OnProgress)(THIS_ DWORD,DWORD,BOOL,BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ILayoutStorage; -#undef INTERFACE #define INTERFACE ILayoutStorage DECLARE_INTERFACE_(ILayoutStorage,IUnknown) { @@ -1016,6 +1015,7 @@ DECLARE_INTERFACE_(ILayoutStorage,IUnknown) STDMETHOD(EndMonitor)(THIS) PURE; STDMETHOD(ReLayoutDocfile)(THIS_ OLECHAR*) PURE; }; +#undef INTERFACE HRESULT STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_Proxy(IMarshal*,REFIID,void*,DWORD,void*,DWORD,CLSID*); void STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD); diff --git a/reactos/lib/shell32/shellfolder.h b/reactos/lib/shell32/shellfolder.h index fd1b80f12ab..8c8901e4c57 100644 --- a/reactos/lib/shell32/shellfolder.h +++ b/reactos/lib/shell32/shellfolder.h @@ -39,7 +39,6 @@ typedef struct ISFHelper ISFHelper, *LPISFHELPER; * ISFHelper interface */ -#undef INTERFACE #define INTERFACE ISFHelper #define ISFHelper_METHODS \ IUnknown_METHODS \ diff --git a/reactos/w32api/include/docobj.h b/reactos/w32api/include/docobj.h index 27055dd845e..43a72782dc2 100644 --- a/reactos/w32api/include/docobj.h +++ b/reactos/w32api/include/docobj.h @@ -78,7 +78,6 @@ EXTERN_C const IID IID_IEnumOleDocumentViews; EXTERN_C const IID IID_IPrint; EXTERN_C const IID IID_IOleDocumentView; -#undef INTERFACE #define INTERFACE IOleDocumentView DECLARE_INTERFACE_(IOleDocumentView,IUnknown) { @@ -100,11 +99,11 @@ DECLARE_INTERFACE_(IOleDocumentView,IUnknown) STDMETHOD(ApplyViewState)(THIS_ IStream*) PURE; STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE; }; +#undef INTERFACE DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView); EXTERN_C const IID IID_IOleDocument; -#undef INTERFACE #define INTERFACE IOleDocument DECLARE_INTERFACE_(IOleDocument,IUnknown) { @@ -116,9 +115,9 @@ DECLARE_INTERFACE_(IOleDocument,IUnknown) STDMETHOD(GetDocMiscStatus)(THIS_ DWORD*) PURE; STDMETHOD(EnumViews)(THIS_ LPENUMOLEDOCUMENTVIEWS*,IOleDocumentView**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleCommandTarget; -#undef INTERFACE #define INTERFACE IOleCommandTarget DECLARE_INTERFACE_(IOleCommandTarget,IUnknown) { @@ -129,9 +128,9 @@ DECLARE_INTERFACE_(IOleCommandTarget,IUnknown) STDMETHOD(QueryStatus)(THIS_ const GUID*,ULONG,OLECMD*,OLECMDTEXT*) PURE; STDMETHOD(Exec)(THIS_ const GUID*,DWORD,DWORD,VARIANTARG*,VARIANTARG*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleDocumentSite; -#undef INTERFACE #define INTERFACE IOleDocumentSite DECLARE_INTERFACE_(IOleDocumentSite,IUnknown) { @@ -141,6 +140,7 @@ DECLARE_INTERFACE_(IOleDocumentSite,IUnknown) STDMETHOD(ActivateMe)(THIS_ IOleDocumentView*) PURE; }; +#undef INTERFACE #ifdef __cplusplus } diff --git a/reactos/w32api/include/exdisp.h b/reactos/w32api/include/exdisp.h index 9e747df1119..0656c063b82 100644 --- a/reactos/w32api/include/exdisp.h +++ b/reactos/w32api/include/exdisp.h @@ -24,7 +24,6 @@ typedef enum { } BrowserNavConstants; EXTERN_C const IID IID_IWebBrowser; -#undef INTERFACE #define INTERFACE IWebBrowser DECLARE_INTERFACE_(IWebBrowser,IDispatch) { @@ -62,9 +61,9 @@ DECLARE_INTERFACE_(IWebBrowser,IDispatch) STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE; STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IWebBrowserApp; -#undef INTERFACE #define INTERFACE IWebBrowserApp DECLARE_INTERFACE_(IWebBrowserApp,IWebBrowser) { @@ -123,9 +122,9 @@ DECLARE_INTERFACE_(IWebBrowserApp,IWebBrowser) STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL*) PURE; STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IWebBrowser2; -#undef INTERFACE #define INTERFACE IWebBrowser2 DECLARE_INTERFACE_(IWebBrowser2,IWebBrowserApp) { @@ -204,11 +203,11 @@ DECLARE_INTERFACE_(IWebBrowser2,IWebBrowserApp) STDMETHOD(get_Resizable)(THIS_ VARIANT_BOOL*) PURE; STDMETHOD(put_Resizable)(THIS_ VARIANT_BOOL) PURE; }; +#undef INTERFACE #define STDDISP(m) STDMETHOD_(void,m) EXTERN_C const IID DIID_DWebBrowserEvents2; -#undef INTERFACE #define INTERFACE DWebBrowserEvents2 DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch) { @@ -248,6 +247,7 @@ DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch) STDDISP(SetSecureLockIcon)(THIS_ long) PURE; STDDISP(FileDownload)(THIS_ VARIANT_BOOL*) PURE; }; +#undef INTERFACE #undef STDDISP diff --git a/reactos/w32api/include/intshcut.h b/reactos/w32api/include/intshcut.h index e4c87cd1073..9742ff917e0 100644 --- a/reactos/w32api/include/intshcut.h +++ b/reactos/w32api/include/intshcut.h @@ -45,7 +45,6 @@ typedef struct urlinvokecommandinfo { } URLINVOKECOMMANDINFO,*PURLINVOKECOMMANDINFO; typedef const URLINVOKECOMMANDINFO CURLINVOKECOMMANDINFO; typedef const URLINVOKECOMMANDINFO *PCURLINVOKECOMMANDINFO; -#undef INTERFACE #define INTERFACE IUniformResourceLocator DECLARE_INTERFACE_(IUniformResourceLocator,IUnknown) { @@ -56,6 +55,7 @@ DECLARE_INTERFACE_(IUniformResourceLocator,IUnknown) STDMETHOD(GetURL)(THIS_ PSTR*) PURE; STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFO) PURE; }; +#undef INTERFACE typedef IUniformResourceLocator *PIUniformResourceLocator; typedef const IUniformResourceLocator CIUniformResourceLocator; typedef const IUniformResourceLocator *PCIUniformResourceLocator; diff --git a/reactos/w32api/include/mshtml.h b/reactos/w32api/include/mshtml.h index 40115e9517a..281ce928dc2 100644 --- a/reactos/w32api/include/mshtml.h +++ b/reactos/w32api/include/mshtml.h @@ -22,7 +22,6 @@ typedef interface IHTMLLinkElement *LPHTMLLINKELEMENT; typedef interface IHTMLImgElement *LPHTMLIMGELEMENT; EXTERN_C const IID IID_IHTMLLinkElement; -#undef INTERFACE #define INTERFACE IHTMLLinkElement DECLARE_INTERFACE_(IHTMLLinkElement,IDispatch) { @@ -55,9 +54,9 @@ DECLARE_INTERFACE_(IHTMLLinkElement,IDispatch) STDMETHOD(put_media)(THIS_ BSTR) PURE; STDMETHOD(get_media)(THIS_ BSTR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLImgElement; -#undef INTERFACE #define INTERFACE IHTMLImgElement DECLARE_INTERFACE_(IHTMLImgElement,IDispatch) { @@ -118,9 +117,9 @@ DECLARE_INTERFACE_(IHTMLImgElement,IDispatch) STDMETHOD(put_start)(THIS_ BSTR) PURE; STDMETHOD(get_start)(THIS_ BSTR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLElementCollection; -#undef INTERFACE #define INTERFACE IHTMLElementCollection DECLARE_INTERFACE_(IHTMLElementCollection,IDispatch) { @@ -139,10 +138,10 @@ DECLARE_INTERFACE_(IHTMLElementCollection,IDispatch) STDMETHOD(item)(THIS_ VARIANT,VARIANT,IDispatch**) PURE; STDMETHOD(tags)(THIS_ VARIANT,IDispatch**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLDocument; -#undef INTERFACE #define INTERFACE IHTMLDocument DECLARE_INTERFACE_(IHTMLDocument,IDispatch) { @@ -156,9 +155,9 @@ DECLARE_INTERFACE_(IHTMLDocument,IDispatch) STDMETHOD(get_Script)(THIS_ IDispatch**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLDocument2; -#undef INTERFACE #define INTERFACE IHTMLDocument2 DECLARE_INTERFACE_(IHTMLDocument2,IHTMLDocument) { @@ -281,9 +280,9 @@ DECLARE_INTERFACE_(IHTMLDocument2,IHTMLDocument) STDMETHOD(toString)(THIS_ BSTR*) PURE; STDMETHOD(createStyleSheet)(THIS_ BSTR,long,LPHTMLSTYLESHEET*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLSelectionObject; -#undef INTERFACE #define INTERFACE IHTMLSelectionObject DECLARE_INTERFACE_(IHTMLSelectionObject,IDispatch) { @@ -300,9 +299,9 @@ DECLARE_INTERFACE_(IHTMLSelectionObject,IDispatch) STDMETHOD(clear)(THIS) PURE; STDMETHOD(type)(THIS_ BSTR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLTxtRange; -#undef INTERFACE #define INTERFACE IHTMLTxtRange DECLARE_INTERFACE_(IHTMLTxtRange,IDispatch) { @@ -345,9 +344,9 @@ DECLARE_INTERFACE_(IHTMLTxtRange,IDispatch) STDMETHOD(execCommand)(THIS_ BSTR,VARIANT_BOOL,VARIANT,VARIANT_BOOL*) PURE; STDMETHOD(execCommandShowHelp)(THIS_ BSTR,VARIANT_BOOL*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IHTMLElement; -#undef INTERFACE #define INTERFACE IHTMLElement DECLARE_INTERFACE_(IHTMLElement,IDispatch) { @@ -447,6 +446,7 @@ DECLARE_INTERFACE_(IHTMLElement,IDispatch) STDMETHOD(get_children)(THIS_ IDispatch**) PURE; STDMETHOD(get_all)(THIS_ IDispatch**) PURE; }; +#undef INTERFACE #ifdef __cplusplus } diff --git a/reactos/w32api/include/oaidl.h b/reactos/w32api/include/oaidl.h index 06c4116ab52..037022a54ac 100644 --- a/reactos/w32api/include/oaidl.h +++ b/reactos/w32api/include/oaidl.h @@ -457,7 +457,6 @@ typedef union tagBINDPTR { LPTYPECOMP lptcomp; } BINDPTR,*LPBINDPTR; -#undef INTERFACE #define INTERFACE IDispatch DECLARE_INTERFACE_(IDispatch,IUnknown) { @@ -469,8 +468,8 @@ DECLARE_INTERFACE_(IDispatch,IUnknown) STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; }; - #undef INTERFACE + #define INTERFACE IEnumVARIANT DECLARE_INTERFACE_(IEnumVARIANT,IUnknown) { @@ -482,8 +481,8 @@ DECLARE_INTERFACE_(IEnumVARIANT,IUnknown) STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ IEnumVARIANT**) PURE; }; - #undef INTERFACE + #define INTERFACE ITypeComp DECLARE_INTERFACE_(ITypeComp,IUnknown) { @@ -493,8 +492,8 @@ DECLARE_INTERFACE_(ITypeComp,IUnknown) STDMETHOD(Bind)(THIS_ LPOLESTR,ULONG,WORD,LPTYPEINFO*,DESCKIND*,LPBINDPTR) PURE; STDMETHOD(BindType)(THIS_ LPOLESTR,ULONG,LPTYPEINFO*,LPTYPECOMP*) PURE; }; - #undef INTERFACE + #define INTERFACE ITypeInfo DECLARE_INTERFACE_(ITypeInfo,IUnknown) { @@ -521,8 +520,8 @@ DECLARE_INTERFACE_(ITypeInfo,IUnknown) STDMETHOD_(void,ReleaseFuncDesc)(THIS_ LPFUNCDESC) PURE; STDMETHOD_(void,ReleaseVarDesc)(THIS_ LPVARDESC) PURE; }; - #undef INTERFACE + #define INTERFACE ITypeInfo2 DECLARE_INTERFACE_(ITypeInfo2,ITypeInfo) { @@ -564,8 +563,8 @@ DECLARE_INTERFACE_(ITypeInfo2,ITypeInfo) STDMETHOD(GetAllVarCustData)(THIS_ UINT,CUSTDATA*) PURE; STDMETHOD(GetAllImplTypeCustData)(THIS_ UINT,CUSTDATA*) PURE; }; - #undef INTERFACE + #define INTERFACE ITypeLib DECLARE_INTERFACE_(ITypeLib,IUnknown) { @@ -583,8 +582,8 @@ DECLARE_INTERFACE_(ITypeLib,IUnknown) STDMETHOD(FindName)(THIS_ LPOLESTR,ULONG,ITypeInfo**,MEMBERID*,USHORT*) PURE; STDMETHOD_(void,ReleaseTLibAttr)(THIS_ TLIBATTR*) PURE; }; - #undef INTERFACE + #define INTERFACE ITypeLib2 DECLARE_INTERFACE_(ITypeLib2,ITypeLib) { @@ -606,9 +605,9 @@ DECLARE_INTERFACE_(ITypeLib2,ITypeLib) STDMETHOD(GetDocumentation2)(THIS_ INT,LCID,BSTR*,DWORD*,BSTR*) PURE; STDMETHOD(GetAllCustData)(THIS_ CUSTDATA*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IErrorInfo; -#undef INTERFACE #define INTERFACE IErrorInfo DECLARE_INTERFACE_(IErrorInfo, IUnknown) { @@ -621,6 +620,7 @@ DECLARE_INTERFACE_(IErrorInfo, IUnknown) STDMETHOD(GetHelpFile)(THIS_ BSTR*) PURE; STDMETHOD(GetHelpContext)(THIS_ DWORD*) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IErrorInfo_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -634,7 +634,6 @@ DECLARE_INTERFACE_(IErrorInfo, IUnknown) #endif EXTERN_C const IID IID_ICreateErrorInfo; -#undef INTERFACE #define INTERFACE ICreateErrorInfo DECLARE_INTERFACE_(ICreateErrorInfo, IUnknown) { @@ -647,9 +646,9 @@ DECLARE_INTERFACE_(ICreateErrorInfo, IUnknown) STDMETHOD(SetHelpFile)(THIS_ LPOLESTR) PURE; STDMETHOD(SetHelpContext)(THIS_ DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ISupportErrorInfo; -#undef INTERFACE #define INTERFACE ISupportErrorInfo DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown) { @@ -658,9 +657,9 @@ DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(InterfaceSupportsErrorInfo)(THIS_ REFIID) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRecordInfo; -#undef INTERFACE #define INTERFACE IRecordInfo DECLARE_INTERFACE_(IRecordInfo, IUnknown) { @@ -684,9 +683,9 @@ DECLARE_INTERFACE_(IRecordInfo, IUnknown) STDMETHOD(RecordCreateCopy)(THIS_ PVOID,PVOID*) PURE; STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ITypeMarshal; -#undef INTERFACE #define INTERFACE ITypeMarshal DECLARE_INTERFACE_(ITypeMarshal, IUnknown) { @@ -698,6 +697,7 @@ DECLARE_INTERFACE_(ITypeMarshal, IUnknown) STDMETHOD(Unmarshal)(THIS_ PVOID,DWORD,ULONG,BYTE*,ULONG*) PURE; STDMETHOD(Free)(THIS_ PVOID) PURE; }; +#undef INTERFACE #ifdef __cplusplus } diff --git a/reactos/w32api/include/objidl.h b/reactos/w32api/include/objidl.h index 5dd99fdbb8b..52dc143ee29 100644 --- a/reactos/w32api/include/objidl.h +++ b/reactos/w32api/include/objidl.h @@ -425,7 +425,6 @@ DECLARE_ENUMERATOR_(IEnumMoniker,interface IMoniker*); DECLARE_ENUMERATOR_(IEnumUnknown,IUnknown*); EXTERN_C const IID IID_ISequentialStream; -#undef INTERFACE #define INTERFACE ISequentialStream DECLARE_INTERFACE_(ISequentialStream,IUnknown) { @@ -437,7 +436,6 @@ DECLARE_INTERFACE_(ISequentialStream,IUnknown) }; EXTERN_C const IID IID_IStream; -#undef INTERFACE #define INTERFACE IStream DECLARE_INTERFACE_(IStream,ISequentialStream) { @@ -456,9 +454,9 @@ DECLARE_INTERFACE_(IStream,ISequentialStream) STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; STDMETHOD(Clone)(THIS_ LPSTREAM*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMarshal; -#undef INTERFACE #define INTERFACE IMarshal DECLARE_INTERFACE_(IMarshal,IUnknown) { @@ -474,7 +472,6 @@ DECLARE_INTERFACE_(IMarshal,IUnknown) }; EXTERN_C const IID IID_IStdMarshalInfo; -#undef INTERFACE #define INTERFACE IStdMarshalInfo DECLARE_INTERFACE_(IStdMarshalInfo,IUnknown) { @@ -483,9 +480,9 @@ DECLARE_INTERFACE_(IStdMarshalInfo,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassForHandler)(THIS_ DWORD,PVOID,CLSID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMalloc; -#undef INTERFACE #define INTERFACE IMalloc DECLARE_INTERFACE_(IMalloc,IUnknown) { @@ -499,9 +496,9 @@ DECLARE_INTERFACE_(IMalloc,IUnknown) STDMETHOD_(int,DidAlloc)(THIS_ void*) PURE; STDMETHOD_(void,HeapMinimize)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMallocSpy; -#undef INTERFACE #define INTERFACE IMallocSpy DECLARE_INTERFACE_(IMallocSpy,IUnknown) { @@ -521,9 +518,9 @@ DECLARE_INTERFACE_(IMallocSpy,IUnknown) STDMETHOD_(void,PreHeapMinimize)(THIS) PURE; STDMETHOD_(void,PostHeapMinimize)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMessageFilter; -#undef INTERFACE #define INTERFACE IMessageFilter DECLARE_INTERFACE_(IMessageFilter,IUnknown) { @@ -534,9 +531,9 @@ DECLARE_INTERFACE_(IMessageFilter,IUnknown) STDMETHOD_(DWORD,RetryRejectedCall)(THIS_ HTASK,DWORD,DWORD) PURE; STDMETHOD_(DWORD,MessagePending)(THIS_ HTASK,DWORD,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersist; -#undef INTERFACE #define INTERFACE IPersist DECLARE_INTERFACE_(IPersist,IUnknown) { @@ -545,9 +542,9 @@ DECLARE_INTERFACE_(IPersist,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassID)(THIS_ CLSID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistStream; -#undef INTERFACE #define INTERFACE IPersistStream DECLARE_INTERFACE_(IPersistStream,IPersist) { @@ -560,9 +557,9 @@ DECLARE_INTERFACE_(IPersistStream,IPersist) STDMETHOD(Save)(THIS_ IStream*,BOOL) PURE; STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRunningObjectTable; -#undef INTERFACE #define INTERFACE IRunningObjectTable DECLARE_INTERFACE_(IRunningObjectTable,IUnknown) { @@ -577,9 +574,9 @@ DECLARE_INTERFACE_(IRunningObjectTable,IUnknown) STDMETHOD(GetTimeOfLastChange)(THIS_ LPMONIKER,LPFILETIME) PURE; STDMETHOD(EnumRunning)(THIS_ IEnumMoniker**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IBindCtx; -#undef INTERFACE #define INTERFACE IBindCtx DECLARE_INTERFACE_(IBindCtx,IUnknown) { @@ -597,9 +594,9 @@ DECLARE_INTERFACE_(IBindCtx,IUnknown) STDMETHOD(EnumObjectParam)(THIS_ IEnumString**) PURE; STDMETHOD(RevokeObjectParam)(THIS_ LPOLESTR) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IMoniker; -#undef INTERFACE #define INTERFACE IMoniker DECLARE_INTERFACE_(IMoniker,IPersistStream) { @@ -627,9 +624,9 @@ DECLARE_INTERFACE_(IMoniker,IPersistStream) STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,IMoniker*,LPOLESTR,ULONG*,IMoniker**) PURE; STDMETHOD(IsSystemMoniker)(THIS_ PDWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistStorage; -#undef INTERFACE #define INTERFACE IPersistStorage DECLARE_INTERFACE_(IPersistStorage,IPersist) { @@ -644,9 +641,9 @@ DECLARE_INTERFACE_(IPersistStorage,IPersist) STDMETHOD(SaveCompleted)(THIS_ LPSTORAGE) PURE; STDMETHOD(HandsOffStorage)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistFile; -#undef INTERFACE #define INTERFACE IPersistFile DECLARE_INTERFACE_(IPersistFile,IPersist) { @@ -660,9 +657,9 @@ DECLARE_INTERFACE_(IPersistFile,IPersist) STDMETHOD(SaveCompleted)(THIS_ LPCOLESTR) PURE; STDMETHOD(GetCurFile)(THIS_ LPOLESTR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IAdviseSink; -#undef INTERFACE #define INTERFACE IAdviseSink DECLARE_INTERFACE_(IAdviseSink,IUnknown) { @@ -675,9 +672,9 @@ DECLARE_INTERFACE_(IAdviseSink,IUnknown) STDMETHOD_(void,OnSave)(THIS) PURE; STDMETHOD_(void,OnClose)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IAdviseSink2; -#undef INTERFACE #define INTERFACE IAdviseSink2 DECLARE_INTERFACE_(IAdviseSink2,IAdviseSink) { @@ -691,9 +688,9 @@ DECLARE_INTERFACE_(IAdviseSink2,IAdviseSink) STDMETHOD_(void,OnClose)(THIS) PURE; STDMETHOD_(void,OnLinkSrcChange)(THIS_ IMoniker*); }; +#undef INTERFACE EXTERN_C const IID IID_IDataObject; -#undef INTERFACE #define INTERFACE IDataObject DECLARE_INTERFACE_(IDataObject,IUnknown) { @@ -710,9 +707,9 @@ DECLARE_INTERFACE_(IDataObject,IUnknown) STDMETHOD(DUnadvise)(THIS_ DWORD) PURE; STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IDataAdviseHolder; -#undef INTERFACE #define INTERFACE IDataAdviseHolder DECLARE_INTERFACE_(IDataAdviseHolder,IUnknown) { @@ -724,9 +721,9 @@ DECLARE_INTERFACE_(IDataAdviseHolder,IUnknown) STDMETHOD(EnumAdvise)(THIS_ IEnumSTATDATA**) PURE; STDMETHOD(SendOnDataChange)(THIS_ IDataObject*,DWORD,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStorage; -#undef INTERFACE #define INTERFACE IStorage DECLARE_INTERFACE_(IStorage,IUnknown) { @@ -749,9 +746,9 @@ DECLARE_INTERFACE_(IStorage,IUnknown) STDMETHOD(SetStateBits)(THIS_ DWORD,DWORD) PURE; STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRootStorage; -#undef INTERFACE #define INTERFACE IRootStorage DECLARE_INTERFACE_(IRootStorage,IPersist) { @@ -760,9 +757,9 @@ DECLARE_INTERFACE_(IRootStorage,IPersist) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(SwitchToFile)(THIS_ LPOLESTR) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcChannelBuffer; -#undef INTERFACE #define INTERFACE IRpcChannelBuffer DECLARE_INTERFACE_(IRpcChannelBuffer,IUnknown) { @@ -775,9 +772,9 @@ DECLARE_INTERFACE_(IRpcChannelBuffer,IUnknown) STDMETHOD(GetDestCtx)(THIS_ PDWORD,PVOID*) PURE; STDMETHOD(IsConnected)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcProxyBuffer; -#undef INTERFACE #define INTERFACE IRpcProxyBuffer DECLARE_INTERFACE_(IRpcProxyBuffer,IUnknown) { @@ -788,9 +785,9 @@ DECLARE_INTERFACE_(IRpcProxyBuffer,IUnknown) STDMETHOD_(void,Disconnect)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRpcStubBuffer; -#undef INTERFACE #define INTERFACE IRpcStubBuffer DECLARE_INTERFACE_(IRpcStubBuffer,IUnknown) { @@ -805,9 +802,9 @@ DECLARE_INTERFACE_(IRpcStubBuffer,IUnknown) STDMETHOD(DebugServerQueryInterface)(THIS_ PVOID*) PURE; STDMETHOD(DebugServerRelease)(THIS_ PVOID) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPSFactoryBuffer; -#undef INTERFACE #define INTERFACE IPSFactoryBuffer DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown) { @@ -817,10 +814,10 @@ DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown) STDMETHOD(CreateProxy)(THIS_ LPUNKNOWN,REFIID,LPRPCPROXYBUFFER*,PVOID*) PURE; STDMETHOD(CreateStub)(THIS_ REFIID,LPUNKNOWN,LPRPCSTUBBUFFER*) PURE; }; +#undef INTERFACE typedef interface IPSFactoryBuffer *LPPSFACTORYBUFFER; EXTERN_C const IID IID_ILockBytes; -#undef INTERFACE #define INTERFACE ILockBytes DECLARE_INTERFACE_(ILockBytes,IUnknown) { @@ -835,9 +832,9 @@ DECLARE_INTERFACE_(ILockBytes,IUnknown) STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE; STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IExternalConnection; -#undef INTERFACE #define INTERFACE IExternalConnection DECLARE_INTERFACE_(IExternalConnection,IUnknown) { @@ -847,9 +844,9 @@ DECLARE_INTERFACE_(IExternalConnection,IUnknown) STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE; STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IRunnableObject; -#undef INTERFACE #define INTERFACE IRunnableObject DECLARE_INTERFACE_(IRunnableObject,IUnknown) { @@ -862,9 +859,9 @@ DECLARE_INTERFACE_(IRunnableObject,IUnknown) STDMETHOD(LockRunning)(THIS_ BOOL,BOOL) PURE; STDMETHOD(SetContainedObject)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IROTData; -#undef INTERFACE #define INTERFACE IROTData DECLARE_INTERFACE_(IROTData,IUnknown) { @@ -873,9 +870,9 @@ DECLARE_INTERFACE_(IROTData,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetComparisonData)(THIS_ PVOID,ULONG,PULONG) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IChannelHook; -#undef INTERFACE #define INTERFACE IChannelHook DECLARE_INTERFACE_(IChannelHook,IUnknown) { @@ -889,9 +886,9 @@ DECLARE_INTERFACE_(IChannelHook,IUnknown) STDMETHOD_(void,ServerGetSize)(THIS_ REFGUID,REFIID,HRESULT,PULONG) PURE; STDMETHOD_(void,ServerFillBuffer)(THIS_ REFGUID,REFIID,PULONG,PVOID,HRESULT) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyStorage; -#undef INTERFACE #define INTERFACE IPropertyStorage DECLARE_INTERFACE_(IPropertyStorage,IUnknown) { @@ -911,9 +908,9 @@ DECLARE_INTERFACE_(IPropertyStorage,IUnknown) STDMETHOD(Stat)(THIS_ STATPROPSTG*) PURE; STDMETHOD(SetTimes)(THIS_ FILETIME const*,FILETIME const*,FILETIME const*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertySetStorage; -#undef INTERFACE #define INTERFACE IPropertySetStorage DECLARE_INTERFACE_(IPropertySetStorage,IUnknown) { @@ -925,9 +922,9 @@ DECLARE_INTERFACE_(IPropertySetStorage,IUnknown) STDMETHOD(Delete)(THIS_ REFFMTID) PURE; STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IClientSecurity; -#undef INTERFACE #define INTERFACE IClientSecurity DECLARE_INTERFACE_(IClientSecurity,IUnknown) { @@ -938,9 +935,9 @@ DECLARE_INTERFACE_(IClientSecurity,IUnknown) STDMETHOD(SetBlanket)(THIS_ PVOID,DWORD,DWORD,LPWSTR,DWORD,DWORD,RPC_AUTH_IDENTITY_HANDLE*,DWORD) PURE; STDMETHOD(CopyProxy)(THIS_ LPUNKNOWN,LPUNKNOWN*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IServerSecurity; -#undef INTERFACE #define INTERFACE IServerSecurity DECLARE_INTERFACE_(IServerSecurity,IUnknown) { @@ -952,9 +949,9 @@ DECLARE_INTERFACE_(IServerSecurity,IUnknown) STDMETHOD(RevertToSelf)(THIS) PURE; STDMETHOD(IsImpersonating)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IClassActivator; -#undef INTERFACE #define INTERFACE IClassActivator DECLARE_INTERFACE_(IClassActivator,IUnknown) { @@ -963,9 +960,9 @@ DECLARE_INTERFACE_(IClassActivator,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassObject)(THIS_ REFCLSID,DWORD,LCID,REFIID,PVOID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IFillLockBytes; -#undef INTERFACE #define INTERFACE IFillLockBytes DECLARE_INTERFACE_(IFillLockBytes,IUnknown) { @@ -977,9 +974,9 @@ DECLARE_INTERFACE_(IFillLockBytes,IUnknown) STDMETHOD(SetFillSize)(THIS_ ULARGE_INTEGER) PURE; STDMETHOD(Terminate)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IProgressNotify; -#undef INTERFACE #define INTERFACE IProgressNotify DECLARE_INTERFACE_(IProgressNotify,IUnknown) { @@ -988,9 +985,9 @@ DECLARE_INTERFACE_(IProgressNotify,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(OnProgress)(THIS_ DWORD,DWORD,BOOL,BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ILayoutStorage; -#undef INTERFACE #define INTERFACE ILayoutStorage DECLARE_INTERFACE_(ILayoutStorage,IUnknown) { @@ -1002,9 +999,9 @@ DECLARE_INTERFACE_(ILayoutStorage,IUnknown) STDMETHOD(EndMonitor)(THIS) PURE; STDMETHOD(ReLayoutDocfile)(THIS_ OLECHAR*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IGlobalInterfaceTable; -#undef INTERFACE #define INTERFACE IGlobalInterfaceTable DECLARE_INTERFACE_(IGlobalInterfaceTable,IUnknown) { @@ -1015,6 +1012,7 @@ DECLARE_INTERFACE_(IGlobalInterfaceTable,IUnknown) STDMETHOD(RevokeInterfaceFromGlobal)(THIS_ DWORD) PURE; STDMETHOD(GetInterfaceFromGlobal)(THIS_ DWORD,REFIID,void**) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IGlobalInterfaceTable_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) diff --git a/reactos/w32api/include/ocidl.h b/reactos/w32api/include/ocidl.h index 3dbfac2965b..d608d719abf 100644 --- a/reactos/w32api/include/ocidl.h +++ b/reactos/w32api/include/ocidl.h @@ -139,7 +139,6 @@ typedef struct tagPROPPAGEINFO { } PROPPAGEINFO,*LPPROPPAGEINFO; EXTERN_C const IID IID_IOleControl; -#undef INTERFACE #define INTERFACE IOleControl DECLARE_INTERFACE_(IOleControl,IUnknown) { @@ -151,9 +150,9 @@ DECLARE_INTERFACE_(IOleControl,IUnknown) STDMETHOD(OnAmbientPropertyChange)(THIS_ DISPID) PURE; STDMETHOD(FreezeEvents)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleControlSite; -#undef INTERFACE #define INTERFACE IOleControlSite DECLARE_INTERFACE_(IOleControlSite,IUnknown) { @@ -168,6 +167,7 @@ DECLARE_INTERFACE_(IOleControlSite,IUnknown) STDMETHOD(OnFocus)(THIS_ BOOL) PURE; STDMETHOD(ShowPropertyFrame)(THIS) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleControlSite_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -183,7 +183,6 @@ DECLARE_INTERFACE_(IOleControlSite,IUnknown) #endif EXTERN_C const IID IID_ISimpleFrameSite; -#undef INTERFACE #define INTERFACE ISimpleFrameSite DECLARE_INTERFACE_(ISimpleFrameSite,IUnknown) { @@ -193,9 +192,9 @@ DECLARE_INTERFACE_(ISimpleFrameSite,IUnknown) STDMETHOD(PreMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,PDWORD) PURE; STDMETHOD(PostMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IErrorLog; -#undef INTERFACE #define INTERFACE IErrorLog DECLARE_INTERFACE_(IErrorLog,IUnknown) { @@ -204,9 +203,9 @@ DECLARE_INTERFACE_(IErrorLog,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyBag; -#undef INTERFACE #define INTERFACE IPropertyBag DECLARE_INTERFACE_(IPropertyBag,IUnknown) { @@ -216,9 +215,9 @@ DECLARE_INTERFACE_(IPropertyBag,IUnknown) STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE; STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyBag2; -#undef INTERFACE #define INTERFACE IPropertyBag2 DECLARE_INTERFACE_(IPropertyBag2,IUnknown) { @@ -231,9 +230,9 @@ DECLARE_INTERFACE_(IPropertyBag2,IUnknown) STDMETHOD(GetPropertyInfo)(THIS_ ULONG,ULONG,PROPBAG2*,ULONG*) PURE; STDMETHOD(LoadObject)(THIS_ LPCOLESTR,DWORD,IUnknown*,LPERRORLOG) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistPropertyBag; -#undef INTERFACE #define INTERFACE IPersistPropertyBag DECLARE_INTERFACE_(IPersistPropertyBag,IPersist) { @@ -245,6 +244,7 @@ DECLARE_INTERFACE_(IPersistPropertyBag,IPersist) STDMETHOD(Load)(THIS_ LPPROPERTYBAG,LPERRORLOG) PURE; STDMETHOD(Save)(THIS_ LPPROPERTYBAG,BOOL,BOOL) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IPersistPropertyBag_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -257,7 +257,6 @@ DECLARE_INTERFACE_(IPersistPropertyBag,IPersist) #endif EXTERN_C const IID IID_IPersistPropertyBag2; -#undef INTERFACE #define INTERFACE IPersistPropertyBag2 DECLARE_INTERFACE_(IPersistPropertyBag2,IPersist) { @@ -270,6 +269,7 @@ DECLARE_INTERFACE_(IPersistPropertyBag2,IPersist) STDMETHOD(Save)(THIS_ LPPROPERTYBAG2,BOOL,BOOL) PURE; STDMETHOD(IsDirty)(THIS) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IPersistPropertyBag2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -283,7 +283,6 @@ DECLARE_INTERFACE_(IPersistPropertyBag2,IPersist) #endif EXTERN_C const IID IID_IPersistStreamInit; -#undef INTERFACE #define INTERFACE IPersistStreamInit DECLARE_INTERFACE_(IPersistStreamInit,IPersist) { @@ -297,9 +296,9 @@ DECLARE_INTERFACE_(IPersistStreamInit,IPersist) STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE; STDMETHOD(InitNew)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPersistMemory; -#undef INTERFACE #define INTERFACE IPersistMemory DECLARE_INTERFACE_(IPersistMemory,IPersist) { @@ -313,9 +312,9 @@ DECLARE_INTERFACE_(IPersistMemory,IPersist) STDMETHOD(GetSizeMax)(THIS_ PULONG) PURE; STDMETHOD(InitNew)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyNotifySink; -#undef INTERFACE #define INTERFACE IPropertyNotifySink DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown) { @@ -325,6 +324,7 @@ DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown) STDMETHOD(OnChanged)(THIS_ DISPID) PURE; STDMETHOD(OnRequestEdit)(THIS_ DISPID) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IPropertyNotifySink_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -335,7 +335,6 @@ DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown) #endif EXTERN_C const IID IID_IProvideClassInfo; -#undef INTERFACE #define INTERFACE IProvideClassInfo DECLARE_INTERFACE_(IProvideClassInfo,IUnknown) { @@ -344,9 +343,9 @@ DECLARE_INTERFACE_(IProvideClassInfo,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IProvideClassInfo2; -#undef INTERFACE #define INTERFACE IProvideClassInfo2 DECLARE_INTERFACE_(IProvideClassInfo2,IProvideClassInfo) { @@ -356,9 +355,9 @@ DECLARE_INTERFACE_(IProvideClassInfo2,IProvideClassInfo) STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE; STDMETHOD(GetGUID)(THIS_ DWORD,GUID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IConnectionPointContainer; -#undef INTERFACE #define INTERFACE IConnectionPointContainer DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown) { @@ -368,6 +367,7 @@ DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown) STDMETHOD(EnumConnectionPoints)(THIS_ LPENUMCONNECTIONPOINTS*) PURE; STDMETHOD(FindConnectionPoint)(THIS_ REFIID,LPCONNECTIONPOINT*) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IConnectionPointContainer_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -378,7 +378,6 @@ DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown) #endif EXTERN_C const IID IID_IEnumConnectionPoints; -#undef INTERFACE #define INTERFACE IEnumConnectionPoints DECLARE_INTERFACE_(IEnumConnectionPoints,IUnknown) { @@ -390,9 +389,9 @@ DECLARE_INTERFACE_(IEnumConnectionPoints,IUnknown) STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONPOINTS*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IConnectionPoint; -#undef INTERFACE #define INTERFACE IConnectionPoint DECLARE_INTERFACE_(IConnectionPoint,IUnknown) { @@ -405,6 +404,7 @@ DECLARE_INTERFACE_(IConnectionPoint,IUnknown) STDMETHOD(Unadvise)(THIS_ DWORD) PURE; STDMETHOD(EnumConnections)(THIS_ LPENUMCONNECTIONS*) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IConnectionPoint_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -418,7 +418,6 @@ DECLARE_INTERFACE_(IConnectionPoint,IUnknown) #endif EXTERN_C const IID IID_IEnumConnections; -#undef INTERFACE #define INTERFACE IEnumConnections DECLARE_INTERFACE_(IEnumConnections,IUnknown) { @@ -430,6 +429,7 @@ DECLARE_INTERFACE_(IEnumConnections,IUnknown) STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONS*) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IEnumConnections_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -442,7 +442,6 @@ DECLARE_INTERFACE_(IEnumConnections,IUnknown) #endif EXTERN_C const IID IID_IClassFactory2; -#undef INTERFACE #define INTERFACE IClassFactory2 DECLARE_INTERFACE_(IClassFactory2,IClassFactory) { @@ -455,9 +454,9 @@ DECLARE_INTERFACE_(IClassFactory2,IClassFactory) STDMETHOD(RequestLicKey)(THIS_ DWORD,BSTR*) PURE; STDMETHOD(CreateInstanceLic)(THIS_ LPUNKNOWN,LPUNKNOWN,REFIID,BSTR,PVOID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_ISpecifyPropertyPages; -#undef INTERFACE #define INTERFACE ISpecifyPropertyPages DECLARE_INTERFACE_(ISpecifyPropertyPages,IUnknown) { @@ -466,9 +465,9 @@ DECLARE_INTERFACE_(ISpecifyPropertyPages,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetPages)(THIS_ CAUUID*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPerPropertyBrowsing; -#undef INTERFACE #define INTERFACE IPerPropertyBrowsing DECLARE_INTERFACE_(IPerPropertyBrowsing,IUnknown) { @@ -480,9 +479,9 @@ DECLARE_INTERFACE_(IPerPropertyBrowsing,IUnknown) STDMETHOD(GetPredefinedStrings)(THIS_ DISPID,CALPOLESTR*,CADWORD*) PURE; STDMETHOD(GetPredefinedValue)(THIS_ DISPID,DWORD,VARIANT*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyPageSite; -#undef INTERFACE #define INTERFACE IPropertyPageSite DECLARE_INTERFACE_(IPropertyPageSite,IUnknown) { @@ -494,9 +493,9 @@ DECLARE_INTERFACE_(IPropertyPageSite,IUnknown) STDMETHOD(GetPageContainer)(THIS_ LPUNKNOWN*) PURE; STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyPage; -#undef INTERFACE #define INTERFACE IPropertyPage DECLARE_INTERFACE_(IPropertyPage,IUnknown) { @@ -515,9 +514,9 @@ DECLARE_INTERFACE_(IPropertyPage,IUnknown) STDMETHOD(Help)(THIS_ LPCOLESTR) PURE; STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPropertyPage2; -#undef INTERFACE #define INTERFACE IPropertyPage2 DECLARE_INTERFACE_(IPropertyPage2,IPropertyPage) { @@ -537,9 +536,9 @@ DECLARE_INTERFACE_(IPropertyPage2,IPropertyPage) STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE; STDMETHOD(EditProperty)(THIS_ DISPID) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IFont; -#undef INTERFACE #define INTERFACE IFont DECLARE_INTERFACE_(IFont,IUnknown) { @@ -571,9 +570,9 @@ DECLARE_INTERFACE_(IFont,IUnknown) STDMETHOD(ReleaseHfont)(THIS_ HFONT) PURE; STDMETHOD(SetHdc)(THIS_ HDC) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IFontDisp; -#undef INTERFACE #define INTERFACE IFontDisp DECLARE_INTERFACE_(IFontDisp,IDispatch) { @@ -585,9 +584,9 @@ DECLARE_INTERFACE_(IFontDisp,IDispatch) STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPicture; -#undef INTERFACE #define INTERFACE IPicture DECLARE_INTERFACE_(IPicture,IUnknown) { @@ -609,9 +608,9 @@ DECLARE_INTERFACE_(IPicture,IUnknown) STDMETHOD(SaveAsFile)(THIS_ LPSTREAM,BOOL,LONG*) PURE; STDMETHOD(get_Attributes)(THIS_ PDWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPictureDisp; -#undef INTERFACE #define INTERFACE IPictureDisp DECLARE_INTERFACE_(IPictureDisp,IDispatch) { @@ -623,9 +622,9 @@ DECLARE_INTERFACE_(IPictureDisp,IDispatch) STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleInPlaceSiteEx; -#undef INTERFACE #define INTERFACE IOleInPlaceSiteEx DECLARE_INTERFACE_(IOleInPlaceSiteEx,IOleInPlaceSite) { @@ -648,9 +647,9 @@ DECLARE_INTERFACE_(IOleInPlaceSiteEx,IOleInPlaceSite) STDMETHOD(OnInPlaceDeactivateEx)(THIS_ BOOL) PURE; STDMETHOD(RequestUIActivate)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IObjectWithSite; -#undef INTERFACE #define INTERFACE IObjectWithSite DECLARE_INTERFACE_(IObjectWithSite,IUnknown) { @@ -660,9 +659,9 @@ DECLARE_INTERFACE_(IObjectWithSite,IUnknown) STDMETHOD(SetSite)(THIS_ IUnknown*) PURE; STDMETHOD(GetSite)(THIS_ REFIID, void**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleInPlaceSiteWindowless; -#undef INTERFACE #define INTERFACE IOleInPlaceSiteWindowless DECLARE_INTERFACE_(IOleInPlaceSiteWindowless,IOleInPlaceSiteEx) { @@ -699,9 +698,9 @@ DECLARE_INTERFACE_(IOleInPlaceSiteWindowless,IOleInPlaceSiteEx) STDMETHOD(AdjustRect)(THIS_ LPCRECT) PURE; STDMETHOD(OnDefWindowMessage)(THIS_ UINT,WPARAM,LPARAM,LRESULT*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IAdviseSinkEx; -#undef INTERFACE #define INTERFACE IAdviseSinkEx DECLARE_INTERFACE_(IAdviseSinkEx,IUnknown) { @@ -715,9 +714,9 @@ DECLARE_INTERFACE_(IAdviseSinkEx,IUnknown) STDMETHOD_(void,OnClose)(THIS) PURE; STDMETHOD(OnViewStatusChange)(THIS_ DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IPointerInactive; -#undef INTERFACE #define INTERFACE IPointerInactive DECLARE_INTERFACE_(IPointerInactive,IUnknown) { @@ -728,9 +727,9 @@ DECLARE_INTERFACE_(IPointerInactive,IUnknown) STDMETHOD(OnInactiveMouseMove)(THIS_ LPCRECT,LONG,LONG,DWORD) PURE; STDMETHOD(OnInactiveSetCursor)(THIS_ LPCRECT,LONG,LONG,DWORD,BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleUndoUnit; -#undef INTERFACE #define INTERFACE IOleUndoUnit DECLARE_INTERFACE_(IOleUndoUnit,IUnknown) { @@ -742,9 +741,9 @@ DECLARE_INTERFACE_(IOleUndoUnit,IUnknown) STDMETHOD(GetUnitType)(THIS_ CLSID*,LONG*) PURE; STDMETHOD(OnNextAdd)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleParentUndoUnit; -#undef INTERFACE #define INTERFACE IOleParentUndoUnit DECLARE_INTERFACE_(IOleParentUndoUnit,IOleUndoUnit) { @@ -761,9 +760,9 @@ DECLARE_INTERFACE_(IOleParentUndoUnit,IOleUndoUnit) STDMETHOD(FindUnit)(THIS_ IOleUndoUnit*) PURE; STDMETHOD(GetParentState)(THIS_ DWORD*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IEnumOleUndoUnits; -#undef INTERFACE #define INTERFACE IEnumOleUndoUnits DECLARE_INTERFACE_(IEnumOleUndoUnits,IUnknown) { @@ -775,9 +774,9 @@ DECLARE_INTERFACE_(IEnumOleUndoUnits,IUnknown) STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ IEnumOleUndoUnits**) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleUndoManager; -#undef INTERFACE #define INTERFACE IOleUndoManager DECLARE_INTERFACE_(IOleUndoManager,IUnknown) { @@ -797,9 +796,9 @@ DECLARE_INTERFACE_(IOleUndoManager,IUnknown) STDMETHOD(GetLastRedoDescription)(THIS_ BSTR*) PURE; STDMETHOD(Enable)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IQuickActivate; -#undef INTERFACE #define INTERFACE IQuickActivate DECLARE_INTERFACE_(IQuickActivate,IUnknown) { @@ -810,6 +809,7 @@ DECLARE_INTERFACE_(IQuickActivate,IUnknown) STDMETHOD(SetContentExtent)(THIS_ LPSIZEL) PURE; STDMETHOD(GetContentExtent)(THIS_ LPSIZEL) PURE; }; +#undef INTERFACE #ifdef __cplusplus } diff --git a/reactos/w32api/include/oleacc.h b/reactos/w32api/include/oleacc.h index e78949820f8..c1a2825a167 100644 --- a/reactos/w32api/include/oleacc.h +++ b/reactos/w32api/include/oleacc.h @@ -149,7 +149,6 @@ typedef enum tagSELFLAG EXTERN_C const IID LIBID_Accessibility; EXTERN_C const IID IID_IAccessible; -#undef INTERFACE #define INTERFACE IAccessible DECLARE_INTERFACE_(IAccessible, IDispatch) { @@ -185,6 +184,7 @@ DECLARE_INTERFACE_(IAccessible, IDispatch) STDMETHOD(put_accName)(THIS_ VARIANT, BSTR) PURE; STDMETHOD(put_accValue)(THIS_ VARIANT, BSTR) PURE; }; +#undef INTERFACE typedef IAccessible* LPACCESSIBLE; STDAPI AccessibleChildren(IAccessible*,LONG,LONG,VARIANT*,LONG*); diff --git a/reactos/w32api/include/oledlg.h b/reactos/w32api/include/oledlg.h index 11dd88b9f1e..30f999e9e05 100644 --- a/reactos/w32api/include/oledlg.h +++ b/reactos/w32api/include/oledlg.h @@ -417,7 +417,6 @@ typedef struct tagOLEUIPASTESPECIALA { HGLOBAL hMetaPict; SIZEL sizel; } OLEUIPASTESPECIALA,*POLEUIPASTESPECIALA,*LPOLEUIPASTESPECIALA; -#undef INTERFACE #define INTERFACE IOleUILinkContainerW DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) { @@ -433,6 +432,7 @@ DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) STDMETHOD(UpdateLink) (THIS_ DWORD,BOOL,BOOL) PURE; STDMETHOD(CancelLink) (THIS_ DWORD) PURE; }; +#undef INTERFACE typedef IOleUILinkContainerW *LPOLEUILINKCONTAINERW; #undef INTERFACE #define INTERFACE IOleUILinkContainerA diff --git a/reactos/w32api/include/oleidl.h b/reactos/w32api/include/oleidl.h index 0043c878fe8..e5962cfd673 100644 --- a/reactos/w32api/include/oleidl.h +++ b/reactos/w32api/include/oleidl.h @@ -94,7 +94,6 @@ DECLARE_ENUMERATOR(OLEVERB); typedef IEnumOLEVERB IEnumOleVerb; EXTERN_C const IID IID_IParseDisplayName; -#undef INTERFACE #define INTERFACE IParseDisplayName DECLARE_INTERFACE_(IParseDisplayName,IUnknown) { @@ -103,6 +102,7 @@ DECLARE_INTERFACE_(IParseDisplayName,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,LPOLESTR,ULONG*,IMoniker**) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IParseDisplayName_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -112,7 +112,6 @@ DECLARE_INTERFACE_(IParseDisplayName,IUnknown) #endif EXTERN_C const IID IID_IOleContainer; -#undef INTERFACE #define INTERFACE IOleContainer DECLARE_INTERFACE_(IOleContainer,IParseDisplayName) { @@ -123,9 +122,9 @@ DECLARE_INTERFACE_(IOleContainer,IParseDisplayName) STDMETHOD(EnumObjects)(THIS_ DWORD,IEnumUnknown**) PURE; STDMETHOD(LockContainer)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleItemContainer; -#undef INTERFACE #define INTERFACE IOleItemContainer DECLARE_INTERFACE_(IOleItemContainer,IOleContainer) { @@ -139,6 +138,7 @@ DECLARE_INTERFACE_(IOleItemContainer,IOleContainer) STDMETHOD(GetObjectStorage)(THIS_ LPOLESTR,IBindCtx*,REFIID,void**) PURE; STDMETHOD(IsRunning)(THIS_ LPOLESTR) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleItemContainer_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -153,7 +153,6 @@ DECLARE_INTERFACE_(IOleItemContainer,IOleContainer) #endif EXTERN_C const IID IID_IOleClientSite; -#undef INTERFACE #define INTERFACE IOleClientSite DECLARE_INTERFACE_(IOleClientSite,IUnknown) { @@ -167,6 +166,7 @@ DECLARE_INTERFACE_(IOleClientSite,IUnknown) STDMETHOD(OnShowWindow)(THIS_ BOOL) PURE; STDMETHOD(RequestNewObjectLayout)(THIS) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleClientSite_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -181,7 +181,6 @@ DECLARE_INTERFACE_(IOleClientSite,IUnknown) #endif EXTERN_C const IID IID_IOleObject; -#undef INTERFACE #define INTERFACE IOleObject DECLARE_INTERFACE_(IOleObject,IUnknown) { @@ -210,6 +209,7 @@ DECLARE_INTERFACE_(IOleObject,IUnknown) STDMETHOD(GetMiscStatus)(THIS_ DWORD,PDWORD) PURE; STDMETHOD(SetColorScheme)(THIS_ LPLOGPALETTE) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -239,7 +239,6 @@ DECLARE_INTERFACE_(IOleObject,IUnknown) #endif EXTERN_C const IID IID_IOleWindow; -#undef INTERFACE #define INTERFACE IOleWindow DECLARE_INTERFACE_(IOleWindow,IUnknown) { @@ -249,6 +248,7 @@ DECLARE_INTERFACE_(IOleWindow,IUnknown) STDMETHOD(GetWindow)(THIS_ HWND*) PURE; STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleWindow_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -259,7 +259,6 @@ DECLARE_INTERFACE_(IOleWindow,IUnknown) #endif EXTERN_C const IID IID_IOleInPlaceUIWindow; -#undef INTERFACE #define INTERFACE IOleInPlaceUIWindow DECLARE_INTERFACE_(IOleInPlaceUIWindow,IOleWindow) { @@ -273,9 +272,9 @@ DECLARE_INTERFACE_(IOleInPlaceUIWindow,IOleWindow) STDMETHOD(SetBorderSpace)(THIS_ LPCBORDERWIDTHS) PURE; STDMETHOD(SetActiveObject)(THIS_ LPOLEINPLACEACTIVEOBJECT,LPCOLESTR) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleInPlaceObject; -#undef INTERFACE #define INTERFACE IOleInPlaceObject DECLARE_INTERFACE_(IOleInPlaceObject,IOleWindow) { @@ -289,9 +288,9 @@ DECLARE_INTERFACE_(IOleInPlaceObject,IOleWindow) STDMETHOD(SetObjectRects)(THIS_ LPCRECT,LPCRECT) PURE; STDMETHOD(ReactivateAndUndo)(THIS) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleInPlaceActiveObject; -#undef INTERFACE #define INTERFACE IOleInPlaceActiveObject DECLARE_INTERFACE_(IOleInPlaceActiveObject,IOleWindow) { @@ -306,9 +305,9 @@ DECLARE_INTERFACE_(IOleInPlaceActiveObject,IOleWindow) STDMETHOD(ResizeBorder)(THIS_ LPCRECT,LPOLEINPLACEUIWINDOW,BOOL) PURE; STDMETHOD(EnableModeless)(THIS_ BOOL) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleInPlaceFrame; -#undef INTERFACE #define INTERFACE IOleInPlaceFrame DECLARE_INTERFACE_(IOleInPlaceFrame,IOleInPlaceUIWindow) { @@ -328,6 +327,7 @@ DECLARE_INTERFACE_(IOleInPlaceFrame,IOleInPlaceUIWindow) STDMETHOD(EnableModeless)(THIS_ BOOL) PURE; STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,WORD) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleInPlaceFrame_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -348,7 +348,6 @@ DECLARE_INTERFACE_(IOleInPlaceFrame,IOleInPlaceUIWindow) #endif EXTERN_C const IID IID_IOleInPlaceSite; -#undef INTERFACE #define INTERFACE IOleInPlaceSite DECLARE_INTERFACE_(IOleInPlaceSite,IOleWindow) { @@ -368,9 +367,9 @@ DECLARE_INTERFACE_(IOleInPlaceSite,IOleWindow) STDMETHOD(DeactivateAndUndo)(THIS) PURE; STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IOleAdviseHolder; -#undef INTERFACE #define INTERFACE IOleAdviseHolder DECLARE_INTERFACE_(IOleAdviseHolder,IUnknown) { @@ -384,6 +383,7 @@ DECLARE_INTERFACE_(IOleAdviseHolder,IUnknown) STDMETHOD(SendOnSave)(THIS) PURE; STDMETHOD(SendOnClose)(THIS) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleAdviseHolder_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -398,7 +398,6 @@ DECLARE_INTERFACE_(IOleAdviseHolder,IUnknown) #endif EXTERN_C const IID IID_IDropSource; -#undef INTERFACE #define INTERFACE IDropSource DECLARE_INTERFACE_(IDropSource,IUnknown) { @@ -408,6 +407,7 @@ DECLARE_INTERFACE_(IDropSource,IUnknown) STDMETHOD(QueryContinueDrag)(THIS_ BOOL,DWORD) PURE; STDMETHOD(GiveFeedback)(THIS_ DWORD) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IDropSource_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -418,7 +418,6 @@ DECLARE_INTERFACE_(IDropSource,IUnknown) #endif EXTERN_C const IID IID_IDropTarget; -#undef INTERFACE #define INTERFACE IDropTarget DECLARE_INTERFACE_(IDropTarget,IUnknown) { @@ -430,6 +429,7 @@ DECLARE_INTERFACE_(IDropTarget,IUnknown) STDMETHOD(DragLeave)(THIS) PURE; STDMETHOD(Drop)(THIS_ LPDATAOBJECT,DWORD,POINTL,PDWORD) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IDropTarget_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -443,7 +443,6 @@ DECLARE_INTERFACE_(IDropTarget,IUnknown) typedef BOOL(CALLBACK *__IView_pfncont)(DWORD); EXTERN_C const IID IID_IViewObject; -#undef INTERFACE #define INTERFACE IViewObject DECLARE_INTERFACE_(IViewObject,IUnknown) { @@ -457,6 +456,7 @@ DECLARE_INTERFACE_(IViewObject,IUnknown) STDMETHOD(SetAdvise)(THIS_ DWORD,DWORD,IAdviseSink*) PURE; STDMETHOD(GetAdvise)(THIS_ PDWORD,PDWORD,IAdviseSink**) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IViewObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -471,7 +471,6 @@ DECLARE_INTERFACE_(IViewObject,IUnknown) #endif EXTERN_C const IID IID_IViewObject2; -#undef INTERFACE #define INTERFACE IViewObject2 DECLARE_INTERFACE_(IViewObject2,IViewObject) { @@ -486,6 +485,7 @@ DECLARE_INTERFACE_(IViewObject2,IViewObject) STDMETHOD(GetAdvise)(THIS_ PDWORD,PDWORD,IAdviseSink**) PURE; STDMETHOD(GetExtent)(THIS_ DWORD,LONG,DVTARGETDEVICE*,LPSIZEL) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IViewObject2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -501,7 +501,6 @@ DECLARE_INTERFACE_(IViewObject2,IViewObject) #endif EXTERN_C const IID IID_IOleCache; -#undef INTERFACE #define INTERFACE IOleCache DECLARE_INTERFACE_(IOleCache,IUnknown) { @@ -514,6 +513,7 @@ DECLARE_INTERFACE_(IOleCache,IUnknown) STDMETHOD(InitCache)(THIS_ LPDATAOBJECT); STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL); }; +#undef INTERFACE #ifdef COBJMACROS #define IOleCache_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -527,7 +527,6 @@ DECLARE_INTERFACE_(IOleCache,IUnknown) #endif EXTERN_C const IID IID_IOleCache2; -#undef INTERFACE #define INTERFACE IOleCache2 DECLARE_INTERFACE_(IOleCache2,IOleCache) { @@ -542,6 +541,7 @@ DECLARE_INTERFACE_(IOleCache2,IOleCache) STDMETHOD(UpdateCache)(THIS_ LPDATAOBJECT,DWORD,LPVOID) PURE; STDMETHOD(DiscardCache)(THIS_ DWORD) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IOleCache2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -557,7 +557,6 @@ DECLARE_INTERFACE_(IOleCache2,IOleCache) #endif EXTERN_C const IID IID_IOleCacheControl; -#undef INTERFACE #define INTERFACE IOleCacheControl DECLARE_INTERFACE_(IOleCacheControl,IUnknown) { @@ -567,6 +566,7 @@ DECLARE_INTERFACE_(IOleCacheControl,IUnknown) STDMETHOD(OnRun)(THIS_ LPDATAOBJECT) PURE; STDMETHOD(OnStop)(THIS) PURE; }; +#undef INTERFACE #ifdef __cplusplus } diff --git a/reactos/w32api/include/richole.h b/reactos/w32api/include/richole.h index da2e336f867..48dc13abc52 100644 --- a/reactos/w32api/include/richole.h +++ b/reactos/w32api/include/richole.h @@ -54,7 +54,6 @@ typedef struct _reobject { DWORD dwUser; } REOBJECT; -#undef INTERFACE #define INTERFACE IRichEditOle DECLARE_INTERFACE_(IRichEditOle, IUnknown) { @@ -78,9 +77,9 @@ DECLARE_INTERFACE_(IRichEditOle, IUnknown) STDMETHOD(GetClipboardData)(THIS_ CHARRANGE*,DWORD,LPDATAOBJECT*) PURE; STDMETHOD(ImportDataObject)(THIS_ LPDATAOBJECT,CLIPFORMAT,HGLOBAL) PURE; }; +#undef INTERFACE typedef IRichEditOle *LPRICHEDITOLE; -#undef INTERFACE #define INTERFACE IRichEditOleCallback DECLARE_INTERFACE_(IRichEditOleCallback, IUnknown) { @@ -98,6 +97,7 @@ DECLARE_INTERFACE_(IRichEditOleCallback, IUnknown) STDMETHOD(GetDragDropEffect) (THIS_ BOOL,DWORD,PDWORD) PURE; STDMETHOD(GetContextMenu) (THIS_ WORD,LPOLEOBJECT,CHARRANGE*,HMENU*) PURE; }; +#undef INTERFACE typedef IRichEditOleCallback FAR * LPRICHEDITOLECALLBACK; #endif #pragma pack(pop) diff --git a/reactos/w32api/include/servprov.h b/reactos/w32api/include/servprov.h index 4905d69e495..76661026b31 100644 --- a/reactos/w32api/include/servprov.h +++ b/reactos/w32api/include/servprov.h @@ -10,7 +10,6 @@ extern "C" { #endif EXTERN_C const IID IID_IServiceProvider; -#undef INTERFACE #define INTERFACE IServiceProvider DECLARE_INTERFACE_(IServiceProvider,IUnknown) { @@ -19,6 +18,7 @@ DECLARE_INTERFACE_(IServiceProvider,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IServiceProvider_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) diff --git a/reactos/w32api/include/shlobj.h b/reactos/w32api/include/shlobj.h index 2243bd4dcef..52a1e4fcf4c 100644 --- a/reactos/w32api/include/shlobj.h +++ b/reactos/w32api/include/shlobj.h @@ -530,7 +530,6 @@ typedef IEnumIDList *LPENUMIDLIST; #define IEnumIDList_Clone(T,a) (T)->lpVtbl->Clone(T,a) #endif -#undef INTERFACE #define INTERFACE IContextMenu DECLARE_INTERFACE_(IContextMenu,IUnknown) { @@ -552,7 +551,6 @@ typedef IContextMenu *LPCONTEXTMENU; #define IContextMenu_GetCommandString(T,a,b,c,d,e) (T)->lpVtbl->GetCommandString(T,a,b,c,d,e) #endif -#undef INTERFACE #define INTERFACE IContextMenu2 DECLARE_INTERFACE_(IContextMenu2,IContextMenu) { @@ -564,6 +562,7 @@ DECLARE_INTERFACE_(IContextMenu2,IContextMenu) STDMETHOD(GetCommandString)(THIS_ UINT,UINT,PUINT,LPSTR,UINT) PURE; STDMETHOD(HandleMenuMsg)(THIS_ UINT,WPARAM,LPARAM) PURE; }; +#undef INTERFACE typedef IContextMenu2 *LPCONTEXTMENU2; #if (_WIN32_IE >= 0x0500) @@ -623,7 +622,6 @@ typedef enum { #define IContextMenu2_HandleMenuMsg(T,a,b,c) (T)->lpVtbl->HandleMenuMsg(T,a,b,c) #endif -#undef INTERFACE #define INTERFACE IColumnProvider DECLARE_INTERFACE_(IColumnProvider,IUnknown) { @@ -634,9 +632,9 @@ DECLARE_INTERFACE_(IColumnProvider,IUnknown) STDMETHOD(GetColumnInfo)(THIS_ DWORD,SHCOLUMNINFO*) PURE; STDMETHOD(GetItemData)(THIS_ LPCSHCOLUMNID,LPCSHCOLUMNDATA,VARIANT*) PURE; }; +#undef INTERFACE #endif /* _WIN32_IE >= 0x0500 */ -#undef INTERFACE #define INTERFACE IQueryInfo DECLARE_INTERFACE_(IQueryInfo,IUnknown) { @@ -646,8 +644,8 @@ DECLARE_INTERFACE_(IQueryInfo,IUnknown) STDMETHOD(GetInfoTip)(THIS_ DWORD,WCHAR**) PURE; STDMETHOD(GetInfoFlags)(THIS_ DWORD*) PURE; }; - #undef INTERFACE + #define INTERFACE IShellExtInit DECLARE_INTERFACE_(IShellExtInit, IUnknown) { @@ -656,9 +654,9 @@ DECLARE_INTERFACE_(IShellExtInit, IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST,LPDATAOBJECT,HKEY) PURE; }; +#undef INTERFACE typedef IShellExtInit *LPSHELLEXTINIT; -#undef INTERFACE #define INTERFACE IShellPropSheetExt DECLARE_INTERFACE_(IShellPropSheetExt, IUnknown) { @@ -668,9 +666,9 @@ DECLARE_INTERFACE_(IShellPropSheetExt, IUnknown) STDMETHOD(AddPages)(THIS_ LPFNADDPROPSHEETPAGE,LPARAM) PURE; STDMETHOD(ReplacePage)(THIS_ UINT,LPFNADDPROPSHEETPAGE,LPARAM) PURE; }; +#undef INTERFACE typedef IShellPropSheetExt *LPSHELLPROPSHEETEXT; -#undef INTERFACE #define INTERFACE IExtractIconA DECLARE_INTERFACE_(IExtractIconA, IUnknown) { @@ -680,6 +678,7 @@ DECLARE_INTERFACE_(IExtractIconA, IUnknown) STDMETHOD(GetIconLocation)(THIS_ UINT,LPSTR,UINT,int*,PUINT) PURE; STDMETHOD(Extract)(THIS_ LPCSTR,UINT,HICON*,HICON*,UINT) PURE; }; +#undef INTERFACE typedef IExtractIconA *LPEXTRACTICONA; #ifdef COBJMACROS @@ -690,7 +689,6 @@ typedef IExtractIconA *LPEXTRACTICONA; #define IExtractIconA_Extract(T,a,b,c,d,e) (T)->lpVtbl->Extract(T,a,b,c,d,e) #endif -#undef INTERFACE #define INTERFACE IExtractIconW DECLARE_INTERFACE_(IExtractIconW, IUnknown) { @@ -700,6 +698,7 @@ DECLARE_INTERFACE_(IExtractIconW, IUnknown) STDMETHOD(GetIconLocation)(THIS_ UINT,LPWSTR,UINT,int*,PUINT) PURE; STDMETHOD(Extract)(THIS_ LPCWSTR,UINT,HICON*,HICON*,UINT) PURE; }; +#undef INTERFACE typedef IExtractIconW *LPEXTRACTICONW; #ifdef COBJMACROS @@ -718,7 +717,6 @@ typedef IExtractIconW *LPEXTRACTICONW; #define LPEXTRACTICON LPEXTRACTICONA #endif -#undef INTERFACE #define INTERFACE IShellLinkA DECLARE_INTERFACE_(IShellLinkA, IUnknown) { @@ -744,6 +742,7 @@ DECLARE_INTERFACE_(IShellLinkA, IUnknown) STDMETHOD(Resolve)(THIS_ HWND,DWORD) PURE; STDMETHOD(SetPath)(THIS_ LPCSTR) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IShellLinkA_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -769,7 +768,6 @@ DECLARE_INTERFACE_(IShellLinkA, IUnknown) #define IShellLinkA_SetPath(T,a) (T)->lpVtbl->SetPath(T,a) #endif -#undef INTERFACE #define INTERFACE IShellLinkW DECLARE_INTERFACE_(IShellLinkW, IUnknown) { @@ -795,6 +793,7 @@ DECLARE_INTERFACE_(IShellLinkW, IUnknown) STDMETHOD(Resolve)(THIS_ HWND,DWORD) PURE; STDMETHOD(SetPath)(THIS_ LPCWSTR) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IShellLinkW_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -820,7 +819,6 @@ DECLARE_INTERFACE_(IShellLinkW, IUnknown) #define IShellLinkW_SetPath(T,a) (T)->lpVtbl->SetPath(T,a) #endif -#undef INTERFACE #define INTERFACE IShellFolder DECLARE_INTERFACE_(IShellFolder, IUnknown) { @@ -838,6 +836,7 @@ DECLARE_INTERFACE_(IShellFolder, IUnknown) STDMETHOD(GetDisplayNameOf)(THIS_ LPCITEMIDLIST,DWORD,LPSTRRET) PURE; STDMETHOD(SetNameOf)(THIS_ HWND,LPCITEMIDLIST,LPCOLESTR,DWORD,LPITEMIDLIST*) PURE; }; +#undef INTERFACE typedef IShellFolder *LPSHELLFOLDER; #ifdef COBJMACROS @@ -861,7 +860,6 @@ typedef IShellFolder *LPSHELLFOLDER; DECLARE_ENUMERATOR_(IEnumExtraSearch,LPEXTRASEARCH); typedef IEnumExtraSearch *LPENUMEXTRASEARCH; -#undef INTERFACE #define INTERFACE IShellFolder2 DECLARE_INTERFACE_(IShellFolder2, IShellFolder) { @@ -886,6 +884,7 @@ DECLARE_INTERFACE_(IShellFolder2, IShellFolder) STDMETHOD(GetDetailsOf)(THIS_ LPCITEMIDLIST,UINT,SHELLDETAILS*) PURE; STDMETHOD(MapColumnToSCID)(THIS_ UINT,SHCOLUMNID*) PURE; }; +#undef INTERFACE typedef IShellFolder2 *LPSHELLFOLDER2; #ifdef COBJMACROS @@ -912,7 +911,6 @@ typedef IShellFolder2 *LPSHELLFOLDER2; #endif #endif /* _WIN32_IE >= 0x0500 */ -#undef INTERFACE #define INTERFACE ICopyHook DECLARE_INTERFACE_(ICopyHook, IUnknown) { @@ -921,9 +919,9 @@ DECLARE_INTERFACE_(ICopyHook, IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(UINT,CopyCallback)(THIS_ HWND,UINT,UINT,LPCSTR,DWORD,LPCSTR,DWORD) PURE; }; +#undef INTERFACE typedef ICopyHook *LPCOPYHOOK; -#undef INTERFACE #define INTERFACE IFileViewerSite DECLARE_INTERFACE(IFileViewerSite) { @@ -933,9 +931,9 @@ DECLARE_INTERFACE(IFileViewerSite) STDMETHOD(SetPinnedWindow)(THIS_ HWND) PURE; STDMETHOD(GetPinnedWindow)(THIS_ HWND*) PURE; }; +#undef INTERFACE typedef IFileViewerSite *LPFILEVIEWERSITE; -#undef INTERFACE #define INTERFACE IFileViewer DECLARE_INTERFACE(IFileViewer) { @@ -946,9 +944,9 @@ DECLARE_INTERFACE(IFileViewer) STDMETHOD(Show)(THIS_ LPFVSHOWINFO) PURE; STDMETHOD(PrintTo)(THIS_ LPSTR,BOOL) PURE; }; +#undef INTERFACE typedef IFileViewer *LPFILEVIEWER; -#undef INTERFACE #define INTERFACE IFileSystemBindData DECLARE_INTERFACE_(IFileSystemBindData, IUnknown) { @@ -958,8 +956,8 @@ DECLARE_INTERFACE_(IFileSystemBindData, IUnknown) STDMETHOD(SetFindData)(THIS_ const WIN32_FIND_DATAW*) PURE; STDMETHOD(GetFindData)(THIS_ WIN32_FIND_DATAW*) PURE; }; - #undef INTERFACE + #define INTERFACE IPersistFolder DECLARE_INTERFACE_(IPersistFolder,IPersist) { @@ -969,6 +967,7 @@ DECLARE_INTERFACE_(IPersistFolder,IPersist) STDMETHOD(GetClassID)(THIS_ CLSID*) PURE; STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST) PURE; }; +#undef INTERFACE typedef IPersistFolder *LPPERSISTFOLDER; #ifdef COBJMACROS @@ -981,7 +980,6 @@ typedef IPersistFolder *LPPERSISTFOLDER; #if (_WIN32_IE >= 0x0400 || _WIN32_WINNT >= 0x0500) -#undef INTERFACE #define INTERFACE IPersistFolder2 DECLARE_INTERFACE_(IPersistFolder2,IPersistFolder) { @@ -992,6 +990,7 @@ DECLARE_INTERFACE_(IPersistFolder2,IPersistFolder) STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST) PURE; STDMETHOD(GetCurFolder)(THIS_ LPITEMIDLIST*) PURE; }; +#undef INTERFACE typedef IPersistFolder2 *LPPERSISTFOLDER2; #ifdef COBJMACROS @@ -1007,7 +1006,6 @@ typedef IPersistFolder2 *LPPERSISTFOLDER2; #if (_WIN32_IE >= 0x0500) -#undef INTERFACE #define INTERFACE IPersistFolder3 DECLARE_INTERFACE_(IPersistFolder3,IPersistFolder2) { @@ -1020,6 +1018,7 @@ DECLARE_INTERFACE_(IPersistFolder3,IPersistFolder2) STDMETHOD(InitializeEx)(THIS_ IBindCtx*,LPCITEMIDLIST,const PERSIST_FOLDER_TARGET_INFO*) PURE; STDMETHOD(GetFolderTargetInfo)(THIS_ PERSIST_FOLDER_TARGET_INFO*) PURE; }; +#undef INTERFACE typedef IPersistFolder3 *LPPERSISTFOLDER3; #ifdef COBJMACROS @@ -1038,7 +1037,6 @@ typedef IPersistFolder3 *LPPERSISTFOLDER3; typedef interface IShellBrowser *LPSHELLBROWSER; typedef interface IShellView *LPSHELLVIEW; -#undef INTERFACE #define INTERFACE IShellBrowser DECLARE_INTERFACE_(IShellBrowser,IOleWindow) { @@ -1061,6 +1059,7 @@ DECLARE_INTERFACE_(IShellBrowser,IOleWindow) STDMETHOD(OnViewWindowActive)(THIS_ LPSHELLVIEW) PURE; STDMETHOD(SetToolbarItems)(THIS_ LPTBBUTTON,UINT,UINT) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IShellBrowser_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -1083,7 +1082,6 @@ DECLARE_INTERFACE_(IShellBrowser,IOleWindow) #define IShellBrowser_SetToolbarItems(T,a,b,c) (T)->lpVtbl->SetToolbarItems(T,a,b,c) #endif -#undef INTERFACE #define INTERFACE IShellView DECLARE_INTERFACE_(IShellView,IOleWindow) { @@ -1108,6 +1106,7 @@ DECLARE_INTERFACE_(IShellView,IOleWindow) STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST,UINT) PURE; STDMETHOD(GetItemObject)(THIS_ UINT,REFIID,PVOID*) PURE; }; +#undef INTERFACE #ifdef COBJMACROS #define IShellView_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) @@ -1132,7 +1131,6 @@ DECLARE_INTERFACE_(IShellView,IOleWindow) #define IShellView_GetItemObject(T,a,b,c) (T)->lpVtbl->GetItemObject(T,a,b,c) #endif -#undef INTERFACE #define INTERFACE ICommDlgBrowser DECLARE_INTERFACE_(ICommDlgBrowser,IUnknown) { @@ -1143,6 +1141,7 @@ DECLARE_INTERFACE_(ICommDlgBrowser,IUnknown) STDMETHOD(OnStateChange)(THIS_ IShellView*,ULONG) PURE; STDMETHOD(IncludeObject)(THIS_ IShellView*,LPCITEMIDLIST) PURE; }; +#undef INTERFACE typedef ICommDlgBrowser *LPCOMMDLGBROWSER; #ifdef COBJMACROS @@ -1164,7 +1163,6 @@ typedef struct _SV2CVW2_PARAMS { SHELLVIEWID const *pvid; HWND hwndView; } SV2CVW2_PARAMS,*LPSV2CVW2_PARAMS; -#undef INTERFACE #define INTERFACE IShellView2 DECLARE_INTERFACE_(IShellView2,IShellView) { @@ -1192,8 +1190,8 @@ DECLARE_INTERFACE_(IShellView2,IShellView) STDMETHOD(GetView)(THIS_ SHELLVIEWID*,ULONG) PURE; STDMETHOD(CreateViewWindow2)(THIS_ LPSV2CVW2_PARAMS) PURE; }; - #undef INTERFACE + #define INTERFACE IShellExecuteHookA DECLARE_INTERFACE_(IShellExecuteHookA,IUnknown) { @@ -1203,6 +1201,7 @@ DECLARE_INTERFACE_(IShellExecuteHookA,IUnknown) STDMETHOD(Execute)(THIS_ LPSHELLEXECUTEINFOA) PURE; }; #undef INTERFACE + #define INTERFACE IShellExecuteHookW DECLARE_INTERFACE_(IShellExecuteHookW,IUnknown) { @@ -1211,8 +1210,8 @@ DECLARE_INTERFACE_(IShellExecuteHookW,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Execute)(THIS_ LPSHELLEXECUTEINFOW) PURE; }; - #undef INTERFACE + #define INTERFACE IShellIcon DECLARE_INTERFACE_(IShellIcon,IUnknown) { @@ -1221,6 +1220,7 @@ DECLARE_INTERFACE_(IShellIcon,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST,UINT,PINT) PURE; }; +#undef INTERFACE typedef IShellIcon *LPSHELLICON; typedef struct { @@ -1312,7 +1312,6 @@ typedef struct } SHDRAGIMAGE, *LPSHDRAGIMAGE; #pragma pack(pop) -#undef INTERFACE #define INTERFACE IDragSourceHelper DECLARE_INTERFACE_(IDragSourceHelper, IUnknown) { @@ -1322,8 +1321,8 @@ DECLARE_INTERFACE_(IDragSourceHelper, IUnknown) STDMETHOD (InitializeFromBitmap)(THIS_ LPSHDRAGIMAGE pshdi, IDataObject* pDataObject) PURE; STDMETHOD (InitializeFromWindow)(THIS_ HWND hwnd, POINT* ppt, IDataObject* pDataObject) PURE; }; - #undef INTERFACE + #define INTERFACE IDropTargetHelper DECLARE_INTERFACE_(IDropTargetHelper, IUnknown) { @@ -1336,6 +1335,7 @@ DECLARE_INTERFACE_(IDropTargetHelper, IUnknown) STDMETHOD (Drop)(THIS_ IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE; STDMETHOD (Show)(THIS_ BOOL fShow) PURE; }; +#undef INTERFACE #endif /* _WIN32_IE >= 0x0500 */ void WINAPI SHAddToRecentDocs(UINT,PCVOID); diff --git a/reactos/w32api/include/unknwn.h b/reactos/w32api/include/unknwn.h index 20a75afc545..4a8c3fc4712 100644 --- a/reactos/w32api/include/unknwn.h +++ b/reactos/w32api/include/unknwn.h @@ -20,7 +20,6 @@ EXTERN_C const IID IID_IUnknown; EXTERN_C const IID IID_IClassFactory; #ifndef __IUnknown_INTERFACE_DEFINED__ #define __IUnknown_INTERFACE_DEFINED__ -#undef INTERFACE #define INTERFACE IUnknown DECLARE_INTERFACE(IUnknown) { @@ -28,11 +27,11 @@ DECLARE_INTERFACE(IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; }; +#undef INTERFACE typedef IUnknown *LPUNKNOWN; #endif #ifndef __IClassFactory_INTERFACE_DEFINED__ #define __IClassFactory_INTERFACE_DEFINED__ -#undef INTERFACE #define INTERFACE IClassFactory DECLARE_INTERFACE_(IClassFactory,IUnknown) { @@ -42,6 +41,7 @@ DECLARE_INTERFACE_(IClassFactory,IUnknown) STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE; STDMETHOD(LockServer)(THIS_ BOOL) PURE; }; +#undef INTERFACE typedef IClassFactory *LPCLASSFACTORY; #endif HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown*,REFIID,void**); diff --git a/reactos/w32api/include/vfw.h b/reactos/w32api/include/vfw.h index cce5e3126db..b151c713ab5 100644 --- a/reactos/w32api/include/vfw.h +++ b/reactos/w32api/include/vfw.h @@ -642,7 +642,6 @@ DEFINE_AVIGUID(IID_IGetFrame,0x00020023,0,0); DEFINE_AVIGUID(IID_IAVIEditStream,0x00020024,0,0); DEFINE_AVIGUID(CLSID_AVIFile,0x00020000,0,0); -#undef INTERFACE #define INTERFACE IAVIStream DECLARE_INTERFACE_(IAVIStream, IUnknown) { @@ -663,7 +662,6 @@ DECLARE_INTERFACE_(IAVIStream, IUnknown) }; typedef IAVIStream *PAVISTREAM; -#undef INTERFACE #define INTERFACE IAVIStreaming DECLARE_INTERFACE_(IAVIStreaming, IUnknown) { @@ -673,9 +671,9 @@ DECLARE_INTERFACE_(IAVIStreaming, IUnknown) STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE; STDMETHOD(End)(THIS) PURE; }; +#undef INTERFACE typedef IAVIStreaming *PAVISTREAMING; -#undef INTERFACE #define INTERFACE IAVIEditStream DECLARE_INTERFACE_(IAVIEditStream, IUnknown) { @@ -690,7 +688,6 @@ DECLARE_INTERFACE_(IAVIEditStream, IUnknown) }; typedef IAVIEditStream *PAVIEDITSTREAM; -#undef INTERFACE #define INTERFACE IAVIFile DECLARE_INTERFACE_(IAVIFile, IUnknown) { @@ -705,9 +702,9 @@ DECLARE_INTERFACE_(IAVIFile, IUnknown) STDMETHOD(EndRecord)(THIS) PURE; STDMETHOD(DeleteStream)(THIS_ DWORD,LONG) PURE; }; +#undef INTERFACE typedef IAVIFile *PAVIFILE; -#undef INTERFACE #define INTERFACE IGetFrame DECLARE_INTERFACE_(IGetFrame, IUnknown) { @@ -719,6 +716,7 @@ DECLARE_INTERFACE_(IGetFrame, IUnknown) STDMETHOD(End)(THIS) PURE; STDMETHOD(SetFormat)(THIS_ LPBITMAPINFOHEADER,LPVOID,INT,INT,INT,INT) PURE; }; +#undef INTERFACE typedef IGetFrame *PGETFRAME; #endif /* !defined (__OBJC__) */