Robert Shearman : ole32: Support marshaling of anti monikers.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 8 09:05:55 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: caa8b4ed1d5f48e5e81db330ec87b80be821291e
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=caa8b4ed1d5f48e5e81db330ec87b80be821291e
Author: Robert Shearman <rob at codeweavers.com>
Date: Mon May 8 12:36:13 2006 +0100
ole32: Support marshaling of anti monikers.
---
dlls/ole32/antimoniker.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-
dlls/ole32/moniker.h | 1 +
dlls/ole32/oleproxy.c | 2 +
3 files changed, 88 insertions(+), 1 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 9b233e1..98fa694 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -51,6 +51,7 @@ typedef struct AntiMonikerImpl{
LONG ref; /* reference counter for this object */
+ IUnknown *pMarshal; /* custom marshaler */
} AntiMonikerImpl;
static inline IMoniker *impl_from_IROTData( IROTData *iface )
@@ -84,6 +85,15 @@ AntiMonikerImpl_QueryInterface(IMoniker*
*ppvObject = iface;
else if (IsEqualIID(&IID_IROTData, riid))
*ppvObject = (IROTData*)&(This->lpvtbl2);
+ else if (IsEqualIID(&IID_IMarshal, riid))
+ {
+ HRESULT hr = S_OK;
+ if (!This->pMarshal)
+ hr = MonikerMarshal_Create(iface, &This->pMarshal);
+ if (hr != S_OK)
+ return hr;
+ return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject);
+ }
/* Check that we obtained an interface.*/
if ((*ppvObject)==0)
@@ -122,7 +132,11 @@ AntiMonikerImpl_Release(IMoniker* iface)
ref = InterlockedDecrement(&This->ref);
/* destroy the object if there's no more reference on it */
- if (ref == 0) HeapFree(GetProcessHeap(),0,This);
+ if (ref == 0)
+ {
+ if (This->pMarshal) IUnknown_Release(This->pMarshal);
+ HeapFree(GetProcessHeap(),0,This);
+ }
return ref;
}
@@ -584,6 +598,7 @@ static HRESULT AntiMonikerImpl_Construct
This->lpvtbl1 = &VT_AntiMonikerImpl;
This->lpvtbl2 = &VT_ROTDataImpl;
This->ref = 0;
+ This->pMarshal = NULL;
return S_OK;
}
@@ -615,3 +630,72 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIK
return hr;
}
+
+static HRESULT WINAPI AntiMonikerCF_QueryInterface(LPCLASSFACTORY iface,
+ REFIID riid, LPVOID *ppv)
+{
+ *ppv = NULL;
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory))
+ {
+ *ppv = iface;
+ IUnknown_AddRef(iface);
+ return S_OK;
+ }
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI AntiMonikerCF_AddRef(LPCLASSFACTORY iface)
+{
+ return 2; /* non-heap based object */
+}
+
+static ULONG WINAPI AntiMonikerCF_Release(LPCLASSFACTORY iface)
+{
+ return 1; /* non-heap based object */
+}
+
+static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface,
+ LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv)
+{
+ IMoniker *pMoniker;
+ HRESULT hr;
+
+ TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv);
+
+ *ppv = NULL;
+
+ if (pUnk)
+ return CLASS_E_NOAGGREGATION;
+
+ hr = CreateAntiMoniker(&pMoniker);
+ if (FAILED(hr))
+ return hr;
+
+ hr = IMoniker_QueryInterface(pMoniker, riid, ppv);
+
+ if (FAILED(hr))
+ IMoniker_Release(pMoniker);
+
+ return hr;
+}
+
+static HRESULT WINAPI AntiMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock)
+{
+ FIXME("(%d), stub!\n",fLock);
+ return S_OK;
+}
+
+static const IClassFactoryVtbl AntiMonikerCFVtbl =
+{
+ AntiMonikerCF_QueryInterface,
+ AntiMonikerCF_AddRef,
+ AntiMonikerCF_Release,
+ AntiMonikerCF_CreateInstance,
+ AntiMonikerCF_LockServer
+};
+static const IClassFactoryVtbl *AntiMonikerCF = &AntiMonikerCFVtbl;
+
+HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv)
+{
+ return IClassFactory_QueryInterface((IClassFactory *)&AntiMonikerCF, riid, ppv);
+}
diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h
index 4c64b9b..e36dc0f 100644
--- a/dlls/ole32/moniker.h
+++ b/dlls/ole32/moniker.h
@@ -7,6 +7,7 @@ extern const CLSID CLSID_AntiMoniker;
HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv);
HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv);
+HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv);
HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer);
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index eda679a..6e9aaf8 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -1014,6 +1014,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
return FileMonikerCF_Create(iid, ppv);
if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker))
return ItemMonikerCF_Create(iid, ppv);
+ if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker))
+ return AntiMonikerCF_Create(iid, ppv);
FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
return CLASS_E_CLASSNOTAVAILABLE;
More information about the wine-cvs
mailing list