Module: wine Branch: master Commit: 689c510f6360cda60ad0a915157d31c6fd528f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=689c510f6360cda60ad0a91515...
Author: Huw Davies huw@codeweavers.com Date: Thu Apr 23 14:09:15 2009 +0100
ole32: Add a stub for OleCreateFromDataEx.
---
dlls/ole32/ole2impl.c | 18 ++++++++++++++++++ dlls/ole32/ole32.spec | 2 +- include/ole2.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index da50f4a..e9310ac 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -86,6 +86,24 @@ HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject) }
/****************************************************************************** + * OleCreateFromDataEx [OLE32.@] + * + * Creates an embedded object from data transfer object retrieved from + * the clipboard or OLE drag and drop. + */ +HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, + IAdviseSink *sink, DWORD *conns, + IOleClientSite *client_site, IStorage *stg, void **obj) +{ + FIXME("(%p, %s, %08x, %08x, %d, %p, %p, %p, %p, %p, %p, %p): stub\n", + data, debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts, + sink, conns, client_site, stg, obj); + + return E_NOTIMPL; +} + +/****************************************************************************** * OleCreateFromData [OLE32.@] * * Author : Abey George diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7d69bd8..b9e5c4c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -183,7 +183,7 @@ @ stub OleCreateEmbeddingHelper @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) -@ stub OleCreateFromDataEx +@ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr) @ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) @ stub OleCreateFromFileEx @ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr) diff --git a/include/ole2.h b/include/ole2.h index a92c2f4..cc75afd 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -122,6 +122,9 @@ HRESULT WINAPI WriteFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR l HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg); HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); +HRESULT WINAPI OleCreateFromDataEx(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD dwFlags, DWORD renderopt, ULONG num_formats, + DWORD *adv_flags, LPFORMATETC fmts, IAdviseSink *sink, DWORD *conns, + LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, LPUNKNOWN pUnkOuter, REFIID riid,