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

Robert Shearman : ole32: Add a test for IMoniker_IsDirty.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: d8563f1ebaca62ef0fee424c04ee860fdf5744d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8563f1ebaca62ef0fee424… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:43:34 2006 +0100 ole32: Add a test for IMoniker_IsDirty. --- dlls/ole32/tests/moniker.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a5b10ce..fcc3c3d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -312,6 +312,9 @@ static void test_moniker( BYTE buffer[128]; IMoniker * moniker_proxy; + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08lx\n", testname, hr); + /* IROTData::GetComparisonData test */ hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata);

1 0

Robert Shearman : ole32: Test unmarshaling the moniker instead of just releasing the marshaled data .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 77188bbeabc4d0ea7481c1cc01a4db6ea682fc6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77188bbeabc4d0ea7481c1c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:43:48 2006 +0100 ole32: Test unmarshaling the moniker instead of just releasing the marshaled data. --- dlls/ole32/tests/moniker.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 0bfc1ff..a5b10ce 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -310,6 +310,7 @@ static void test_moniker( DWORD i; BOOL same = TRUE; BYTE buffer[128]; + IMoniker * moniker_proxy; /* IROTData::GetComparisonData test */ @@ -443,10 +444,11 @@ static void test_moniker( GlobalUnlock(hglobal); IStream_Seek(stream, llZero, STREAM_SEEK_SET, NULL); - hr = CoReleaseMarshalData(stream); - ok_ole_success(hr, CoReleaseMarshalData); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker_proxy); + ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(stream); + IMoniker_Release(moniker_proxy); } static void test_class_moniker(void)

1 0

Robert Shearman : ole32: Make the size returned by CompositeMonikerImpl_GetMarshalSizeMax match that returned by native .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 57b42ae7bcc31437352737784846e5a7123f89d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57b42ae7bcc314373527377… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:43:20 2006 +0100 ole32: Make the size returned by CompositeMonikerImpl_GetMarshalSizeMax match that returned by native. --- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/tests/moniker.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 0646797..13a7e31 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1368,7 +1368,7 @@ static HRESULT WINAPI CompositeMonikerMa TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pSize); - *pSize = 0; + *pSize = 0x10; /* to match native */ hr = IMoniker_Enum(This, TRUE, &pEnumMk); if (FAILED(hr)) return hr; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index aaff209..0bfc1ff 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -644,11 +644,8 @@ static void test_generic_composite_monik hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite); - /* FIXME: marshal data test commented out as the written custom marshal - * size in the OBJREF header doesn't match in ours and native don't match, - * probably due to a bug in Microsoft's implementation. */ test_moniker("generic composite moniker", moniker, - NULL /*expected_gc_moniker_marshal_data*/, sizeof(expected_gc_moniker_marshal_data), + expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data));

1 0

Robert Shearman : ole32: Add on the size of the whole OBJREF structure in the case of custom marshaling .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 50ec1d6849654224df3cc17cd9938b68577d6cba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50ec1d6849654224df3cc17… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:42:36 2006 +0100 ole32: Add on the size of the whole OBJREF structure in the case of custom marshaling. --- dlls/ole32/marshal.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 684d93d..976d9e7 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1450,13 +1450,13 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, pulSize); - /* add on the size of the common header */ - *pulSize += FIELD_OFFSET(OBJREF, u_objref); - - /* if custom marshaling, add on size of custom header */ - if (!IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) - *pulSize += FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) - - FIELD_OFFSET(OBJREF, u_objref.u_custom); + if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) + /* add on the size of the common header */ + *pulSize += FIELD_OFFSET(OBJREF, u_objref); + else + /* custom marshaling: add on the size of the whole OBJREF structure + * like native does */ + *pulSize += sizeof(OBJREF); IMarshal_Release(pMarshal); return hr;

1 0

Robert Shearman : ole32: Fix the algorithm used in CompositeMonikerImpl_Hash to match native.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 340f7a3ec0204eeaf4532e5507bc02e48db86643 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=340f7a3ec0204eeaf4532e5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:42:16 2006 +0100 ole32: Fix the algorithm used in CompositeMonikerImpl_Hash to match native. --- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/tests/moniker.c | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 99ffd3c..0646797 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -622,7 +622,7 @@ CompositeMonikerImpl_Hash(IMoniker* ifac res = IMoniker_Hash(tempMk, &tempHash); if(FAILED(res)) break; - *pdwHash = (*pdwHash * 37) + tempHash; + *pdwHash = *pdwHash ^ tempHash; IMoniker_Release(tempMk); } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8ae5c40..aaff209 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -657,11 +657,9 @@ static void test_generic_composite_monik hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - todo_wine { ok(hash == 0xd87, "Hash value != 0xd87, instead was 0x%08lx\n", hash); - } /* IsSystemMoniker test */

1 0

Robert Shearman : ole32: Fix the algorithm used in ItemMonikerImpl_Hash to match native.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: e97709ff6da534c1050ca346471f50eb0a9a902e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e97709ff6da534c1050ca34… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:41:58 2006 +0100 ole32: Fix the algorithm used in ItemMonikerImpl_Hash to match native. --- dlls/ole32/itemmoniker.c | 17 ++++------------- dlls/ole32/tests/moniker.c | 1 - 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index d812df5..d8ec893 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -661,8 +661,8 @@ HRESULT WINAPI ItemMonikerImpl_IsEqual(I HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { ItemMonikerImpl *This = (ItemMonikerImpl *)iface; - - int h = 0,i,skip,len; + DWORD h = 0; + int i,len; int off = 0; LPOLESTR val; @@ -672,17 +672,8 @@ HRESULT WINAPI ItemMonikerImpl_Hash(IMon val = This->itemName; len = lstrlenW(val); - if (len < 16) { - for (i = len ; i > 0; i--) { - h = (h * 37) + val[off++]; - } - } else { - /* only sample some characters */ - skip = len / 8; - for (i = len ; i > 0; i -= skip, off += skip) { - h = (h * 39) + val[off]; - } - } + for (i = len ; i > 0; i--) + h = (h * 3) ^ toupperW(val[off++]); *pdwHash=h; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 07e6b96..8ae5c40 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -570,7 +570,6 @@ static void test_item_moniker(void) hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - todo_wine ok(hash == 0x73c, "Hash value != 0x73c, instead was 0x%08lx\n", hash);

1 0

Robert Shearman : ole32: Add a class factory for composite monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: caefc340844e30e90f64013a22a31b832a8ddb62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=caefc340844e30e90f64013… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:41:06 2006 +0100 ole32: Add a class factory for composite monikers. --- dlls/ole32/compositemoniker.c | 69 ++++++++++++++++++++++++++++++++++++++++- dlls/ole32/moniker.h | 2 + dlls/ole32/oleproxy.c | 2 + 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index c8f1dfa..99ffd3c 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -37,7 +37,7 @@ #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -static const CLSID CLSID_CompositeMoniker = { +const CLSID CLSID_CompositeMoniker = { 0x309, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} }; @@ -1944,3 +1944,70 @@ MonikerCommonPrefixWith(IMoniker* pmkThi FIXME("(),stub!\n"); return E_NOTIMPL; } + +static HRESULT WINAPI CompositeMonikerCF_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 CompositeMonikerCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI CompositeMonikerCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI CompositeMonikerCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + CompositeMonikerImpl* newCompositeMoniker; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CompositeMonikerImpl_Construct(&newCompositeMoniker, NULL, NULL); + + if (SUCCEEDED(hr)) + hr = CompositeMonikerImpl_QueryInterface((IMoniker*)newCompositeMoniker, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(),0,newCompositeMoniker); + + return hr; +} + +static HRESULT WINAPI CompositeMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl CompositeMonikerCFVtbl = +{ + CompositeMonikerCF_QueryInterface, + CompositeMonikerCF_AddRef, + CompositeMonikerCF_Release, + CompositeMonikerCF_CreateInstance, + CompositeMonikerCF_LockServer +}; +static const IClassFactoryVtbl *CompositeMonikerCF = &CompositeMonikerCFVtbl; + +HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&CompositeMonikerCF, riid, ppv); +} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index e36dc0f..d35f87b 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -4,10 +4,12 @@ #define __WINE_MONIKER_H__ extern const CLSID CLSID_FileMoniker; extern const CLSID CLSID_ItemMoniker; extern const CLSID CLSID_AntiMoniker; +extern const CLSID CLSID_CompositeMoniker; HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); +HRESULT CompositeMonikerCF_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 6e9aaf8..8dc4ffb 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -1016,6 +1016,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI return ItemMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) return AntiMonikerCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) + return CompositeMonikerCF_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: Add tests for generic composite monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: b011a2ba8f37cc170ba185943aeeed5edf2863e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b011a2ba8f37cc170ba1859… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:41:18 2006 +0100 ole32: Add tests for generic composite monikers. --- dlls/ole32/tests/moniker.c | 140 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 124 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index cf14250..07e6b96 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -22,6 +22,7 @@ #define _WIN32_DCOM #define COBJMACROS #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -242,6 +243,58 @@ static const BYTE expected_anti_moniker_ 0x01,0x00,0x00,0x00, }; +static const BYTE expected_gc_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, + 0x09,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x2c,0x01,0x00,0x00, + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00,0x21,0x00,0x05,0x00, + 0x00,0x00,0x54,0x65,0x73,0x74,0x00,0x4d, + 0x45,0x4f,0x57,0x04,0x00,0x00,0x00,0x0f, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0, + 0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x04, + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xc0, + 0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x00, + 0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x02, + 0x00,0x00,0x00,0x23,0x00,0x05,0x00,0x00, + 0x00,0x57,0x69,0x6e,0x65,0x00, +}; + +static const BYTE expected_gc_moniker_saved_data[] = +{ + 0x02,0x00,0x00,0x00,0x04,0x03,0x00,0x00, + 0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00, + 0x00,0x00,0x00,0x46,0x02,0x00,0x00,0x00, + 0x21,0x00,0x05,0x00,0x00,0x00,0x54,0x65, + 0x73,0x74,0x00,0x04,0x03,0x00,0x00,0x00, + 0x00,0x00,0x00,0xc0,0x00,0x00,0x00,0x00, + 0x00,0x00,0x46,0x02,0x00,0x00,0x00,0x23, + 0x00,0x05,0x00,0x00,0x00,0x57,0x69,0x6e, + 0x65,0x00, +}; + +static const BYTE expected_gc_moniker_comparison_data[] = +{ + 0x09,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x21,0x00,0x54,0x00,0x45,0x00,0x53,0x00, + 0x54,0x00,0x00,0x00,0x04,0x03,0x00,0x00, + 0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00, + 0x00,0x00,0x00,0x46,0x23,0x00,0x57,0x00, + 0x49,0x00,0x4e,0x00,0x45,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, @@ -288,11 +341,11 @@ static void test_moniker( { for (i = 0; i < moniker_size; i++) { - if (i % 8 == 0) trace(" "); - trace("0x%02x,", buffer[i]); - if (i % 8 == 7) trace("\n"); + if (i % 8 == 0) printf(" "); + printf("0x%02x,", buffer[i]); + if (i % 8 == 7) printf("\n"); } - trace("\n"); + printf("\n"); } IROTData_Release(rotdata); @@ -331,11 +384,11 @@ static void test_moniker( { for (i = 0; i < moniker_size; i++) { - if (i % 8 == 0) trace(" "); - trace("0x%02x,", moniker_data[i]); - if (i % 8 == 7) trace("\n"); + if (i % 8 == 0) printf(" "); + printf("0x%02x,", moniker_data[i]); + if (i % 8 == 7) printf("\n"); } - trace("\n"); + printf("\n"); } GlobalUnlock(hglobal); @@ -363,12 +416,15 @@ static void test_moniker( testname, sizeof_expected_moniker_marshal_data, moniker_size); /* then do a byte-by-byte comparison */ - for (i = 0; i < min(moniker_size, sizeof_expected_moniker_marshal_data); i++) + if (expected_moniker_marshal_data) { - if (expected_moniker_marshal_data[i] != moniker_data[i]) + for (i = 0; i < min(moniker_size, sizeof_expected_moniker_marshal_data); i++) { - same = FALSE; - break; + if (expected_moniker_marshal_data[i] != moniker_data[i]) + { + same = FALSE; + break; + } } } @@ -377,11 +433,11 @@ static void test_moniker( { for (i = 0; i < moniker_size; i++) { - if (i % 8 == 0) trace(" "); - trace("0x%02x,", moniker_data[i]); - if (i % 8 == 7) trace("\n"); + if (i % 8 == 0) printf(" "); + printf("0x%02x,", moniker_data[i]); + if (i % 8 == 7) printf("\n"); } - trace("\n"); + printf("\n"); } GlobalUnlock(hglobal); @@ -569,6 +625,57 @@ static void test_anti_moniker(void) IMoniker_Release(moniker); } +static void test_generic_composite_moniker(void) +{ + HRESULT hr; + IMoniker *moniker; + IMoniker *moniker1; + IMoniker *moniker2; + DWORD moniker_type; + DWORD hash; + static const WCHAR wszDelimeter1[] = {'!',0}; + static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; + static const WCHAR wszDelimeter2[] = {'#',0}; + static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; + + hr = CreateItemMoniker(wszDelimeter1, wszObjectName1, &moniker1); + ok_ole_success(hr, CreateItemMoniker); + hr = CreateItemMoniker(wszDelimeter2, wszObjectName2, &moniker2); + ok_ole_success(hr, CreateItemMoniker); + hr = CreateGenericComposite(moniker1, moniker2, &moniker); + ok_ole_success(hr, CreateGenericComposite); + + /* FIXME: marshal data test commented out as the written custom marshal + * size in the OBJREF header doesn't match in ours and native don't match, + * probably due to a bug in Microsoft's implementation. */ + test_moniker("generic composite moniker", moniker, + NULL /*expected_gc_moniker_marshal_data*/, sizeof(expected_gc_moniker_marshal_data), + expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), + expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data)); + + /* Hashing */ + + hr = IMoniker_Hash(moniker, &hash); + ok_ole_success(hr, IMoniker_Hash); + + todo_wine { + ok(hash == 0xd87, + "Hash value != 0xd87, instead was 0x%08lx\n", + hash); + } + + /* IsSystemMoniker test */ + + hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); + ok_ole_success(hr, IMoniker_IsSystemMoniker); + + ok(moniker_type == MKSYS_GENERICCOMPOSITE, + "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx", + moniker_type); + + IMoniker_Release(moniker); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -578,6 +685,7 @@ START_TEST(moniker) test_file_monikers(); test_item_moniker(); test_anti_moniker(); + test_generic_composite_moniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Robert Shearman : ole32: Allocate memory for the generic composite moniker in CompositeMonikerImpl_Construct .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: fa8472c35afdf805d654f4801f0e1baa62c95ee6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa8472c35afdf805d654f48… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:40:52 2006 +0100 ole32: Allocate memory for the generic composite moniker in CompositeMonikerImpl_Construct. Don't leak memory in the case of newCompositeMoniker->tabLastIndex == 1, which can't happen anyway. Allow construction of a moniker with no sub-monikers. --- dlls/ole32/compositemoniker.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 2673fda..c8f1dfa 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1746,13 +1746,19 @@ static const IMarshalVtbl VT_MarshalImpl * Composite-Moniker_Construct (local function) *******************************************************************************/ static HRESULT -CompositeMonikerImpl_Construct(CompositeMonikerImpl* This, +CompositeMonikerImpl_Construct(CompositeMonikerImpl** ppThis, LPMONIKER pmkFirst, LPMONIKER pmkRest) { DWORD mkSys; IEnumMoniker *enumMoniker; IMoniker *tempMk; HRESULT res; + CompositeMonikerImpl *This; + + *ppThis = This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + + if (!This) + return E_OUTOFMEMORY; TRACE("(%p,%p,%p)\n",This,pmkFirst,pmkRest); @@ -1769,6 +1775,9 @@ CompositeMonikerImpl_Construct(Composite if (This->tabMoniker==NULL) return E_OUTOFMEMORY; + if (!pmkFirst && !pmkRest) + return S_OK; + IMoniker_IsSystemMoniker(pmkFirst,&mkSys); /* put the first moniker contents in the beginning of the table */ @@ -1918,26 +1927,12 @@ CreateGenericComposite(LPMONIKER pmkFirs else if (pmkFirst==NULL && pmkRest==NULL) return S_OK; - newCompositeMoniker = HeapAlloc(GetProcessHeap(), 0,sizeof(CompositeMonikerImpl)); - - if (newCompositeMoniker == 0) - return STG_E_INSUFFICIENTMEMORY; - - hr = CompositeMonikerImpl_Construct(newCompositeMoniker,pmkFirst,pmkRest); - - if (FAILED(hr)){ + hr = CompositeMonikerImpl_Construct(&newCompositeMoniker,pmkFirst,pmkRest); - HeapFree(GetProcessHeap(),0,newCompositeMoniker); + if (FAILED(hr)) return hr; - } - if (newCompositeMoniker->tabLastIndex==1) - - hr = IMoniker_QueryInterface(newCompositeMoniker->tabMoniker[0],&IID_IMoniker,(void**)ppmkComposite); - else - - hr = IMoniker_QueryInterface((IMoniker*)newCompositeMoniker,&IID_IMoniker,(void**)ppmkComposite); - return hr; + return IMoniker_QueryInterface((IMoniker*)newCompositeMoniker,&IID_IMoniker,(void**)ppmkComposite); } /******************************************************************************

1 0

Robert Shearman : ole32: Implement IMarshal for composite monikers.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 9e799f2054fc924f596d69ae091b3cf386d0a5bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e799f2054fc924f596d69a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:38:55 2006 +0100 ole32: Implement IMarshal for composite monikers. --- dlls/ole32/compositemoniker.c | 195 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 5096d0d..2673fda 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -54,6 +54,8 @@ typedef struct CompositeMonikerImpl{ */ const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ + const IMarshalVtbl* lpvtblMarshal; /* VTable relative to the IMarshal interface.*/ + LONG ref; /* reference counter for this object */ IMoniker** tabMoniker; /* dynamaic table containing all components (monikers) of this composite moniker */ @@ -85,6 +87,11 @@ static inline IMoniker *impl_from_IROTDa return (IMoniker *)((char*)iface - FIELD_OFFSET(CompositeMonikerImpl, lpvtbl2)); } +static inline IMoniker *impl_from_IMarshal( IMarshal *iface ) +{ + return (IMoniker *)((char*)iface - FIELD_OFFSET(CompositeMonikerImpl, lpvtblMarshal)); +} + static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tabSize,ULONG currentPos,BOOL leftToRigth,IEnumMoniker ** ppmk); /******************************************************************************* @@ -113,6 +120,8 @@ CompositeMonikerImpl_QueryInterface(IMon *ppvObject = iface; else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = (IROTData*)&(This->lpvtbl2); + else if (IsEqualIID(&IID_IMarshal, riid)) + *ppvObject = (IROTData*)&(This->lpvtblMarshal); /* Check that we obtained an interface.*/ if ((*ppvObject)==0) @@ -1307,6 +1316,178 @@ CompositeMonikerROTDataImpl_GetCompariso return S_OK; } +static HRESULT WINAPI CompositeMonikerMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) +{ + IMoniker *This = impl_from_IMarshal(iface); + + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppv); + + return CompositeMonikerImpl_QueryInterface(This, riid, ppv); +} + +static ULONG WINAPI CompositeMonikerMarshalImpl_AddRef(IMarshal *iface) +{ + IMoniker *This = impl_from_IMarshal(iface); + + TRACE("(%p)\n",iface); + + return CompositeMonikerImpl_AddRef(This); +} + +static ULONG WINAPI CompositeMonikerMarshalImpl_Release(IMarshal *iface) +{ + IMoniker *This = impl_from_IMarshal(iface); + + TRACE("(%p)\n",iface); + + return CompositeMonikerImpl_Release(This); +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_GetUnmarshalClass( + LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, CLSID* pCid) +{ + IMoniker *This = impl_from_IMarshal(iface); + + TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags, pCid); + + return IMoniker_GetClassID(This, pCid); +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_GetMarshalSizeMax( + LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, DWORD* pSize) +{ + IMoniker *This = impl_from_IMarshal(iface); + IEnumMoniker *pEnumMk; + IMoniker *pmk; + HRESULT hr; + ULARGE_INTEGER size; + + TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags, pSize); + + *pSize = 0; + + hr = IMoniker_Enum(This, TRUE, &pEnumMk); + if (FAILED(hr)) return hr; + + hr = IMoniker_GetSizeMax(This, &size); + + while (IEnumMoniker_Next(pEnumMk, 1, &pmk, NULL) == S_OK) + { + ULONG size; + + hr = CoGetMarshalSizeMax(&size, &IID_IMoniker, (IUnknown *)pmk, dwDestContext, pvDestContext, mshlflags); + if (SUCCEEDED(hr)) + *pSize += size; + + IMoniker_Release(pmk); + + if (FAILED(hr)) + { + IEnumMoniker_Release(pEnumMk); + return hr; + } + } + + IEnumMoniker_Release(pEnumMk); + + return S_OK; +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_MarshalInterface(LPMARSHAL iface, IStream *pStm, + REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags) +{ + IMoniker *This = impl_from_IMarshal(iface); + IEnumMoniker *pEnumMk; + IMoniker *pmk; + HRESULT hr; + ULONG i = 0; + + TRACE("(%p, %s, %p, %lx, %p, %lx)\n", pStm, debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags); + + hr = IMoniker_Enum(This, TRUE, &pEnumMk); + if (FAILED(hr)) return hr; + + while (IEnumMoniker_Next(pEnumMk, 1, &pmk, NULL) == S_OK) + { + hr = CoMarshalInterface(pStm, &IID_IMoniker, (IUnknown *)pmk, dwDestContext, pvDestContext, mshlflags); + + IMoniker_Release(pmk); + + if (FAILED(hr)) + { + IEnumMoniker_Release(pEnumMk); + return hr; + } + i++; + } + + if (i != 2) + FIXME("moniker count of %ld not supported\n", i); + + IEnumMoniker_Release(pEnumMk); + + return S_OK; +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv) +{ + CompositeMonikerImpl *This = (CompositeMonikerImpl *)impl_from_IMarshal(iface); + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); + + CompositeMonikerImpl_ReleaseMonikersInTable(This); + + /* resize the table if needed */ + if (This->tabLastIndex + 2 > This->tabSize) + { + This->tabSize += max(BLOCK_TAB_SIZE, 2); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + + if (This->tabMoniker==NULL) + return E_OUTOFMEMORY; + } + + hr = CoUnmarshalInterface(pStm, &IID_IMoniker, (void**)&This->tabMoniker[This->tabLastIndex]); + if (FAILED(hr)) + { + ERR("couldn't unmarshal moniker, hr = 0x%08lx\n", hr); + return hr; + } + This->tabLastIndex++; + hr = CoUnmarshalInterface(pStm, &IID_IMoniker, (void**)&This->tabMoniker[This->tabLastIndex]); + if (FAILED(hr)) + { + ERR("couldn't unmarshal moniker, hr = 0x%08lx\n", hr); + return hr; + } + This->tabLastIndex++; + + return IMoniker_QueryInterface((IMoniker *)&This->lpvtbl1, riid, ppv); +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) +{ + TRACE("(%p)\n", pStm); + /* can't release a state-based marshal as nothing on server side to + * release */ + return S_OK; +} + +static HRESULT WINAPI CompositeMonikerMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved) +{ + TRACE("(0x%lx)\n", dwReserved); + /* can't disconnect a state-based marshal as nothing on server side to + * disconnect from */ + return S_OK; +} + /****************************************************************************** * EnumMonikerImpl_QueryInterface ******************************************************************************/ @@ -1548,6 +1729,19 @@ static const IROTDataVtbl VT_ROTDataImpl CompositeMonikerROTDataImpl_GetComparisonData }; +static const IMarshalVtbl VT_MarshalImpl = +{ + CompositeMonikerMarshalImpl_QueryInterface, + CompositeMonikerMarshalImpl_AddRef, + CompositeMonikerMarshalImpl_Release, + CompositeMonikerMarshalImpl_GetUnmarshalClass, + CompositeMonikerMarshalImpl_GetMarshalSizeMax, + CompositeMonikerMarshalImpl_MarshalInterface, + CompositeMonikerMarshalImpl_UnmarshalInterface, + CompositeMonikerMarshalImpl_ReleaseMarshalData, + CompositeMonikerMarshalImpl_DisconnectObject +}; + /****************************************************************************** * Composite-Moniker_Construct (local function) *******************************************************************************/ @@ -1565,6 +1759,7 @@ CompositeMonikerImpl_Construct(Composite /* Initialize the virtual function table. */ This->lpvtbl1 = &VT_CompositeMonikerImpl; This->lpvtbl2 = &VT_ROTDataImpl; + This->lpvtblMarshal= &VT_MarshalImpl; This->ref = 0; This->tabSize=BLOCK_TAB_SIZE;

1 0