February 2022 - Wine-devel - list.winehq.org

[PATCH vkd3d] include: Clarify docs for PFN_vkd3d_shader_close_include.
by Giovanni Mascellani 24 Feb '22

24 Feb '22

Clarify the contract about memory management of the code parameter and reference callbacks by their name as fields of struct vkd3d_shader_preprocess_info rather than by their type (like it is already done above). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- include/vkd3d_shader.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1eae0bbe..5a60b374 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -787,8 +787,7 @@ typedef int (*PFN_vkd3d_shader_open_include)(const char *filename, bool local, * vkd3d_shader_preprocess_info. * * \param code Contents of the included file, which were allocated by the - * \ref PFN_vkd3d_shader_open_include callback. The source code was allocated by - * the user and thus need not be freed by vkd3d_shader_free_shader_code(). + * \ref pfn_open_include callback. The user must free them. * * \param context The user-defined pointer passed to struct * vkd3d_shader_preprocess_info. -- 2.35.1

2 1

[PATCH v2 2/8] dllhost: Add ISurrogate stub implementation.
by Dmitry Timoshkov 24 Feb '22

24 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/Makefile.in | 2 +- programs/dllhost/dllhost.c | 82 +++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in index a92add9c2f0..bca6c208cdc 100644 --- a/programs/dllhost/Makefile.in +++ b/programs/dllhost/Makefile.in @@ -1,5 +1,5 @@ MODULE = dllhost.exe -IMPORTS = ole32 +IMPORTS = ole32 uuid EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 10bfb084213..ac1cf0e3d33 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -18,6 +18,8 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <objbase.h> @@ -26,6 +28,73 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct surrogate +{ + ISurrogate ISurrogate_iface; + LONG ref; +}; + +static inline struct surrogate *impl_from_ISurrogate(ISurrogate *iface) +{ + return CONTAINING_RECORD(iface, struct surrogate, ISurrogate_iface); +} + +static HRESULT WINAPI surrogate_QueryInterface(ISurrogate *iface, + REFIID iid, void **ppv) +{ + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISurrogate)) + { + ISurrogate_AddRef(&surrogate->ISurrogate_iface); + *ppv = &surrogate->ISurrogate_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI surrogate_AddRef(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI surrogate_Release(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const ISurrogateVtbl Surrogate_Vtbl = +{ + surrogate_QueryInterface, + surrogate_AddRef, + surrogate_Release, + surrogate_LoadDllServer, + surrogate_FreeSurrogate +}; + +static struct surrogate surrogate = { { &Surrogate_Vtbl }, 0 }; + int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) { HRESULT hr; @@ -36,9 +105,20 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho hr = CLSIDFromString(cmdline, &clsid); if (hr == S_OK) { - FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + CoRegisterSurrogate(&surrogate.ISurrogate_iface); + + hr = ISurrogate_LoadDllServer(&surrogate.ISurrogate_iface, &clsid); + if (hr != S_OK) + { + ERR("Can't create instance of %s\n", wine_dbgstr_guid(&clsid)); + goto cleanup; + } + + /* FIXME: wait for FreeSurrogate being called */ + Sleep(INFINITE); } +cleanup: CoUninitialize(); return 0; -- 2.35.1

2 3

[PATCH 3/3] winealsa: Move get_current_padding to the unixlib.
by Huw Davies 24 Feb '22

24 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 14 ++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 +++++------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index c40c87bca31..c73490ebfe6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1271,6 +1271,19 @@ static NTSTATUS get_latency(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* padding is solely updated at callback time in shared mode */ + *params->padding = stream->held_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1280,4 +1293,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, get_buffer_size, get_latency, + get_current_padding, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b8fc6802e28..a4ab0e179d1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -871,7 +871,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, out); @@ -881,16 +881,14 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); + params.stream = This->stream; + params.padding = out; - /* padding is solely updated at callback time in shared mode */ - *out = stream->held_frames; - - alsa_unlock(stream); + ALSA_CALL(get_current_padding, &params); TRACE("pad: %u\n", *out); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e51d3d3d510..2484fca8c90 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,13 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *padding; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -131,6 +138,7 @@ enum alsa_funcs alsa_get_mix_format, alsa_get_buffer_size, alsa_get_latency, + alsa_get_current_padding, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 2/3] winealsa: Move get_latency to the unixlib.
by Huw Davies 24 Feb '22

24 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 22 ++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 20 +++++--------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index cc0f9166d1a..c40c87bca31 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1250,6 +1250,27 @@ static NTSTATUS get_buffer_size(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 + * yet have enough data left to play (as if it were in native's mixer). Add: + * + mmdevapi_period such that at the end of it, ALSA still has data; + * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; + * + alsa_period such that ALSA always has at least one period to play. */ + if(stream->flow == eRender) + *params->latency = muldiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); + else + *params->latency = muldiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) + + stream->mmdev_period_rt; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1258,4 +1279,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_mix_format, get_buffer_size, + get_latency, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 46fd2b3aef5..b8fc6802e28 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -849,7 +849,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, latency); @@ -859,22 +859,12 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 - * yet have enough data left to play (as if it were in native's mixer). Add: - * + mmdevapi_period such that at the end of it, ALSA still has data; - * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; - * + alsa_period such that ALSA always has at least one period to play. */ - if(stream->flow == eRender) - *latency = MulDiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); - else - *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) - + stream->mmdev_period_rt; + params.stream = This->stream; + params.latency = latency; - alsa_unlock(stream); + ALSA_CALL(get_latency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e079b88cbde..e51d3d3d510 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -115,6 +115,13 @@ struct get_buffer_size_params UINT32 *size; }; +struct get_latency_params +{ + struct alsa_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -123,6 +130,7 @@ enum alsa_funcs alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, + alsa_get_latency, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 1/3] winealsa: Move get_buffer_size to the unixlib.
by Huw Davies 24 Feb '22

24 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 31 +++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index f79a655780c..cc0f9166d1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -160,6 +160,24 @@ static int muldiv( int a, int b, int c ) return ret; } +static void alsa_lock(struct alsa_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void alsa_unlock(struct alsa_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + +static NTSTATUS alsa_unlock_result(struct alsa_stream *stream, + HRESULT *result, HRESULT value) +{ + *result = value; + alsa_unlock(stream); + return STATUS_SUCCESS; +} + static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; @@ -1220,6 +1238,18 @@ exit: return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + *params->size = stream->bufsize_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1227,4 +1257,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, is_format_supported, get_mix_format, + get_buffer_size, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a1477dbe850..46fd2b3aef5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -827,7 +827,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, out); @@ -837,13 +837,12 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - *out = stream->bufsize_frames; + params.stream = This->stream; + params.size = out; - alsa_unlock(stream); + ALSA_CALL(get_buffer_size, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 771f189bca4..e079b88cbde 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -108,6 +108,13 @@ struct get_mix_format_params HRESULT result; }; +struct get_buffer_size_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *size; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -115,6 +122,7 @@ enum alsa_funcs alsa_release_stream, alsa_is_format_supported, alsa_get_mix_format, + alsa_get_buffer_size, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH v3 8/8] combase: Start surrogate local server when required.
by Dmitry Timoshkov 24 Feb '22

24 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..40f900175dd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,52 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + static const WCHAR processidW[] = L" /PROCESSID:"; + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe"); + } + + /* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */ + wcscat(command, processidW); + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +592,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; } -- 2.35.1

1 0

[PATCH v3 7/8] dllhost: Periodically call CoFreeUnusedLibraries().
by Dmitry Timoshkov 24 Feb '22

24 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 56722f0a647..39726b63c60 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -358,7 +358,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - WaitForSingleObject(surrogate.event, INFINITE); + while (WaitForSingleObject(surrogate.event, 30000) != WAIT_OBJECT_0) + CoFreeUnusedLibraries(); } cleanup: -- 2.35.1

1 0

[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