May 2006 - Wine-commits - list.winehq.org

Robert Shearman : ole32: Release all existing monikers before loading the state.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: e68e6d7dba3e4ed4b8efe3e52135c493fcf89bab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e68e6d7dba3e4ed4b8efe3e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:38:44 2006 +0100 ole32: Release all existing monikers before loading the state. --- dlls/ole32/compositemoniker.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 989152a..5096d0d 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -137,6 +137,16 @@ CompositeMonikerImpl_AddRef(IMoniker* if return InterlockedIncrement(&This->ref); } +static void CompositeMonikerImpl_ReleaseMonikersInTable(CompositeMonikerImpl *This) +{ + ULONG i; + + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(This->tabMoniker[i]); + + This->tabLastIndex = 0; +} + /****************************************************************************** * CompositeMoniker_Release ******************************************************************************/ @@ -144,7 +154,6 @@ static ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface) { CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; - ULONG i; ULONG ref; TRACE("(%p)\n",This); @@ -155,8 +164,7 @@ CompositeMonikerImpl_Release(IMoniker* i if (ref == 0){ /* release all the components before destroying this object */ - for (i=0;i<This->tabLastIndex;i++) - IMoniker_Release(This->tabMoniker[i]); + CompositeMonikerImpl_ReleaseMonikersInTable(This); HeapFree(GetProcessHeap(),0,This->tabMoniker); HeapFree(GetProcessHeap(),0,This); @@ -218,6 +226,8 @@ CompositeMonikerImpl_Load(IMoniker* ifac return E_FAIL; } + CompositeMonikerImpl_ReleaseMonikersInTable(This); + for (i = 0; i < moniker_count; i++) { res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]);

1 0

Robert Shearman : ole32: EnumMonikerImpl_Next should add a reference to the monikers it returns to the caller .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 785d957eb484e7733396a6530d386f43c772a246 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=785d957eb484e7733396a65… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:38:34 2006 +0100 ole32: EnumMonikerImpl_Next should add a reference to the monikers it returns to the caller. --- dlls/ole32/compositemoniker.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 36b4c27..989152a 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1379,8 +1379,10 @@ EnumMonikerImpl_Next(IEnumMoniker* iface /* retrieve the requested number of moniker from the current position */ for(i=0;((This->currentPos < This->tabSize) && (i < celt));i++) - + { rgelt[i]=This->tabMoniker[This->currentPos++]; + IMoniker_AddRef(rgelt[i]); + } if (pceltFethed!=NULL) *pceltFethed= i;

1 0

Robert Shearman : ole32: Fix CompositeMonikerImpl_GetSizeMax to match the data written by CompositeMonikerImpl_Save .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 3a77ee1d5e48f676f3e954749fe0bae0ef0d79eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a77ee1d5e48f676f3e9547… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:38:13 2006 +0100 ole32: Fix CompositeMonikerImpl_GetSizeMax to match the data written by CompositeMonikerImpl_Save. --- dlls/ole32/compositemoniker.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 9122c1a..36b4c27 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -303,19 +303,17 @@ CompositeMonikerImpl_GetSizeMax(IMoniker if (!pcbSize) return E_POINTER; - pcbSize->u.LowPart =0; - pcbSize->u.HighPart=0; + pcbSize->QuadPart = sizeof(DWORD); IMoniker_Enum(iface,TRUE,&enumMk); - while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)){ + while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)==S_OK){ IMoniker_GetSizeMax(pmk,&ptmpSize); IMoniker_Release(pmk); - pcbSize->u.LowPart +=ptmpSize.u.LowPart; - pcbSize->u.HighPart+=ptmpSize.u.HighPart; + pcbSize->QuadPart = ptmpSize.QuadPart + sizeof(CLSID); } IEnumMoniker_Release(enumMk);

1 0

Robert Shearman : ole32: Fix the loop in CompositeMonikerImpl_Hash, as IEnumMoniker_Next
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 9c6b67090f28ea35f520f6a2242ba7900cb8f70c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c6b67090f28ea35f520f6a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:38:03 2006 +0100 ole32: Fix the loop in CompositeMonikerImpl_Hash, as IEnumMoniker_Next will return S_FALSE when there are no more monikers left to enumerate. --- dlls/ole32/compositemoniker.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 778945e..9122c1a 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -601,11 +601,7 @@ CompositeMonikerImpl_Hash(IMoniker* ifac if(FAILED(res)) return res; - while(1){ - res=IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL); - if(FAILED(res)) - break; - + while(IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL)==S_OK){ res = IMoniker_Hash(tempMk, &tempHash); if(FAILED(res)) break;

1 0

Robert Shearman : ole32: Implement CompositeMonikerROTDataImpl_GetComparisonData.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 2a320dbde873bdf2825923b730df6b9b12761341 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a320dbde873bdf2825923b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:37:25 2006 +0100 ole32: Implement CompositeMonikerROTDataImpl_GetComparisonData. --- dlls/ole32/compositemoniker.c | 91 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 0fd9fd5..778945e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1212,14 +1212,95 @@ static ULONG WINAPI CompositeMonikerROTD } /****************************************************************************** - * CompositeMonikerIROTData_GetComparaisonData + * CompositeMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI -CompositeMonikerROTDataImpl_GetComparaisonData(IROTData* iface, +CompositeMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, ULONG cbMax, ULONG* pcbData) { - FIXME("(),stub!\n"); - return E_NOTIMPL; + IMoniker *This = impl_from_IROTData(iface); + IEnumMoniker *pEnumMk; + IMoniker *pmk; + HRESULT hr; + + TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData); + + *pcbData = sizeof(CLSID); + + hr = IMoniker_Enum(This, TRUE, &pEnumMk); + if (FAILED(hr)) return hr; + + while(IEnumMoniker_Next(pEnumMk, 1, &pmk, NULL) == S_OK) + { + IROTData *pROTData; + hr = IMoniker_QueryInterface(pmk, &IID_IROTData, (void **)&pROTData); + if (FAILED(hr)) + ERR("moniker doesn't support IROTData interface\n"); + + if (SUCCEEDED(hr)) + { + ULONG cbData; + hr = IROTData_GetComparisonData(pROTData, NULL, 0, &cbData); + IROTData_Release(pROTData); + if (SUCCEEDED(hr) || (hr == E_OUTOFMEMORY)) + { + *pcbData += cbData; + hr = S_OK; + } + else + ERR("IROTData_GetComparisonData failed with error 0x%08lx\n", hr); + } + + IMoniker_Release(pmk); + + if (FAILED(hr)) + { + IEnumMoniker_Release(pEnumMk); + return hr; + } + } + if (cbMax < *pcbData) + return E_OUTOFMEMORY; + + IEnumMoniker_Reset(pEnumMk); + + memcpy(pbData, &CLSID_CompositeMoniker, sizeof(CLSID)); + pbData += sizeof(CLSID); + cbMax -= sizeof(CLSID); + + while (IEnumMoniker_Next(pEnumMk, 1, &pmk, NULL) == S_OK) + { + IROTData *pROTData; + hr = IMoniker_QueryInterface(pmk, &IID_IROTData, (void **)&pROTData); + if (FAILED(hr)) + ERR("moniker doesn't support IROTData interface\n"); + + if (SUCCEEDED(hr)) + { + ULONG cbData; + hr = IROTData_GetComparisonData(pROTData, pbData, cbMax, &cbData); + IROTData_Release(pROTData); + if (SUCCEEDED(hr)) + { + pbData += cbData; + cbMax -= cbData; + } + else + ERR("IROTData_GetComparisonData failed with error 0x%08lx\n", hr); + } + + IMoniker_Release(pmk); + + if (FAILED(hr)) + { + IEnumMoniker_Release(pEnumMk); + return hr; + } + } + + IEnumMoniker_Release(pEnumMk); + + return S_OK; } /****************************************************************************** @@ -1458,7 +1539,7 @@ static const IROTDataVtbl VT_ROTDataImpl CompositeMonikerROTDataImpl_QueryInterface, CompositeMonikerROTDataImpl_AddRef, CompositeMonikerROTDataImpl_Release, - CompositeMonikerROTDataImpl_GetComparaisonData + CompositeMonikerROTDataImpl_GetComparisonData }; /******************************************************************************

1 0

Robert Shearman : ole32: The unknown constant at the start of the persisted data is the number of monikers in the generic composite .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 996b35f2720dbc641a849ab645ae942529ad3273 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=996b35f2720dbc641a849ab… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:37:48 2006 +0100 ole32: The unknown constant at the start of the persisted data is the number of monikers in the generic composite. Fix the pointer passed into IEnumMoniker_Release in CompositeMonikerImpl_Save. --- dlls/ole32/compositemoniker.c | 63 ++++++++++------------------------------- 1 files changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4e9d763..0fd9fd5 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -202,9 +202,8 @@ static HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm) { HRESULT res; - DWORD constant; - CLSID clsid; - WCHAR string[1]={0}; + DWORD moniker_count; + DWORD i; CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; @@ -212,54 +211,20 @@ CompositeMonikerImpl_Load(IMoniker* ifac /* this function call OleLoadFromStream function for each moniker within this object */ - /* read the a constant written by CompositeMonikerImpl_Save (see CompositeMonikerImpl_Save for more details)*/ - res=IStream_Read(pStm,&constant,sizeof(DWORD),NULL); - - if (SUCCEEDED(res)&& constant!=3) + res=IStream_Read(pStm,&moniker_count,sizeof(DWORD),NULL); + if (res != S_OK) + { + ERR("couldn't reading moniker count from stream\n"); return E_FAIL; + } - while(1){ -#if 0 + for (i = 0; i < moniker_count; i++) + { res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]); -#endif - res=ReadClassStm(pStm,&clsid); - DPRINTF("res=%ld",res); if (FAILED(res)) - break; - - if (IsEqualIID(&clsid,&CLSID_FileMoniker)){ - res=CreateFileMoniker(string,&This->tabMoniker[This->tabLastIndex]); - if (FAILED(res)) - break; - res=IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm); - if (FAILED(res)) - break; - } - else if (IsEqualIID(&clsid,&CLSID_ItemMoniker)){ - CreateItemMoniker(string,string,&This->tabMoniker[This->tabLastIndex]); - if (res!=S_OK) - break; - IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm); - if (FAILED(res)) - break; - } - else if (IsEqualIID(&clsid,&CLSID_AntiMoniker)){ - CreateAntiMoniker(&This->tabMoniker[This->tabLastIndex]); - if (FAILED(res)) - break; - IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm); - if (FAILED(res)) - break; - } - else if (IsEqualIID(&clsid,&CLSID_CompositeMoniker)) - return E_FAIL; - - else { - FIXME("()\n"); - /* FIXME: To whoever wrote this code: It's either return or break. it cannot be both! */ + ERR("couldn't load moniker from stream, res = 0x%08lx\n", res); break; - return E_NOTIMPL; } /* resize the table if needed */ @@ -282,10 +247,11 @@ #endif static HRESULT WINAPI CompositeMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) { + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; HRESULT res; IEnumMoniker *enumMk; IMoniker *pmk; - DWORD constant=3; + DWORD moniker_count = This->tabLastIndex; TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty); @@ -295,7 +261,8 @@ CompositeMonikerImpl_Save(IMoniker* ifac * at the beginning of the stream. I don't known why (there's no * indication in the specification) ! */ - res=IStream_Write(pStm,&constant,sizeof(constant),NULL); + res=IStream_Write(pStm,&moniker_count,sizeof(moniker_count),NULL); + if (FAILED(res)) return res; IMoniker_Enum(iface,TRUE,&enumMk); @@ -307,7 +274,7 @@ CompositeMonikerImpl_Save(IMoniker* ifac if (FAILED(res)){ - IEnumMoniker_Release(pmk); + IEnumMoniker_Release(enumMk); return res; } }

1 0

Robert Shearman : ole32: Add a test for anti monikers. Fix AntiMonikerImpl_Hash and AntiMonikerROTDataImpl_GetComparisonData to pass the tests .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: c8c93e6657f109ec38dd1d3dc20993e9dca4b14a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8c93e6657f109ec38dd1d3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:37:08 2006 +0100 ole32: Add a test for anti monikers. Fix AntiMonikerImpl_Hash and AntiMonikerROTDataImpl_GetComparisonData to pass the tests. --- dlls/ole32/antimoniker.c | 20 ++++++++++---- dlls/ole32/tests/moniker.c | 64 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 98fa694..77d883a 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -339,7 +339,7 @@ static HRESULT WINAPI AntiMonikerImpl_Ha if (pdwHash==NULL) return E_POINTER; - *pdwHash=0; + *pdwHash = 0x80000001; return S_OK; } @@ -539,11 +539,21 @@ static ULONG WINAPI AntiMonikerROTDataIm * AntiMonikerIROTData_GetComparaisonData ******************************************************************************/ static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, BYTE* pbData, +AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, ULONG cbMax, ULONG* pcbData) { - FIXME("(),stub!\n"); - return E_NOTIMPL; + DWORD constant = 1; + + TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData); + + *pcbData = sizeof(CLSID) + sizeof(DWORD); + if (cbMax < *pcbData) + return E_OUTOFMEMORY; + + memcpy(pbData, &CLSID_AntiMoniker, sizeof(CLSID)); + memcpy(pbData+sizeof(CLSID), &constant, sizeof(DWORD)); + + return S_OK; } /********************************************************************************/ @@ -583,7 +593,7 @@ static const IROTDataVtbl VT_ROTDataImpl AntiMonikerROTDataImpl_QueryInterface, AntiMonikerROTDataImpl_AddRef, AntiMonikerROTDataImpl_Release, - AntiMonikerROTDataImpl_GetComparaisonData + AntiMonikerROTDataImpl_GetComparisonData }; /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 22dd90b..cf14250 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -219,6 +219,29 @@ static const BYTE expected_item_moniker_ 0x00,0x00,0x54,0x65,0x73,0x74,0x00, }; +static const BYTE expected_anti_moniker_marshal_data[] = +{ + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00, + 0x01,0x00,0x00,0x00, +}; + +static const BYTE expected_anti_moniker_saved_data[] = +{ + 0x01,0x00,0x00,0x00, +}; + +static const BYTE expected_anti_moniker_comparison_data[] = +{ + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x01,0x00,0x00,0x00, +}; + static void test_moniker( const char *testname, IMoniker *moniker, const BYTE *expected_moniker_marshal_data, size_t sizeof_expected_moniker_marshal_data, @@ -469,7 +492,7 @@ static void test_file_monikers(void) } } -static void test_item_moniker() +static void test_item_moniker(void) { HRESULT hr; IMoniker *moniker; @@ -508,6 +531,44 @@ static void test_item_moniker() IMoniker_Release(moniker); } +static void test_anti_moniker(void) +{ + HRESULT hr; + IMoniker *moniker; + IMoniker *inverse; + DWORD moniker_type; + DWORD hash; + + hr = CreateAntiMoniker(&moniker); + ok_ole_success(hr, CreateAntiMoniker); + if (!moniker) return; + + test_moniker("anti moniker", moniker, + expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data), + expected_anti_moniker_saved_data, sizeof(expected_anti_moniker_saved_data), + expected_anti_moniker_comparison_data, sizeof(expected_anti_moniker_comparison_data)); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok_ole_success(hr, IMoniker_Hash); + ok(hash == 0x80000001, + "Hash value != 0x80000001, instead was 0x%08lx\n", + hash); + + /* IsSystemMoniker test */ + hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); + ok_ole_success(hr, IMoniker_IsSystemMoniker); + ok(moniker_type == MKSYS_ANTIMONIKER, + "dwMkSys != MKSYS_ANTIMONIKER, instead was 0x%08lx", + moniker_type); + + hr = IMoniker_Inverse(moniker, &inverse); + ok(hr == MK_E_NOINVERSE, "IMoniker_Inverse should have returned MK_E_NOINVERSE instead of 0x%08lx\n", hr); + ok(inverse == NULL, "inverse should have been set to NULL instead of %p\n", inverse); + + IMoniker_Release(moniker); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -516,6 +577,7 @@ START_TEST(moniker) test_class_moniker(); test_file_monikers(); test_item_moniker(); + test_anti_moniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Robert Shearman : ole32: Support marshaling of anti monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: caa8b4ed1d5f48e5e81db330ec87b80be821291e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=caa8b4ed1d5f48e5e81db33… Author: Robert Shearman <rob(a)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;

1 0

Robert Shearman : ole32: Register CLSID_CompositeMoniker.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: f7ed725b60cb756eebec7f8fe261a730cc209e2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7ed725b60cb756eebec7f8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:35:56 2006 +0100 ole32: Register CLSID_CompositeMoniker. --- dlls/ole32/regsvr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index b58273e..31f0e22 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -458,6 +458,12 @@ static struct regsvr_coclass const cocla "ole32.dll", "Both" }, + { &CLSID_CompositeMoniker, + "CompositeMoniker", + NULL, + "ole32.dll", + "Both" + }, { &CLSID_DfMarshal, "DfMarshal", NULL,

1 0

Robert Shearman : ole32: Register CLSIDs for all OLE monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 7fe211e9b34ee30fed814678f752cc8711336a92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fe211e9b34ee30fed81467… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:35:43 2006 +0100 ole32: Register CLSIDs for all OLE monikers. --- dlls/ole32/regsvr.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 12961b5..b58273e 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -404,11 +404,26 @@ static GUID const CLSID_FileMoniker = { static GUID const CLSID_ItemMoniker = { 0x00000304, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static GUID const CLSID_AntiMoniker = { + 0x00000305, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + +static GUID const CLSID_PointerMoniker = { + 0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + +static GUID const CLSID_PackagerMoniker = { + 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + +static GUID const CLSID_CompositeMoniker = { + 0x00000309, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + /* FIXME: DfMarshal and PSFactoryBuffer are defined elsewhere too */ static GUID const CLSID_DfMarshal = { 0x0000030B, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static GUID const CLSID_ClassMoniker = { + 0x0000031A, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + static GUID const CLSID_PSFactoryBuffer = { 0x00000320, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; @@ -425,12 +440,36 @@ static struct regsvr_coclass const cocla "ole32.dll", "Both" }, + { &CLSID_AntiMoniker, + "AntiMoniker", + NULL, + "ole32.dll", + "Both" + }, + { &CLSID_PointerMoniker, + "PointerMoniker", + NULL, + "ole32.dll", + "Both" + }, + { &CLSID_PackagerMoniker, + "PackagerMoniker", + NULL, + "ole32.dll", + "Both" + }, { &CLSID_DfMarshal, "DfMarshal", NULL, "ole32.dll", "Both" }, + { &CLSID_ClassMoniker, + "ClassMoniker", + NULL, + "ole32.dll", + "Both" + }, { &CLSID_PSFactoryBuffer, "PSFactoryBuffer", NULL,

1 0