- Wine-devel - list.winehq.org

[PATCH v3 6/8] dllhost: Implement IMarshal::MarshalInterface().
by Dmitry Timoshkov 24 Feb '22

24 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index ce21aff9f8a..56722f0a647 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -153,9 +153,11 @@ static ULONG WINAPI marshal_Release(IMarshal *iface) static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + TRACE("(%p,%s,%p,%08lx,%p,%08lx,%p)\n", iface, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + + *clsid = CLSID_StdMarshal; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, @@ -169,8 +171,19 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + struct factory *factory = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + + hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); + if (hr == S_OK) + { + hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); + IUnknown_Release(object); + } + return hr; } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, -- 2.35.1

1 0

[PATCH v3 5/8] dllhost: Implement ISurrogate::FreeSurrogate().
by Dmitry Timoshkov 24 Feb '22

24 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 681a20a6bb5..ce21aff9f8a 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -210,6 +210,7 @@ struct surrogate ISurrogate ISurrogate_iface; IClassFactory *factory; DWORD cookie; + HANDLE event; LONG ref; }; @@ -273,15 +274,35 @@ static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *cl if (hr != S_OK) IClassFactory_Release(&factory->IClassFactory_iface); else + { surrogate->factory = &factory->IClassFactory_iface; + surrogate->event = CreateEventW(NULL, FALSE, FALSE, NULL); + } return hr; } static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p)\n", iface); + + if (surrogate->cookie) + { + CoRevokeClassObject(surrogate->cookie); + surrogate->cookie = 0; + } + + if (surrogate->factory) + { + IClassFactory_Release(surrogate->factory); + surrogate->factory = NULL; + } + + SetEvent(surrogate->event); + + return S_OK; } static const ISurrogateVtbl Surrogate_Vtbl = @@ -307,6 +328,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; surrogate.factory = NULL; surrogate.cookie = 0; + surrogate.event = NULL; surrogate.ref = 1; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -323,8 +345,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - /* FIXME: wait for FreeSurrogate being called */ - Sleep(INFINITE); + WaitForSingleObject(surrogate.event, INFINITE); } cleanup: -- 2.35.1

1 0

[PATCH 7/7] user32: Use NtUserGetGUIThreadInfo in GetFocus.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/focus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

2 1

[PATCH 6/7] user32: Use NtUserGetGUIThreadInfo in GetActiveWindow.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/focus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

2 1

[PATCH 5/7] win32u: Move NtUserGetGUIThreadInfo implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/focus.c | 2 +- dlls/user32/message.c | 41 +------------------------ dlls/user32/painting.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/message.c | 67 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 36 ++++++++++++++++++++++ include/ntuser.h | 1 + 12 files changed, 113 insertions(+), 45 deletions(-) create mode 100644 dlls/win32u/message.c

2 1

[PATCH 4/7] win32u: Move NtUserGetCursorInfo implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

2 1

[PATCH 3/7] win32u: Move NtUserRegisterHotKey implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

2 1

[PATCH 2/7] win32u: Move get_icon_param and set_icon_param from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 23 ++-------------- dlls/win32u/cursoricon.c | 53 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 ---------------- dlls/win32u/sysparams.c | 4 +++ dlls/win32u/win32u_private.h | 2 ++ include/ntuser.h | 2 ++ 6 files changed, 63 insertions(+), 45 deletions(-)

2 1

[PATCH 1/7] user32: Don't access cursoricon_object directly in CopyImage.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 110 +++++++++++++++------------------------ 1 file changed, 41 insertions(+), 69 deletions(-)

3 2

[PATCH v4 1/5] winegstreamer: Remove \n at the end of GST log messages.
by Zebediah Figura 24 Feb '22

24 Feb '22

From: Rémi Bernon <rbernon(a)codeweavers.com> GStreamer already adds one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d0883c4c024..e5ed496387e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1436,7 +1436,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1465,7 +1465,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1486,7 +1486,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1496,7 +1496,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1520,7 +1520,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1531,7 +1531,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1559,7 +1559,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1597,7 +1597,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; } -- 2.35.1

4 14