Module: wine Branch: refs/heads/master Commit: 57b42ae7bcc31437352737784846e5a7123f89d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57b42ae7bcc3143735273778... 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));