From 5bd771d5dcedfe838de45052401e3b1260b7b51f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 3 Nov 2023 17:17:49 +0100 Subject: [PATCH] include: Use proper dllimports for mimeole functions. --- dlls/inetcomm/Makefile.in | 1 + include/mimeole.idl | 176 ++++++++++++++++++++------------------ 2 files changed, 93 insertions(+), 84 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index bf774371142..7456d441bff 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_MIMEOLE_ MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 diff --git a/include/mimeole.idl b/include/mimeole.idl index b560caeed18..32e04e00c19 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -29,6 +29,14 @@ interface IMimeMessageTree; interface IMimeBody; interface IMimeEnumProperties; +cpp_quote("#ifdef _MIMEOLE_") +cpp_quote("#define MIMEOLEAPI STDAPI") +cpp_quote("#define MIMEOLEAPI_(type) STDAPI_(type)") +cpp_quote("#else") +cpp_quote("#define MIMEOLEAPI DECLSPEC_IMPORT STDAPI") +cpp_quote("#define MIMEOLEAPI_(type) DECLSPEC_IMPORT STDAPI_(type)") +cpp_quote("#endif") + cpp_quote("DEFINE_GUID(CLSID_IMimeBody, 0xfd853cdb, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeAllocator, 0xfd853cdd, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") @@ -1534,89 +1542,89 @@ cpp_quote("#endif") } cpp_quote("") -cpp_quote("HRESULT WINAPI MimeOleSetCompatMode(DWORD);") -cpp_quote("HRESULT WINAPI MimeOleContentTypeFromUrl(LPCSTR,LPCSTR,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleParseMhtmlUrl(LPSTR,LPSTR*,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleObjectFromUrl(LPCSTR,BOOL,REFIID,LPVOID*,IUnknown**);") -cpp_quote("HRESULT WINAPI MimeOleObjectFromMoniker(BINDF,IMoniker*,IBindCtx*,REFIID,LPVOID*,IMoniker**);") -cpp_quote("HRESULT WINAPI MimeOleCombineURL(LPCSTR,ULONG,LPCSTR,ULONG,BOOL,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetSubjectFileName(IMimePropertySet*,ULONG*,ULONG*,LPSTR,ULONG);") -cpp_quote("HRESULT WINAPI MimeOleCreateWebDocument(LPCSTR,LPCSTR,IMimeWebDocument**);") -cpp_quote("HRESULT WINAPI MimeOleGetRelatedSection(IMimeMessageTree*,boolean,LPHBODY,boolean*);") -cpp_quote("HRESULT WINAPI MimeOleGetMixedSection(IMimeMessageTree*,boolean,LPHBODY,boolean*);") -cpp_quote("HRESULT WINAPI MimeOleGetAlternativeSection(IMimeMessageTree*,LPHBODY,boolean*);") -cpp_quote("HRESULT WINAPI MimeOleGenerateCID(LPSTR,ULONG,boolean);") -cpp_quote("HRESULT WINAPI MimeOleGenerateMID(LPSTR,ULONG,boolean);") -cpp_quote("HRESULT WINAPI MimeOleCreateByteStream(IStream**);") -cpp_quote("HRESULT WINAPI MimeOlGetPropertySchema(IMimePropertySchema**);") -cpp_quote("HRESULT WINAPI MimeOleQueryString(LPCSTR,LPCSTR,boolean,boolean);") -cpp_quote("HRESULT WINAPI MimeOleGetPropA(IMimePropertySet*,LPCSTR,DWORD,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleSetPropA(IMimePropertySet*,LPCSTR,DWORD,LPCSTR);") -cpp_quote("HRESULT WINAPI MimeOleGetPropW(IMimePropertySet*,LPCSTR,DWORD,LPWSTR*);") -cpp_quote("HRESULT WINAPI MimeOleSetPropW(IMimePropertySet*,LPCSTR,DWORD,LPCWSTR);") -cpp_quote("HRESULT WINAPI MimeOleGetBodyPropA(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleSetBodyPropA(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPCSTR);") -cpp_quote("HRESULT WINAPI MimeOleGetBodyPropW(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPWSTR*);") -cpp_quote("HRESULT WINAPI MimeOleSetBodyPropW(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPCWSTR);") -cpp_quote("HRESULT WINAPI MimeOleCreateHeaderTable(IMimeHeaderTable**);") -cpp_quote("HRESULT WINAPI MimeOleVariantFree(LPPROPVARIANT);") -cpp_quote("HRESULT WINAPI MimeOleVariantCopy(LPPROPVARIANT,LPPROPVARIANT);") -cpp_quote("HRESULT WINAPI MimeOleGetExtClassId(LPCSTR,LPCLSID);") -cpp_quote("HRESULT WINAPI MimeOleEncodeHeader(HCHARSET,LPPROPVARIANT,LPSTR*,LPRFC1522INFO);") -cpp_quote("HRESULT WINAPI MimeOleDecodeHeader(HCHARSET,LPCSTR,LPPROPVARIANT,LPRFC1522INFO);") -cpp_quote("HRESULT WINAPI MimeOleRfc1522Decode(LPCSTR,LPSTR,ULONG,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleRfc1522Encode(LPCSTR,HCHARSET,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetInternat(IMimeInternational**);") -cpp_quote("HRESULT WINAPI MimeOleFindCharset(LPCSTR,LPHCHARSET);") -cpp_quote("HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET,LPINETCSETINFO);") -cpp_quote("HRESULT WINAPI MimeOleGetCodePageInfo(HCHARSET,LPCODEPAGEINFO);") -cpp_quote("HRESULT WINAPI MimeOleGetDefaultCharset(LPHCHARSET);") -cpp_quote("HRESULT WINAPI MimeOleSetDefaultCharset(HCHARSET);") -cpp_quote("HRESULT WINAPI MimeOleGetCodePageCharset(CODEPAGEID,CHARSETTYPE,LPHCHARSET);") -cpp_quote("HRESULT WINAPI MimeOleCreateVirtualStream(IStream**);") -cpp_quote("HRESULT WINAPI MimeOleOpenFileStream(LPCSTR,DWORD,DWORD,IStream**);") -cpp_quote("HRESULT WINAPI MimeOleIsTnefStream(IStream*);") -cpp_quote("HRESULT WINAPI MimeOleGenerateFileName(LPCSTR,LPCSTR,LPCSTR,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetFileExtension(LPCSTR,LPSTR,ULONG);") -cpp_quote("HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity**);") -cpp_quote("HRESULT WINAPI MimeOleInetDateToFileTime(LPCSTR,LPFILETIME);") -cpp_quote("HRESULT WINAPI MimeOleFileTimeToInetDate(LPFILETIME,LPSTR,ULONG);") -cpp_quote("HRESULT WINAPI MimeOleCreateMessageParts(IMimeMessageParts**);") -cpp_quote("HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator**);") -cpp_quote("HRESULT WINAPI MimeOleParseRfc822Address(DWORD,ENCODINGTYPE,LPCSTR,LPADDRESSLIST);") -cpp_quote("HRESULT WINAPI MimeOleCreateMessage(IUnknown*,IMimeMessage**);") -cpp_quote("HRESULT WINAPI MimeOleMergePartialHeaders(IStream*,IStream*);") -cpp_quote("HRESULT WINAPI MimeOleEscapeString(CODEPAGEID,LPCSTR,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetExtContentType(LPCSTR,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetContentTypeExt(LPCSTR,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleGetFileInfo(LPSTR,LPSTR*,LPSTR*,LPSTR*,LPSTR*,LPSTR*);") -cpp_quote("HRESULT WINAPI MimeOleCreateBody(IMimeBody**);") -cpp_quote("HRESULT WINAPI MimeOleCreatePropertySet(IUnknown*,IMimePropertySet**);") -cpp_quote("HRESULT WINAPI MimeOleCreateMessageTree(IUnknown*,IMimeMessageTree**);") -cpp_quote("HRESULT WINAPI MimeOleGetCertsFromThumbprints(THUMBBLOB*,X509CERTRESULT*,const HCERTSTORE*,DWORD);") -cpp_quote("HRESULT WINAPI MimeOleSplitMessage(IMimeMessage*,ULONG,IMimeMessageParts**);") -cpp_quote("HRESULT WINAPI MimeOleClearDirtyTree(IMimeMessageTree*);") -cpp_quote("HRESULT WINAPI MimeOleConvertEnrichedToHTML(CODEPAGEID,IStream*,IStream*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapsToDlg(LPBYTE,DWORD,DWORD,PCX509CERT*,HWND,DWORD,DWORD,DWORD);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapsFromDlg(HWND,DWORD,DWORD,DWORD,LPBYTE,DWORD*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapInit(LPBYTE,DWORD,LPVOID*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapAddSMimeCap(LPBYTE,DWORD,LPVOID);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapAddCert(LPBYTE,DWORD,BOOL,LPVOID);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapGetEncAlg(LPVOID,LPBYTE,DWORD*,DWORD*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapGetHashAlg(LPVOID,LPBYTE,DWORD*,DWORD*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapRelease(LPVOID);") -cpp_quote("HRESULT WINAPI MimeOleAlgNameFromSMimeap(LPBYTE,DWORD,LPCSTR*);") -cpp_quote("HRESULT WINAPI MimeOleAlgStrengthFromSMimeCap(LPBYTE,DWORD,BOOL,DWORD*);") -cpp_quote("HRESULT WINAPI MimeOleSMimeCapsFull(LPVOID,BOOL,BOOL,LPBYTE,DWORD*);") -cpp_quote("HRESULT WINAPI MimeOleCreateHashTable(DWORD,BOOL,IHashTable**);") -cpp_quote("HRESULT WINAPI MimeOleStripHeaders(IMimeMessage*,HBODY,LPCSTR,LPCSTR,IStream**);") +cpp_quote("MIMEOLEAPI MimeOleSetCompatMode(DWORD);") +cpp_quote("MIMEOLEAPI MimeOleContentTypeFromUrl(LPCSTR,LPCSTR,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleParseMhtmlUrl(LPSTR,LPSTR*,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleObjectFromUrl(LPCSTR,BOOL,REFIID,LPVOID*,IUnknown**);") +cpp_quote("MIMEOLEAPI MimeOleObjectFromMoniker(BINDF,IMoniker*,IBindCtx*,REFIID,LPVOID*,IMoniker**);") +cpp_quote("MIMEOLEAPI MimeOleCombineURL(LPCSTR,ULONG,LPCSTR,ULONG,BOOL,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetSubjectFileName(IMimePropertySet*,ULONG*,ULONG*,LPSTR,ULONG);") +cpp_quote("MIMEOLEAPI MimeOleCreateWebDocument(LPCSTR,LPCSTR,IMimeWebDocument**);") +cpp_quote("MIMEOLEAPI MimeOleGetRelatedSection(IMimeMessageTree*,boolean,LPHBODY,boolean*);") +cpp_quote("MIMEOLEAPI MimeOleGetMixedSection(IMimeMessageTree*,boolean,LPHBODY,boolean*);") +cpp_quote("MIMEOLEAPI MimeOleGetAlternativeSection(IMimeMessageTree*,LPHBODY,boolean*);") +cpp_quote("MIMEOLEAPI MimeOleGenerateCID(LPSTR,ULONG,boolean);") +cpp_quote("MIMEOLEAPI MimeOleGenerateMID(LPSTR,ULONG,boolean);") +cpp_quote("MIMEOLEAPI MimeOleCreateByteStream(IStream**);") +cpp_quote("MIMEOLEAPI MimeOlGetPropertySchema(IMimePropertySchema**);") +cpp_quote("MIMEOLEAPI MimeOleQueryString(LPCSTR,LPCSTR,boolean,boolean);") +cpp_quote("MIMEOLEAPI MimeOleGetPropA(IMimePropertySet*,LPCSTR,DWORD,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleSetPropA(IMimePropertySet*,LPCSTR,DWORD,LPCSTR);") +cpp_quote("MIMEOLEAPI MimeOleGetPropW(IMimePropertySet*,LPCSTR,DWORD,LPWSTR*);") +cpp_quote("MIMEOLEAPI MimeOleSetPropW(IMimePropertySet*,LPCSTR,DWORD,LPCWSTR);") +cpp_quote("MIMEOLEAPI MimeOleGetBodyPropA(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleSetBodyPropA(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPCSTR);") +cpp_quote("MIMEOLEAPI MimeOleGetBodyPropW(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPWSTR*);") +cpp_quote("MIMEOLEAPI MimeOleSetBodyPropW(IMimeMessageTree*,HBODY,LPCSTR,DWORD,LPCWSTR);") +cpp_quote("MIMEOLEAPI MimeOleCreateHeaderTable(IMimeHeaderTable**);") +cpp_quote("MIMEOLEAPI MimeOleVariantFree(LPPROPVARIANT);") +cpp_quote("MIMEOLEAPI MimeOleVariantCopy(LPPROPVARIANT,LPPROPVARIANT);") +cpp_quote("MIMEOLEAPI MimeOleGetExtClassId(LPCSTR,LPCLSID);") +cpp_quote("MIMEOLEAPI MimeOleEncodeHeader(HCHARSET,LPPROPVARIANT,LPSTR*,LPRFC1522INFO);") +cpp_quote("MIMEOLEAPI MimeOleDecodeHeader(HCHARSET,LPCSTR,LPPROPVARIANT,LPRFC1522INFO);") +cpp_quote("MIMEOLEAPI MimeOleRfc1522Decode(LPCSTR,LPSTR,ULONG,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleRfc1522Encode(LPCSTR,HCHARSET,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetInternat(IMimeInternational**);") +cpp_quote("MIMEOLEAPI MimeOleFindCharset(LPCSTR,LPHCHARSET);") +cpp_quote("MIMEOLEAPI MimeOleGetCharsetInfo(HCHARSET,LPINETCSETINFO);") +cpp_quote("MIMEOLEAPI MimeOleGetCodePageInfo(HCHARSET,LPCODEPAGEINFO);") +cpp_quote("MIMEOLEAPI MimeOleGetDefaultCharset(LPHCHARSET);") +cpp_quote("MIMEOLEAPI MimeOleSetDefaultCharset(HCHARSET);") +cpp_quote("MIMEOLEAPI MimeOleGetCodePageCharset(CODEPAGEID,CHARSETTYPE,LPHCHARSET);") +cpp_quote("MIMEOLEAPI MimeOleCreateVirtualStream(IStream**);") +cpp_quote("MIMEOLEAPI MimeOleOpenFileStream(LPCSTR,DWORD,DWORD,IStream**);") +cpp_quote("MIMEOLEAPI MimeOleIsTnefStream(IStream*);") +cpp_quote("MIMEOLEAPI MimeOleGenerateFileName(LPCSTR,LPCSTR,LPCSTR,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetFileExtension(LPCSTR,LPSTR,ULONG);") +cpp_quote("MIMEOLEAPI MimeOleCreateSecurity(IMimeSecurity**);") +cpp_quote("MIMEOLEAPI MimeOleInetDateToFileTime(LPCSTR,LPFILETIME);") +cpp_quote("MIMEOLEAPI MimeOleFileTimeToInetDate(LPFILETIME,LPSTR,ULONG);") +cpp_quote("MIMEOLEAPI MimeOleCreateMessageParts(IMimeMessageParts**);") +cpp_quote("MIMEOLEAPI MimeOleGetAllocator(IMimeAllocator**);") +cpp_quote("MIMEOLEAPI MimeOleParseRfc822Address(DWORD,ENCODINGTYPE,LPCSTR,LPADDRESSLIST);") +cpp_quote("MIMEOLEAPI MimeOleCreateMessage(IUnknown*,IMimeMessage**);") +cpp_quote("MIMEOLEAPI MimeOleMergePartialHeaders(IStream*,IStream*);") +cpp_quote("MIMEOLEAPI MimeOleEscapeString(CODEPAGEID,LPCSTR,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetExtContentType(LPCSTR,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetContentTypeExt(LPCSTR,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleGetFileInfo(LPSTR,LPSTR*,LPSTR*,LPSTR*,LPSTR*,LPSTR*);") +cpp_quote("MIMEOLEAPI MimeOleCreateBody(IMimeBody**);") +cpp_quote("MIMEOLEAPI MimeOleCreatePropertySet(IUnknown*,IMimePropertySet**);") +cpp_quote("MIMEOLEAPI MimeOleCreateMessageTree(IUnknown*,IMimeMessageTree**);") +cpp_quote("MIMEOLEAPI MimeOleGetCertsFromThumbprints(THUMBBLOB*,X509CERTRESULT*,const HCERTSTORE*,DWORD);") +cpp_quote("MIMEOLEAPI MimeOleSplitMessage(IMimeMessage*,ULONG,IMimeMessageParts**);") +cpp_quote("MIMEOLEAPI MimeOleClearDirtyTree(IMimeMessageTree*);") +cpp_quote("MIMEOLEAPI MimeOleConvertEnrichedToHTML(CODEPAGEID,IStream*,IStream*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapsToDlg(LPBYTE,DWORD,DWORD,PCX509CERT*,HWND,DWORD,DWORD,DWORD);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapsFromDlg(HWND,DWORD,DWORD,DWORD,LPBYTE,DWORD*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapInit(LPBYTE,DWORD,LPVOID*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapAddSMimeCap(LPBYTE,DWORD,LPVOID);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapAddCert(LPBYTE,DWORD,BOOL,LPVOID);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapGetEncAlg(LPVOID,LPBYTE,DWORD*,DWORD*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapGetHashAlg(LPVOID,LPBYTE,DWORD*,DWORD*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapRelease(LPVOID);") +cpp_quote("MIMEOLEAPI MimeOleAlgNameFromSMimeap(LPBYTE,DWORD,LPCSTR*);") +cpp_quote("MIMEOLEAPI MimeOleAlgStrengthFromSMimeCap(LPBYTE,DWORD,BOOL,DWORD*);") +cpp_quote("MIMEOLEAPI MimeOleSMimeCapsFull(LPVOID,BOOL,BOOL,LPBYTE,DWORD*);") +cpp_quote("MIMEOLEAPI MimeOleCreateHashTable(DWORD,BOOL,IHashTable**);") +cpp_quote("MIMEOLEAPI MimeOleStripHeaders(IMimeMessage*,HBODY,LPCSTR,LPCSTR,IStream**);") -cpp_quote("HRESULT WINAPI MimeEditViewSource(HWND,IMimeMessage*);") -cpp_quote("HRESULT WINAPI MimeEditIsSafeToRun(HWND,LPCSTR);") -cpp_quote("HRESULT WINAPI MimeEditVerifyTrust(HWND,LPCSTR,LPCSTR);") -cpp_quote("HRESULT WINAPI MimeEditCreateMimeDocument(IUnknown*,IMimeMessage*,DWORD,IMimeMessage**);") -cpp_quote("HRESULT WINAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") -cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") +cpp_quote("MIMEOLEAPI MimeEditViewSource(HWND,IMimeMessage*);") +cpp_quote("MIMEOLEAPI MimeEditIsSafeToRun(HWND,LPCSTR);") +cpp_quote("MIMEOLEAPI MimeEditVerifyTrust(HWND,LPCSTR,LPCSTR);") +cpp_quote("MIMEOLEAPI MimeEditCreateMimeDocument(IUnknown*,IMimeMessage*,DWORD,IMimeMessage**);") +cpp_quote("MIMEOLEAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") +cpp_quote("MIMEOLEAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") -cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") -cpp_quote("HRESULT WINAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);") +cpp_quote("MIMEOLEAPI MimeOleGetPropertySchema(IMimePropertySchema**);") +cpp_quote("MIMEOLEAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);")