Rob Shearman : include:
Add some missing OLE defines and declarations to ole2.h.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 4 07:16:50 CST 2006
Module: wine
Branch: master
Commit: f8b54686fd15b1615eaeb129c85cd0e99f89d810
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b54686fd15b1615eaeb129c85cd0e99f89d810
Author: Rob Shearman <rob at codeweavers.com>
Date: Fri Dec 1 15:01:17 2006 +0000
include: Add some missing OLE defines and declarations to ole2.h.
---
include/ole2.h | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/include/ole2.h b/include/ole2.h
index 14279e1..5617c83 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -44,6 +44,11 @@ extern "C" {
#define OLEIVERB_DISCARDUNDOSTATE (-6L)
#define OLEIVERB_PROPERTIES (-7L)
+#define EMBDHLP_INPROC_HANDLER 0x00000000
+#define EMBDHLP_INPROC_SERVER 0x00000001
+#define EMBDHLP_CREATENOW 0x00000000
+#define EMBDHLP_DELAYCREATE 0x00010000
+
/*
* API declarations
*/
@@ -96,6 +101,8 @@ HRESULT WINAPI GetHGlobalFromILockBy
HRESULT WINAPI CreateILockBytesOnHGlobal(HGLOBAL hGlobal, BOOL fDeleteOnRelease, LPLOCKBYTES* pplkbyt);
HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel);
+HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR lpszPath, BOOL fUseFileAsLabel);
+HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel, LPOLESTR lpszSourceFile, UINT iIconIndex);
HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses);
HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid,
DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
@@ -117,6 +124,12 @@ HRESULT WINAPI OleCreateDefaultHandl
LPUNKNOWN pUnkOuter,
REFIID riid,
LPVOID* ppvObj);
+HRESULT WINAPI OleCreateEmbeddingHelper(REFCLSID clsid,
+ LPUNKNOWN pUnkOuter,
+ DWORD flags,
+ IClassFactory *pCF,
+ REFIID riid,
+ LPVOID* ppvObj);
HRESULT WINAPI CreateOleAdviseHolder (LPOLEADVISEHOLDER *ppOAHolder);
HRESULT WINAPI OleInitialize(LPVOID pvReserved);
void WINAPI OleUninitialize(void);
More information about the wine-cvs
mailing list