October 2015 - Wine-Commits

Nikolay Sivov : msxml3/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 121b859fc5ef4dc479bfd4cb496d97233975ee81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121b859fc5ef4dc479bfd4cb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:57:53 2015 +0300 msxml3/tests: Add missing return value test (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1afc894..b563a80 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8977,6 +8977,7 @@ static void test_get_doctype(void) ok(doctype == NULL, "got %p\n", doctype); hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); doctype = NULL;

1 0

Alexandre Julliard : tools: Move winemaker to its own directory.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: e619a15ac13a7fafe5e7d024c69256b8cb6458a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e619a15ac13a7fafe5e7d024c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 19:47:24 2015 +0900 tools: Move winemaker to its own directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- tools/Makefile.in | 13 ------------- tools/winemaker/Makefile.in | 12 ++++++++++++ tools/{ => winemaker}/winemaker | 0 tools/{ => winemaker}/winemaker.de.UTF-8.man.in | 0 tools/{ => winemaker}/winemaker.fr.UTF-8.man.in | 0 tools/{ => winemaker}/winemaker.man.in | 0 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/configure b/configure index fd09324..534afff 100755 --- a/configure +++ b/configure @@ -18151,12 +18151,13 @@ wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage -wine_fn_config_tool tools clean,install-dev,manpage +wine_fn_config_tool tools clean wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage wine_fn_config_tool tools/winedump clean,install-dev,manpage wine_fn_config_tool tools/winegcc clean,install-dev,manpage +wine_fn_config_tool tools/winemaker install-dev,manpage wine_fn_config_tool tools/wmc clean,install-dev,manpage wine_fn_config_tool tools/wrc clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index 3180407..cdc68fe 100644 --- a/configure.ac +++ b/configure.ac @@ -3600,12 +3600,13 @@ WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) -WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools,[clean]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage]) WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage]) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2ed8179..bc13cc9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,11 +1,6 @@ PROGRAMS = \ make_xftmpl -MANPAGES = \ - winemaker.de.UTF-8.man.in \ - winemaker.fr.UTF-8.man.in \ - winemaker.man.in - C_SRCS = \ make_xftmpl.c @@ -13,11 +8,3 @@ IN_SRCS = \ wineapploader.in all: wineapploader - -.PHONY: install install-dev uninstall - -install install-dev:: install-man-pages - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in new file mode 100644 index 0000000..7095ecf --- /dev/null +++ b/tools/winemaker/Makefile.in @@ -0,0 +1,12 @@ +MANPAGES = \ + winemaker.de.UTF-8.man.in \ + winemaker.fr.UTF-8.man.in \ + winemaker.man.in + +.PHONY: install install-dev uninstall + +install install-dev:: install-man-pages + $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker + +uninstall:: + $(RM) $(DESTDIR)$(bindir)/winemaker diff --git a/tools/winemaker b/tools/winemaker/winemaker similarity index 100% rename from tools/winemaker rename to tools/winemaker/winemaker diff --git a/tools/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in similarity index 100% rename from tools/winemaker.de.UTF-8.man.in rename to tools/winemaker/winemaker.de.UTF-8.man.in diff --git a/tools/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in similarity index 100% rename from tools/winemaker.fr.UTF-8.man.in rename to tools/winemaker/winemaker.fr.UTF-8.man.in diff --git a/tools/winemaker.man.in b/tools/winemaker/winemaker.man.in similarity index 100% rename from tools/winemaker.man.in rename to tools/winemaker/winemaker.man.in

1 0

Nikolay Sivov : dwrite: Use dpiX/ dpiY argument in GetRecommendedRenderingMode().
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: ce6f6f7421ad0152355ef243a891ba3612781ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6f6f7421ad0152355ef243a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:42:10 2015 +0300 dwrite: Use dpiX/dpiY argument in GetRecommendedRenderingMode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ dlls/dwrite/tests/font.c | 80 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b71d492..22de471 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1068,6 +1068,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac if (is_sideways) FIXME("sideways mode not supported\n"); + emSize *= max(dpiX, dpiY) / 96.0f; + *renderingmode = DWRITE_RENDERING_MODE_DEFAULT; *gridfitmode = DWRITE_GRID_FIT_MODE_DEFAULT; if (params) { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ae45e8b..8ec4f84 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4439,12 +4439,11 @@ if (0) /* crashes on native */ for (emsize = 1.0; emsize < 500.0; emsize += 1.0) { DWRITE_RENDERING_MODE expected; + FLOAT ppdip; WORD gasp; int i; for (i = 0; i < sizeof(recmode_tests)/sizeof(recmode_tests[0]); i++) { - FLOAT ppdip; - ppdip = 1.0f; mode = 10; gasp = get_gasp_flags(fontface, emsize, ppdip); @@ -4487,12 +4486,82 @@ if (0) /* crashes on native */ /* IDWriteFontFace1 offers another variant of this method */ if (fontface1) { for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) { + FLOAT dpi; + + ppdip = 1.0f; + dpi = 96.0f * ppdip; mode = 10; - expected = get_expected_rendering_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); - hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, 96.0, 96.0, + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, flags 0x%04x, expected %d\n", emsize, i, mode, gasp, expected); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; + Win8 and Win10 handle this as expected. */ + if (emsize > 20.0f) { + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 0.5f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + /* try different dpis for X and Y direction */ + ppdip = 1.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 1.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + } } } @@ -4500,6 +4569,7 @@ if (0) /* crashes on native */ if (fontface2) { DWRITE_GRID_FIT_MODE gridfit, expected_gridfit; + gasp = get_gasp_flags(fontface, emsize, 1.0f); for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) { mode = 10; expected = get_expected_rendering_mode(emsize, gasp, recmode_tests1[0].measuring, recmode_tests1[0].threshold);

1 0

Huw Davies : ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 6aa797e66999780c306165d03a41e5061a12e9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa797e66999780c306165d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:31 2015 +0000 ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 32 ++++++++++++++++++++++++-------- dlls/ole32/usrmarshal.c | 4 ++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 23cb910..756e820 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -563,13 +563,14 @@ static const IStreamVtbl TestStream_Vtbl = }; static TestUnknown Test_Unknown = { {&TestUnknown_Vtbl}, 1 }; +static TestUnknown Test_Unknown2 = { {&TestUnknown_Vtbl}, 1 }; static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); -static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) +static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx, BOOL client, BOOL in, BOOL out) { USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; @@ -638,11 +639,17 @@ todo_wine CoReleaseMarshalData(stm); IStream_Release(stm); - unk2 = NULL; + Test_Unknown2.refs = 1; + unk2 = &Test_Unknown2.IUnknown_iface; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); + umcb.pStubMsg->IsClient = client; + umcb.pStubMsg->fIsIn = in; + umcb.pStubMsg->fIsOut = out; + WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); + ok(Test_Unknown2.refs == 0, "got %d\n", Test_Unknown2.refs); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); IUnknown_Release(unk2); @@ -657,14 +664,23 @@ static void test_marshal_WdtpInterfacePointer(void) */ /* All three are marshalled as inproc */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC, 0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff),0,0,0); /* All three are marshalled as remote */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff),0,0,0); + + /* Test different combinations of client, in and out */ + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,1); } static void test_marshal_STGMEDIUM(void) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index fe8ff4f..3184be6 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1490,6 +1490,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne IStream *stm; DWORD size; void *ptr; + IUnknown *orig; TRACE("(%s, %p, %p, %s)\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); @@ -1517,11 +1518,14 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne memcpy(ptr, pBuffer, size); GlobalUnlock(h); + orig = *ppunk; hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); IStream_Release(stm); if(hr != S_OK) RaiseException(hr, 0, 0, NULL); + if(orig) IUnknown_Release(orig); + return pBuffer + size; }

1 0

Huw Davies : ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: ced5800b99d3251f372102bd23fb25df15debc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced5800b99d3251f372102bd2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:33 2015 +0000 ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr. However, this should not be done in the case of pUnkForRelease. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 116 +++++++++++++++++++++++++++++++++++++----- dlls/ole32/usrmarshal.c | 9 +++- 2 files changed, 111 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ced5800b99d3251f37210…

1 0

Huw Davies : ole32: Fix ref counting in GetDataHere Proxy.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 28b916b26eceb35a071e9aad76da1fbbaa857ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b916b26eceb35a071e9aad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:34 2015 +0000 ole32: Fix ref counting in GetDataHere Proxy. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 236 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/usrmarshal.c | 38 +++++-- 2 files changed, 267 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index c68689c..529ad75 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -85,6 +85,91 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, umcb->CBType = buffer ? USER_MARSHAL_CB_UNMARSHALL : USER_MARSHAL_CB_BUFFER_SIZE; } +#define RELEASEMARSHALDATA WM_USER + +struct host_object_data +{ + IStream *stream; + IID iid; + IUnknown *object; + MSHLFLAGS marshal_flags; + HANDLE marshal_event; + IMessageFilter *filter; +}; + +static DWORD CALLBACK host_object_proc(LPVOID p) +{ + struct host_object_data *data = p; + HRESULT hr; + MSG msg; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + if (data->filter) + { + IMessageFilter * prev_filter = NULL; + hr = CoRegisterMessageFilter(data->filter, &prev_filter); + if (prev_filter) IMessageFilter_Release(prev_filter); + ok(hr == S_OK, "got %08x\n", hr); + } + + hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + ok(hr == S_OK, "got %08x\n", hr); + + /* force the message queue to be created before signaling parent thread */ + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(data->marshal_event); + + while (GetMessageA(&msg, NULL, 0, 0)) + { + if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) + { + CoReleaseMarshalData(data->stream); + SetEvent((HANDLE)msg.lParam); + } + else + DispatchMessageA(&msg); + } + + HeapFree(GetProcessHeap(), 0, data); + + CoUninitialize(); + + return hr; +} + +static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) +{ + DWORD tid = 0; + HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); + struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + + data->stream = stream; + data->iid = *riid; + data->object = object; + data->marshal_flags = marshal_flags; + data->marshal_event = marshal_event; + data->filter = filter; + + *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); + + /* wait for marshaling to complete before returning */ + ok( !WaitForSingleObject(marshal_event, 10000), "wait timed out\n" ); + CloseHandle(marshal_event); + + return tid; +} + +static void end_host_object(DWORD tid, HANDLE thread) +{ + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); + ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + /* be careful of races - don't return until hosting thread has terminated */ + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + static const char cf_marshaled[] = { 0x9, 0x0, 0x0, 0x0, @@ -1105,9 +1190,156 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +struct obj +{ + IDataObject IDataObject_iface; +}; + +static HRESULT WINAPI obj_QueryInterface(IDataObject *iface, REFIID iid, void **obj) +{ + *obj = NULL; + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IDataObject)) + *obj = iface; + + if (*obj) + { + IDataObject_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI obj_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI obj_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI obj_DO_GetDataHere(IDataObject *iface, FORMATETC *fmt, + STGMEDIUM *med) +{ + ok( med->pUnkForRelease == NULL, "got %p\n", med->pUnkForRelease ); + + if (fmt->cfFormat == 2) + { + IStream_Release(U(med)->pstm); + U(med)->pstm = &Test_Stream2.IStream_iface; + } + + return S_OK; +} + +static const IDataObjectVtbl obj_data_object_vtbl = +{ + obj_QueryInterface, + obj_AddRef, + obj_Release, + NULL, /* GetData */ + obj_DO_GetDataHere, + NULL, /* QueryGetData */ + NULL, /* GetCanonicalFormatEtc */ + NULL, /* SetData */ + NULL, /* EnumFormatEtc */ + NULL, /* DAdvise */ + NULL, /* DUnadvise */ + NULL /* EnumDAdvise */ +}; + +static struct obj obj = +{ + {&obj_data_object_vtbl} +}; + +static void test_GetDataHere_Proxy(void) +{ + HRESULT hr; + IStream *stm; + HANDLE thread; + DWORD tid; + static const LARGE_INTEGER zero; + IDataObject *data; + FORMATETC fmt; + STGMEDIUM med; + + hr = CreateStreamOnHGlobal( NULL, TRUE, &stm ); + ok( hr == S_OK, "got %08x\n", hr ); + tid = start_host_object2( stm, &IID_IDataObject, (IUnknown *)&obj.IDataObject_iface, MSHLFLAGS_NORMAL, NULL, &thread ); + + IStream_Seek( stm, zero, STREAM_SEEK_SET, NULL ); + hr = CoUnmarshalInterface( stm, &IID_IDataObject, (void **)&data ); + ok( hr == S_OK, "got %08x\n", hr ); + IStream_Release( stm ); + + Test_Stream.refs = 1; + Test_Stream2.refs = 1; + Test_Unknown.refs = 1; + + fmt.cfFormat = 1; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + U(med).pstm = NULL; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + fmt.tymed = med.tymed = TYMED_NULL; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + for (fmt.tymed = TYMED_HGLOBAL; fmt.tymed <= TYMED_ENHMF; fmt.tymed <<= 1) + { + med.tymed = fmt.tymed; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == (fmt.tymed <= TYMED_ISTORAGE ? S_OK : DV_E_TYMED), "got %08x for tymed %d\n", hr, fmt.tymed ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + } + + fmt.tymed = TYMED_ISTREAM; + med.tymed = TYMED_ISTORAGE; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + + fmt.cfFormat = 2; + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + ok( Test_Stream2.refs == 0, "got %d\n", Test_Stream2.refs ); + + IDataObject_Release( data ); + end_host_object( tid, thread ); +} + START_TEST(usrmarshal) { - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_marshal_CLIPFORMAT(); test_marshal_HWND(); @@ -1122,5 +1354,7 @@ START_TEST(usrmarshal) test_marshal_HICON(); test_marshal_HBRUSH(); + test_GetDataHere_Proxy(); + CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 1a3f6af..89d0675 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2783,13 +2783,39 @@ HRESULT __RPC_STUB IDataObject_GetData_Stub( return IDataObject_GetData(This, pformatetcIn, pRemoteMedium); } -HRESULT CALLBACK IDataObject_GetDataHere_Proxy( - IDataObject* This, - FORMATETC *pformatetc, - STGMEDIUM *pmedium) +HRESULT CALLBACK IDataObject_GetDataHere_Proxy(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med) { - TRACE("(%p)->(%p, %p)\n", This, pformatetc, pmedium); - return IDataObject_RemoteGetDataHere_Proxy(This, pformatetc, pmedium); + IUnknown *release; + IStorage *stg = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", iface, fmt, med); + + if ((med->tymed & (TYMED_HGLOBAL | TYMED_FILE | TYMED_ISTREAM | TYMED_ISTORAGE)) == 0) + return DV_E_TYMED; + if (med->tymed != fmt->tymed) + return DV_E_TYMED; + + release = med->pUnkForRelease; + med->pUnkForRelease = NULL; + + if (med->tymed == TYMED_ISTREAM || med->tymed == TYMED_ISTORAGE) + { + stg = med->u.pstg; /* This may actually be a stream, but that's ok */ + if (stg) IStorage_AddRef( stg ); + } + + hr = IDataObject_RemoteGetDataHere_Proxy(iface, fmt, med); + + med->pUnkForRelease = release; + if (stg) + { + if (med->u.pstg) + IStorage_Release( med->u.pstg ); + med->u.pstg = stg; + } + + return hr; } HRESULT __RPC_STUB IDataObject_GetDataHere_Stub(

1 0

Nikolay Sivov : prntvpt: Remove export ordinals.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 24fff52c8f32941a62ca0076414b585025062057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fff52c8f32941a62ca00764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:18 2015 +0300 prntvpt: Remove export ordinals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/prntvpt.spec | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 2f20d3c..246443e 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,27 +1,27 @@ -1 stdcall PTQuerySchemaVersionSupport(wstr ptr) -2 stub PTOpenProvider -3 stub PTOpenProviderEx -4 stub PTCloseProvider -5 stub BindPTProviderThunk -6 stub PTGetPrintCapabilities -7 stub PTMergeAndValidatePrintTicket -8 stub PTConvertPrintTicketToDevMode -9 stub PTConvertDevModeToPrintTicket -10 stub PTReleaseMemory -11 stub ConvertDevModeToPrintTicketThunk2 -12 stub ConvertDevModeToPrintTicketThunk -13 stub ConvertPrintTicketToDevModeThunk2 -14 stub ConvertPrintTicketToDevModeThunk -15 stub DllCanUnloadNow -16 stub DllGetClassObject -17 stdcall -private DllMain(long long ptr) -18 stub DllRegisterServer -19 stub DllUnregisterServer -20 stub GetDeviceDefaultPrintTicketThunk -21 stub GetDeviceNamespacesThunk -22 stub GetPrintCapabilitiesThunk2 -23 stub GetPrintCapabilitiesThunk -24 stub GetSchemaVersionThunk -25 stub MergeAndValidatePrintTicketThunk2 -26 stub MergeAndValidatePrintTicketThunk -27 stub UnbindPTProviderThunk +@ stdcall PTQuerySchemaVersionSupport(wstr ptr) +@ stub PTOpenProvider +@ stub PTOpenProviderEx +@ stub PTCloseProvider +@ stub BindPTProviderThunk +@ stub PTGetPrintCapabilities +@ stub PTMergeAndValidatePrintTicket +@ stub PTConvertPrintTicketToDevMode +@ stub PTConvertDevModeToPrintTicket +@ stub PTReleaseMemory +@ stub ConvertDevModeToPrintTicketThunk2 +@ stub ConvertDevModeToPrintTicketThunk +@ stub ConvertPrintTicketToDevModeThunk2 +@ stub ConvertPrintTicketToDevModeThunk +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllMain(long long ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub GetDeviceDefaultPrintTicketThunk +@ stub GetDeviceNamespacesThunk +@ stub GetPrintCapabilitiesThunk2 +@ stub GetPrintCapabilitiesThunk +@ stub GetSchemaVersionThunk +@ stub MergeAndValidatePrintTicketThunk2 +@ stub MergeAndValidatePrintTicketThunk +@ stub UnbindPTProviderThunk

1 0

Gerald Pfeifer : configure: Use the -Wshift-overflow= 2 compiler option if available.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: c4dee537c90b7011c5d406392a183be66df3569b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dee537c90b7011c5d406392… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 24 23:51:01 2015 +0200 configure: Use the -Wshift-overflow=2 compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 139a32c..fd09324 100755 --- a/configure +++ b/configure @@ -14172,6 +14172,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 +$as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } +if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wshift-overflow=2" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wshift_overflow_2=yes +else + ac_cv_cflags__Wshift_overflow_2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wshift_overflow_2" >&5 +$as_echo "$ac_cv_cflags__Wshift_overflow_2" >&6; } +if test "x$ac_cv_cflags__Wshift_overflow_2" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wshift-overflow=2" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index c4ba1a3..3180407 100644 --- a/configure.ac +++ b/configure.ac @@ -1837,6 +1837,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Nikolay Sivov : gdiplus: Added GdipBitmapConvertFormat stub.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: c820139b0f8f3099cffbdd39e5bac6cf642f018e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c820139b0f8f3099cffbdd39e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 22:07:02 2015 +0300 gdiplus: Added GdipBitmapConvertFormat stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ include/gdipluspixelformats.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index edf4e45..9f7ce5f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -620,7 +620,7 @@ 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize -623 stub GdipBitmapConvertFormat +623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0a8027a..6725de8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5268,3 +5268,13 @@ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) FIXME("(%p, %p): stub\n", image, pabort); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapConvertFormat [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format, DitherType dithertype, + PaletteType palettetype, ColorPalette *palette, REAL alphathreshold) +{ + FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); + return NotImplemented; +} diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 9922b24..2a2a3cc 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -102,4 +102,33 @@ typedef struct ColorPalette #endif /* end of c typedefs */ +typedef enum DitherType +{ + DitherTypeNone, + DitherTypeSolid, + DitherTypeOrdered4x4, + DitherTypeOrdered8x8, + DitherTypeOrdered16x16, + DitherTypeSpiral4x4, + DitherTypeSpiral8x8, + DitherTypeDualSpiral4x4, + DitherTypeDualSpiral8x8, + DitherTypeErrorDiffusion, + DitherTypeMax +} DitherType; + +typedef enum PaletteType +{ + PaletteTypeCustom, + PaletteTypeOptimal, + PaletteTypeFixedBW, + PaletteTypeFixedHalftone8, + PaletteTypeFixedHalftone27, + PaletteTypeFixedHalftone64, + PaletteTypeFixedHalftone125, + PaletteTypeFixedHalftone216, + PaletteTypeFixedHalftone252, + PaletteTypeFixedHalftone256 +} PaletteType; + #endif

1 0

Huw Davies : ole32/tests: Release the marshalled data in the expected buffers.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 9021b96772b31f54349bcae076910d2a2f2b5a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9021b96772b31f54349bcae07… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:32 2015 +0000 ole32/tests: Release the marshalled data in the expected buffers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 756e820..0ab4634 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -699,6 +699,8 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 2 * sizeof(DWORD), unk, &IID_IUnknown); expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); + *(DWORD*)expect_buffer = TYMED_NULL; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 2 * sizeof(DWORD), unk, &IID_IUnknown); @@ -735,6 +737,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); /* TYMED_ISTREAM with pUnkForRelease */ @@ -746,6 +756,9 @@ static void test_marshal_STGMEDIUM(void) expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); /* There may be a hole between the two interfaces so init the buffer to something */ memset(expect_buffer, 0xcc, expect_size); + *(DWORD*)expect_buffer = TYMED_ISTREAM; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; + *((DWORD*)expect_buffer + 2) = 0xcafe; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 3 * sizeof(DWORD), (IUnknown*)stm, &IID_IStream); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer_end, unk, &IID_IUnknown); @@ -786,6 +799,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); }

1 0