mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-18 15:18:12 +00:00
ole32: Make the size returned by CompositeMonikerImpl_GetMarshalSizeMax match that returned by native.
This commit is contained in:
parent
50ec1d6849
commit
57b42ae7bc
|
@ -1368,7 +1368,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetMarshalSizeMax(
|
|||
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;
|
||||
|
|
|
@ -644,11 +644,8 @@ static void test_generic_composite_moniker(void)
|
|||
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));
|
||||
|
||||
|
|
Loading…
Reference in a new issue