diff --git a/include/control.idl b/include/control.idl index d6782a8a449..c224f5a63ca 100644 --- a/include/control.idl +++ b/include/control.idl @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#if 0"); /* FIXME: these files are not included on Windows */ +cpp_quote("#if 0") /* FIXME: these files are not included on Windows */ import "shldisp.idl"; import "strmif.idl"; -cpp_quote("#endif"); +cpp_quote("#endif") interface IMediaControl; interface IBasicAudio; diff --git a/include/hlink.idl b/include/hlink.idl index 8843dc0b5e9..b737e9c5286 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -23,15 +23,15 @@ interface IHlinkSite; interface IHlinkFrame; interface IHlinkBrowseContext; -cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);"); -cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);"); -cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);"); -cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);"); -cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);"); -cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);"); -cpp_quote("HRESULT WINAPI HlinkNavigateToStringReference(LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);"); -cpp_quote("HRESULT WINAPI HlinkNavigate(IHlink*, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);"); -cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);"); +cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);") +cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);") +cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);") +cpp_quote("HRESULT WINAPI HlinkNavigateToStringReference(LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);") +cpp_quote("HRESULT WINAPI HlinkNavigate(IHlink*, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);") +cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);") /***************************************************************************** * IHlink interface diff --git a/include/indexsvr.idl b/include/indexsvr.idl index 6b18a926691..c62caf74144 100644 --- a/include/indexsvr.idl +++ b/include/indexsvr.idl @@ -22,11 +22,11 @@ import "unknwn.idl"; * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... * Not sure that function pointers are even legal in idl. */ -cpp_quote("struct tagTEXT_SOURCE;"); -cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);"); -cpp_quote("#if 0"); +cpp_quote("struct tagTEXT_SOURCE;") +cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);") +cpp_quote("#if 0") typedef void* PFNFILLTEXTBUFFER; -cpp_quote("#endif"); +cpp_quote("#endif") typedef struct tagTEXT_SOURCE { diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 0a2e35f0b13..17dfe131969 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -286,12 +286,12 @@ interface IClassFactoryEx : IClassFactory [out] void **ppv); }; -cpp_quote("typedef HRESULT WINAPI SHOWHTMLDIALOGFN(HWND,IMoniker*,VARIANT*,WCHAR*,VARIANT*);"); -cpp_quote("typedef HRESULT WINAPI SHOWHTMLDIALOGEXFN(HWND,IMoniker*,DWORD,VARIANT*,WCHAR*,VARIANT*);"); -cpp_quote("typedef HRESULT WINAPI SHOWMODELESSHTMLDIALOGFN(HWND,IMoniker*,VARIANT*,VARIANT*,IHTMLWindow2**);"); +cpp_quote("typedef HRESULT WINAPI SHOWHTMLDIALOGFN(HWND,IMoniker*,VARIANT*,WCHAR*,VARIANT*);") +cpp_quote("typedef HRESULT WINAPI SHOWHTMLDIALOGEXFN(HWND,IMoniker*,DWORD,VARIANT*,WCHAR*,VARIANT*);") +cpp_quote("typedef HRESULT WINAPI SHOWMODELESSHTMLDIALOGFN(HWND,IMoniker*,VARIANT*,VARIANT*,IHTMLWindow2**);") -cpp_quote("EXTERN_C HRESULT WINAPI ShowHTMLDialog(HWND,IMoniker*,VARIANT*,WCHAR*,VARIANT*);"); -cpp_quote("EXTERN_C HRESULT WINAPI ShowHTMLDialogEx(HWND,IMoniker*,DWORD,VARIANT*,WCHAR*,VARIANT*);"); -cpp_quote("EXTERN_C HRESULT WINAPI ShowModelessHTMLDialog(HWND,IMoniker*,VARIANT*,VARIANT*,IHTMLWindow2**);"); -cpp_quote("EXTERN_C HRESULT WINAPI RunHTMLApplication(HINSTANCE,HINSTANCE,LPSTR,int);"); -cpp_quote("EXTERN_C HRESULT WINAPI CreateHTMLPropertyPage(IMoniker*,IPropertyPage**);"); +cpp_quote("EXTERN_C HRESULT WINAPI ShowHTMLDialog(HWND,IMoniker*,VARIANT*,WCHAR*,VARIANT*);") +cpp_quote("EXTERN_C HRESULT WINAPI ShowHTMLDialogEx(HWND,IMoniker*,DWORD,VARIANT*,WCHAR*,VARIANT*);") +cpp_quote("EXTERN_C HRESULT WINAPI ShowModelessHTMLDialog(HWND,IMoniker*,VARIANT*,VARIANT*,IHTMLWindow2**);") +cpp_quote("EXTERN_C HRESULT WINAPI RunHTMLApplication(HINSTANCE,HINSTANCE,LPSTR,int);") +cpp_quote("EXTERN_C HRESULT WINAPI CreateHTMLPropertyPage(IMoniker*,IPropertyPage**);") diff --git a/include/objsafe.idl b/include/objsafe.idl index 9dacdbb3f2c..312ee246470 100644 --- a/include/objsafe.idl +++ b/include/objsafe.idl @@ -18,13 +18,13 @@ import "unknwn.idl"; -cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 1"); -cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 2"); -cpp_quote("#define INTERFACE_USES_DISPEX 4"); -cpp_quote("#define INTERFACE_USES_SECURITY_MANAGER 8"); +cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 1") +cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 2") +cpp_quote("#define INTERFACE_USES_DISPEX 4") +cpp_quote("#define INTERFACE_USES_SECURITY_MANAGER 8") -cpp_quote("DEFINE_GUID(CATID_SafeForScripting, 0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4);"); -cpp_quote("DEFINE_GUID(CATID_SafeForInitializing, 0x7dd95802,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4);"); +cpp_quote("DEFINE_GUID(CATID_SafeForScripting, 0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4);") +cpp_quote("DEFINE_GUID(CATID_SafeForInitializing, 0x7dd95802,0x9882,0x11cf,0x9f,0xa9,0x00,0xaa,0x00,0x6c,0x42,0xc4);") [ object, diff --git a/include/propidl.idl b/include/propidl.idl index 2e896fa0184..c041be93cc0 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -29,17 +29,17 @@ import "oaidl.idl"; * PID_SECURITY is defined in msidefs.h with a different value! * So these need to be undefined first. */ -cpp_quote("#ifdef PID_DICTIONARY"); -cpp_quote("#undef PID_DICTIONARY"); -cpp_quote("#endif"); +cpp_quote("#ifdef PID_DICTIONARY") +cpp_quote("#undef PID_DICTIONARY") +cpp_quote("#endif") -cpp_quote("#ifdef PID_CODEPAGE"); -cpp_quote("#undef PID_CODEPAGE"); -cpp_quote("#endif"); +cpp_quote("#ifdef PID_CODEPAGE") +cpp_quote("#undef PID_CODEPAGE") +cpp_quote("#endif") -cpp_quote("#ifdef PID_SECURITY"); -cpp_quote("#undef PID_SECURITY"); -cpp_quote("#endif"); +cpp_quote("#ifdef PID_SECURITY") +cpp_quote("#undef PID_SECURITY") +cpp_quote("#endif") /******************** Property Storage ********************/ @@ -419,20 +419,20 @@ interface IEnumSTATPROPSETSTG : IUnknown } -cpp_quote("HRESULT WINAPI FreePropVariantArray(ULONG,PROPVARIANT*);"); -cpp_quote("HRESULT WINAPI PropVariantClear(PROPVARIANT*);"); -cpp_quote("HRESULT WINAPI PropVariantCopy(PROPVARIANT*,const PROPVARIANT*);"); +cpp_quote("HRESULT WINAPI FreePropVariantArray(ULONG,PROPVARIANT*);") +cpp_quote("HRESULT WINAPI PropVariantClear(PROPVARIANT*);") +cpp_quote("HRESULT WINAPI PropVariantCopy(PROPVARIANT*,const PROPVARIANT*);") cpp_quote("") cpp_quote("#define _PROPVARIANT_INIT_DEFINED_") cpp_quote("#define PropVariantInit(p) memset((p), 0, sizeof(PROPVARIANT))") cpp_quote("") cpp_quote("#ifndef _STGCREATEPROPSTG_DEFINED_") cpp_quote("#define _STGCREATEPROPSTG_DEFINED_") -cpp_quote("HRESULT WINAPI StgCreatePropStg(IUnknown *, REFFMTID, const CLSID *, DWORD, DWORD, IPropertyStorage **);"); -cpp_quote("HRESULT WINAPI StgOpenPropStg(IUnknown *, REFFMTID, DWORD, DWORD, IPropertyStorage **);"); -cpp_quote("HRESULT WINAPI StgCreatePropSetStg(IStorage *, DWORD, IPropertySetStorage **);"); -cpp_quote("#define CCH_MAX_PROPSTG_NAME 31"); -cpp_quote("HRESULT WINAPI FmtIdToPropStgName(const FMTID *, LPOLESTR);"); -cpp_quote("HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR, FMTID *);"); -cpp_quote("#endif /* _STGCREATEPROPSTG_DEFINED_ */"); +cpp_quote("HRESULT WINAPI StgCreatePropStg(IUnknown *, REFFMTID, const CLSID *, DWORD, DWORD, IPropertyStorage **);") +cpp_quote("HRESULT WINAPI StgOpenPropStg(IUnknown *, REFFMTID, DWORD, DWORD, IPropertyStorage **);") +cpp_quote("HRESULT WINAPI StgCreatePropSetStg(IStorage *, DWORD, IPropertySetStorage **);") +cpp_quote("#define CCH_MAX_PROPSTG_NAME 31") +cpp_quote("HRESULT WINAPI FmtIdToPropStgName(const FMTID *, LPOLESTR);") +cpp_quote("HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR, FMTID *);") +cpp_quote("#endif /* _STGCREATEPROPSTG_DEFINED_ */") cpp_quote("") diff --git a/include/pstore.idl b/include/pstore.idl index c6d11fcb040..06f5132a5c5 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -18,15 +18,15 @@ import "oaidl.idl"; -cpp_quote("#define PST_KEY_CURRENT_USER 0"); -cpp_quote("#define PST_KEY_LOCAL_MACHINE 1"); +cpp_quote("#define PST_KEY_CURRENT_USER 0") +cpp_quote("#define PST_KEY_LOCAL_MACHINE 1") -cpp_quote("#define PST_E_OK 0x00000000L"); -cpp_quote("#define PST_E_TYPE_EXISTS 0x800C0004L"); +cpp_quote("#define PST_E_OK 0x00000000L") +cpp_quote("#define PST_E_TYPE_EXISTS 0x800C0004L") -cpp_quote("#define PST_AUTHENTICODE 1"); -cpp_quote("#define PST_BINARY_CHECK 2"); -cpp_quote("#define PST_SECURITY_DESCRIPTOR 4"); +cpp_quote("#define PST_AUTHENTICODE 1") +cpp_quote("#define PST_BINARY_CHECK 2") +cpp_quote("#define PST_SECURITY_DESCRIPTOR 4") typedef DWORD PST_ACCESSMODE; typedef DWORD PST_ACCESSCLAUSETYPE; diff --git a/include/richole.idl b/include/richole.idl index d34bb09c746..c74783f9a28 100644 --- a/include/richole.idl +++ b/include/richole.idl @@ -17,42 +17,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#if 0"); /* not included on Windows */ +cpp_quote("#if 0") /* not included on Windows */ import "oleidl.idl"; -cpp_quote("#endif"); +cpp_quote("#endif") /* REOBJECT structure flags */ -cpp_quote("#define REO_GETOBJ_NO_INTERFACES 0x00000000"); -cpp_quote("#define REO_GETOBJ_POLEOBJ 0x00000001"); -cpp_quote("#define REO_GETOBJ_PSTG 0x00000002"); -cpp_quote("#define REO_GETOBJ_POLESITE 0x00000004"); -cpp_quote("#define REO_GETOBJ_ALL_INTERFACES 0x00000007"); -cpp_quote("#define REO_CP_SELECTION 0xFFFFFFFF"); -cpp_quote("#define REO_IOB_SELECTION 0xFFFFFFFF"); -cpp_quote("#define REO_IOB_USE_CP 0xFFFFFFFE"); -cpp_quote("#define REO_NULL 0x00000000"); -cpp_quote("#define REO_READWRITEMASK 0x0000003F"); -cpp_quote("#define REO_DONTNEEDPALETTE 0x00000020"); -cpp_quote("#define REO_BLANK 0x00000010"); -cpp_quote("#define REO_DYNAMICSIZE 0x00000008"); -cpp_quote("#define REO_INVERTEDSELECT 0x00000004"); -cpp_quote("#define REO_BELOWBASELINE 0x00000002"); -cpp_quote("#define REO_RESIZABLE 0x00000001"); -cpp_quote("#define REO_LINK 0x80000000"); -cpp_quote("#define REO_STATIC 0x40000000"); -cpp_quote("#define REO_SELECTED 0x08000000"); -cpp_quote("#define REO_OPEN 0x04000000"); -cpp_quote("#define REO_INPLACEACTIVE 0x02000000"); -cpp_quote("#define REO_HILITED 0x01000000"); -cpp_quote("#define REO_LINKAVAILABLE 0x00800000"); -cpp_quote("#define REO_GETMETAFILE 0x00400000"); +cpp_quote("#define REO_GETOBJ_NO_INTERFACES 0x00000000") +cpp_quote("#define REO_GETOBJ_POLEOBJ 0x00000001") +cpp_quote("#define REO_GETOBJ_PSTG 0x00000002") +cpp_quote("#define REO_GETOBJ_POLESITE 0x00000004") +cpp_quote("#define REO_GETOBJ_ALL_INTERFACES 0x00000007") +cpp_quote("#define REO_CP_SELECTION 0xFFFFFFFF") +cpp_quote("#define REO_IOB_SELECTION 0xFFFFFFFF") +cpp_quote("#define REO_IOB_USE_CP 0xFFFFFFFE") +cpp_quote("#define REO_NULL 0x00000000") +cpp_quote("#define REO_READWRITEMASK 0x0000003F") +cpp_quote("#define REO_DONTNEEDPALETTE 0x00000020") +cpp_quote("#define REO_BLANK 0x00000010") +cpp_quote("#define REO_DYNAMICSIZE 0x00000008") +cpp_quote("#define REO_INVERTEDSELECT 0x00000004") +cpp_quote("#define REO_BELOWBASELINE 0x00000002") +cpp_quote("#define REO_RESIZABLE 0x00000001") +cpp_quote("#define REO_LINK 0x80000000") +cpp_quote("#define REO_STATIC 0x40000000") +cpp_quote("#define REO_SELECTED 0x08000000") +cpp_quote("#define REO_OPEN 0x04000000") +cpp_quote("#define REO_INPLACEACTIVE 0x02000000") +cpp_quote("#define REO_HILITED 0x01000000") +cpp_quote("#define REO_LINKAVAILABLE 0x00800000") +cpp_quote("#define REO_GETMETAFILE 0x00400000") /* clipboard operation flags */ -cpp_quote("#define RECO_PASTE 0x00000000"); -cpp_quote("#define RECO_DROP 0x00000001"); -cpp_quote("#define RECO_COPY 0x00000002"); -cpp_quote("#define RECO_CUT 0x00000003"); -cpp_quote("#define RECO_DRAG 0x00000004"); +cpp_quote("#define RECO_PASTE 0x00000000") +cpp_quote("#define RECO_DROP 0x00000001") +cpp_quote("#define RECO_COPY 0x00000002") +cpp_quote("#define RECO_CUT 0x00000003") +cpp_quote("#define RECO_DRAG 0x00000004") typedef struct _reobject { DWORD cbStruct; @@ -67,8 +67,8 @@ typedef struct _reobject { DWORD dwUser; } REOBJECT; -cpp_quote("#ifndef __RICHEDIT_CHARRANGE_DEFINED"); -cpp_quote("#define __RICHEDIT_CHARRANGE_DEFINED"); +cpp_quote("#ifndef __RICHEDIT_CHARRANGE_DEFINED") +cpp_quote("#define __RICHEDIT_CHARRANGE_DEFINED") typedef struct _charrange { @@ -76,7 +76,7 @@ typedef struct _charrange LONG cpMax; } CHARRANGE; -cpp_quote("#endif /* __RICHEDIT_CHARRANGE_DEFINED */"); +cpp_quote("#endif /* __RICHEDIT_CHARRANGE_DEFINED */") /***************************************************************************** * IRichEditOle diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a7bca406e79..751437f5f01 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1090,7 +1090,7 @@ interface IContextMenu3 : IContextMenu2 ] interface IShellExecuteHookA : IUnknown { - cpp_quote("struct _SHELLEXECUTEINFOA;"); + cpp_quote("struct _SHELLEXECUTEINFOA;") HRESULT Execute( [in, out] struct _SHELLEXECUTEINFOA* pei); } @@ -1106,7 +1106,7 @@ interface IShellExecuteHookA : IUnknown ] interface IShellExecuteHookW : IUnknown { - cpp_quote("struct _SHELLEXECUTEINFOW;"); + cpp_quote("struct _SHELLEXECUTEINFOW;") HRESULT Execute( [in, out] struct _SHELLEXECUTEINFOW* pei); } diff --git a/include/wine/itss.idl b/include/wine/itss.idl index 4b376db8c4b..8566855ee21 100644 --- a/include/wine/itss.idl +++ b/include/wine/itss.idl @@ -89,5 +89,5 @@ interface IITStorage : IUnknown [in] ECompactionLev iLev); } -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec );"); -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);"); +cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec );") +cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);")