system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

ole32: Make the size returned by CompositeMonikerImpl_GetMarshalSizeMax match that returned by native.

Browse source
This commit is contained in:
Robert Shearman 2006-05-08 12:43:20 +01:00 committed by Alexandre Julliard
parent 50ec1d6849
commit 57b42ae7bc
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ole32/compositemoniker.c
View file

@ -1368,7 +1368,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetMarshalSizeMax(
TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv, TRACE("(%s, %p, %lx, %p, %lx, %p)\n", debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pSize); dwDestContext, pvDestContext, mshlflags, pSize);
*pSize = 0; *pSize = 0x10; /* to match native */
hr = IMoniker_Enum(This, TRUE, &pEnumMk); hr = IMoniker_Enum(This, TRUE, &pEnumMk);
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;

5
dlls/ole32/tests/moniker.c
View file

@ -644,11 +644,8 @@ static void test_generic_composite_moniker(void)
hr = CreateGenericComposite(moniker1, moniker2, &moniker); hr = CreateGenericComposite(moniker1, moniker2, &moniker);
ok_ole_success(hr, CreateGenericComposite); 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, 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_saved_data, sizeof(expected_gc_moniker_saved_data),
expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data)); expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data));