Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/ole32/antimoniker.c | 66 +++++++++++++++++++++++--------------- dlls/ole32/tests/moniker.c | 10 ------ 2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index f7912fad78..bff6500fa5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -40,6 +40,7 @@ typedef struct AntiMonikerImpl{ IROTData IROTData_iface; LONG ref; IUnknown *pMarshal; /* custom marshaler */ + DWORD count; } AntiMonikerImpl;
static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -168,30 +169,35 @@ AntiMonikerImpl_IsDirty(IMoniker* iface) /****************************************************************************** * AntiMoniker_Load ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI AntiMonikerImpl_Load(IMoniker *iface, IStream *stream) { - DWORD constant=1,dwbuffer; - HRESULT res; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + DWORD count = 0; + HRESULT hr; + + TRACE("%p, %p.\n", iface, stream);
- /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + if (FAILED(hr = IStream_Read(stream, &count, sizeof(count), NULL))) + return hr; + + if (count > 0xfffff) + return E_INVALIDARG;
- if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; + moniker->count = count;
- return res; + return S_OK; }
/****************************************************************************** * AntiMoniker_Save ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - static const DWORD constant = 1; - /* data written by this function is only a DWORD constant set to 1 ! */ - return IStream_Write(pStm,&constant,sizeof(constant),NULL); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + return IStream_Write(stream, &moniker->count, sizeof(moniker->count), NULL); }
/****************************************************************************** @@ -323,12 +329,16 @@ AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) /****************************************************************************** * AntiMoniker_Hash ******************************************************************************/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker *iface, DWORD *hash) { - if (pdwHash==NULL) + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p.\n", iface, hash); + + if (!hash) return E_POINTER;
- *pdwHash = 0x80000001; + *hash = 0x80000000 | moniker->count;
return S_OK; } @@ -434,14 +444,16 @@ AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm * AntiMoniker_GetDisplayName ******************************************************************************/ static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +AntiMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *displayname) { - static const WCHAR back[]={'\','.','.',0}; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + static const WCHAR nameW[] = {'\','.','.'}; + WCHAR *ptrW; + int i;
- TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, displayname);
- if (ppszDisplayName==NULL) + if (!displayname) return E_POINTER;
if (pmkToLeft!=NULL){ @@ -449,12 +461,13 @@ AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, return E_NOTIMPL; }
- *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) + *displayname = ptrW = CoTaskMemAlloc((moniker->count * ARRAY_SIZE(nameW) + 1) * sizeof(WCHAR)); + if (!*displayname) return E_OUTOFMEMORY;
- lstrcpyW(*ppszDisplayName,back); + for (i = 0; i < moniker->count; ++i) + memcpy(ptrW + i * ARRAY_SIZE(nameW), nameW, sizeof(nameW)); + ptrW[moniker->count * ARRAY_SIZE(nameW)] = 0;
return S_OK; } @@ -598,6 +611,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; This->ref = 0; This->pMarshal = NULL; + This->count = 1;
return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e0e3020234..dff6cbbe57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2328,7 +2328,6 @@ todo_wine stream_write_dword(stream, 2);
hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2); @@ -2341,13 +2340,11 @@ todo_wine
hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash);
/* Display name reflects anti combination. */ hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L"\..\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name);
@@ -2355,30 +2352,25 @@ todo_wine stream_write_dword(stream, 0xfffff);
hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash);
stream_write_dword(stream, 0xfffff + 1);
hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash);
/* Zero combining counter is also valid. */ stream_write_dword(stream, 0);
hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2); @@ -2391,12 +2383,10 @@ todo_wine
hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash);
hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name);
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/ole32/antimoniker.c | 28 +++++++++++++++++----------- dlls/ole32/tests/moniker.c | 5 ----- 2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index bff6500fa5..9b02129021 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -53,6 +53,7 @@ static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface) return CONTAINING_RECORD(iface, AntiMonikerImpl, IROTData_iface); }
+static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface);
/******************************************************************************* * AntiMoniker_QueryInterface @@ -308,22 +309,20 @@ AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker /****************************************************************************** * AntiMoniker_IsEqual ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI AntiMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { - DWORD mkSys; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker;
- if (pmkOtherMoniker==NULL) - return S_FALSE; + TRACE("%p, %p.\n", iface, other);
- IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + if (!other) + return E_INVALIDARG;
- if (mkSys==MKSYS_ANTIMONIKER) - return S_OK; - else + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) return S_FALSE; + + return moniker->count == other_moniker->count ? S_OK : S_FALSE; }
/****************************************************************************** @@ -588,6 +587,13 @@ static const IMonikerVtbl VT_AntiMonikerImpl = AntiMonikerImpl_IsSystemMoniker };
+static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_AntiMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, AntiMonikerImpl, IMoniker_iface); +} + /********************************************************************************/ /* Virtual function table for the IROTData class. */ static const IROTDataVtbl VT_ROTDataImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index dff6cbbe57..65cd279b1a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2331,11 +2331,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker2, moniker); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
hr = IMoniker_Hash(moniker, &hash); @@ -2374,11 +2372,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker2, moniker); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
hr = IMoniker_Hash(moniker, &hash); @@ -2403,7 +2399,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
IStream_Release(stream);
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/ole32/antimoniker.c | 15 +++++++-------- dlls/ole32/tests/moniker.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 9b02129021..ff2e287070 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -540,19 +540,18 @@ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) * AntiMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, - ULONG cbMax, ULONG* pcbData) +AntiMonikerROTDataImpl_GetComparisonData(IROTData *iface, BYTE *data, ULONG data_len, ULONG *data_req) { - DWORD constant = 1; + AntiMonikerImpl *moniker = impl_from_IROTData(iface);
- TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); + TRACE("%p, %p, %u, %p.\n", iface, data, data_len, data_req);
- *pcbData = sizeof(CLSID) + sizeof(DWORD); - if (cbMax < *pcbData) + *data_req = sizeof(CLSID) + sizeof(DWORD); + if (data_len < *data_req) return E_OUTOFMEMORY;
- memcpy(pbData, &CLSID_AntiMoniker, sizeof(CLSID)); - memcpy(pbData+sizeof(CLSID), &constant, sizeof(DWORD)); + memcpy(data, &CLSID_AntiMoniker, sizeof(CLSID)); + memcpy(data + sizeof(CLSID), &moniker->count, sizeof(moniker->count));
return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 65cd279b1a..5fff7041ef 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1412,11 +1412,27 @@ static const BYTE expected_anti_moniker_marshal_data[] = 0x01,0x00,0x00,0x00, };
+static const BYTE expected_anti_moniker_marshal_data2[] = +{ + 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, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_saved_data[] = { 0x01,0x00,0x00,0x00, };
+static const BYTE expected_anti_moniker_saved_data2[] = +{ + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_comparison_data[] = { 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, @@ -1424,6 +1440,13 @@ static const BYTE expected_anti_moniker_comparison_data[] = 0x01,0x00,0x00,0x00, };
+static const BYTE expected_anti_moniker_comparison_data2[] = +{ + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_gc_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -2330,6 +2353,12 @@ todo_wine hr = IMoniker_Load(moniker, stream); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ test_moniker("anti moniker 2", moniker, + expected_anti_moniker_marshal_data2, sizeof(expected_anti_moniker_marshal_data2), + expected_anti_moniker_saved_data2, sizeof(expected_anti_moniker_saved_data2), + expected_anti_moniker_comparison_data2, sizeof(expected_anti_moniker_comparison_data2), + 20, L"\..\.."); + hr = IMoniker_IsEqual(moniker, moniker2); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/ole32/antimoniker.c | 37 ++++++++++++--------- dlls/ole32/tests/moniker.c | 66 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 17 deletions(-)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index ff2e287070..5bce4fc5da 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -400,25 +400,32 @@ AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /****************************************************************************** * AntiMoniker_CommonPrefixWith ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - DWORD mkSys; - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - - if(mkSys==MKSYS_ANTIMONIKER){ - - IMoniker_AddRef(iface); - - *ppmkPrefix=iface; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; + HRESULT hr;
- IMoniker_AddRef(iface); + TRACE("%p, %p, %p.\n", iface, other, prefix);
- return MK_S_US; + other_moniker = unsafe_impl_from_IMoniker(other); + if (other_moniker) + { + if (moniker->count <= other_moniker->count) + { + *prefix = iface; + hr = moniker->count == other_moniker->count ? MK_S_US : MK_S_ME; + } + else + { + *prefix = other; + hr = MK_S_HIM; + } + + IMoniker_AddRef(*prefix); + return hr; } - else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); }
/****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5fff7041ef..8c533d1ff7 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2430,8 +2430,6 @@ todo_wine hr = IMoniker_IsEqual(moniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
- IStream_Release(stream); - /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); @@ -2453,6 +2451,70 @@ todo_wine todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ /* CommonPrefixWith() */ + stream_write_dword(stream, 0); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 10); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 5); + + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + /* Now same length, 0 or 2 */ + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2);
-
Nikolay Sivov