October 2023 - Wine-Commits

Nikolay Sivov : maintainers: Add EVR to the Media Foundation section.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 0c7a09cb1f92d55d8381ff6460e13ed085d434db URL: https://gitlab.winehq.org/wine/wine/-/commit/0c7a09cb1f92d55d8381ff6460e13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 20:17:50 2023 +0200 maintainers: Add EVR to the Media Foundation section. --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dc5c85cc4ec..4bab36bfdf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -373,6 +373,7 @@ F: dlls/wmvcore/ Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/evr/ F: dlls/mf/ F: dlls/mferror/ F: dlls/mfmediaengine/

1 0

Eric Pouech : dsound: Forward error code when device cannot be found.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 79264b27c173c7e44c13af5e32fc18e1c84bd862 URL: https://gitlab.winehq.org/wine/wine/-/commit/79264b27c173c7e44c13af5e32fc18… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 dsound: Forward error code when device cannot be found. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dsound/dsound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 0b8edaaaf06..b35f9c7cbdd 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -288,9 +288,10 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU IsEqualGUID(lpcGUID, &DSDEVID_DefaultVoiceCapture)) return DSERR_NODRIVER; - if (GetDeviceID(lpcGUID, &devGUID) != DS_OK) { + hr = GetDeviceID(lpcGUID, &devGUID); + if (FAILED(hr)) { WARN("invalid parameter: lpcGUID\n"); - return DSERR_INVALIDPARAM; + return hr; } hr = get_mmdevice(eRender, &devGUID, &mmdevice);

1 0

Paul Gofman : winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: deff1303fb822085b84653870194144ebce81067 URL: https://gitlab.winehq.org/wine/wine/-/commit/deff1303fb822085b8465387019414… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 13 18:56:48 2023 -0600 winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT. --- dlls/mf/tests/transform.c | 3 +++ dlls/winegstreamer/h264_decoder.c | 7 +++++++ include/codecapi.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e798601a8b5..3f5524784cc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -45,6 +45,8 @@ #include "initguid.h" +#include "codecapi.h" + #include "d3d11_4.h" DEFINE_GUID(DMOVideoFormat_RGB24,D3DFMT_R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); @@ -3933,6 +3935,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), /* more H264 decoder specific attributes from CODECAPI */ + ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 6d8f2a146da..5c48130eee9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -26,6 +26,10 @@ #include "wine/debug.h" +#include "initguid.h" + +#include "codecapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -881,6 +885,9 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE))) goto failed; + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + goto failed; + if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) goto failed; if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) diff --git a/include/codecapi.h b/include/codecapi.h index 9719389b081..a9fe7c9de3f 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -61,4 +61,6 @@ enum eAVEncH264VLevel eAVEncH264VLevel5_2 = 52 }; +DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); + #endif /* __CODECAPI_H */

1 0

Eric Pouech : quartz: Return correct error when no audio devices are present.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: a23402f6e79a04185f06c0e63e1b4d834e96d227 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23402f6e79a04185f06c0e63e1b4d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 quartz: Return correct error when no audio devices are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 38a7d6f7ad7..10eed43422e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1015,7 +1015,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IUnknown_Release(object->system_clock); strmbase_filter_cleanup(&object->filter); free(object); - return hr; + return hr == DSERR_NODRIVER ? VFW_E_NO_AUDIO_HARDWARE : hr; } if (FAILED(hr = IDirectSound8_SetCooperativeLevel(object->dsound,

1 0

Rémi Bernon : dmime: Use latency time to decide when to process messages.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 1014bab951f89a51226a17ec1d6d8d1225c46c5c URL: https://gitlab.winehq.org/wine/wine/-/commit/1014bab951f89a51226a17ec1d6d8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:41:34 2023 +0200 dmime: Use latency time to decide when to process messages. --- dlls/dmime/performance.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a56a35a2f45..dc6ef575713 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -89,10 +89,10 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * do { - REFERENCE_TIME current, offset = 0; + REFERENCE_TIME latency, offset = 0; IDirectMusicTool *tool; - if (FAILED(hr = IDirectMusicPerformance_GetTime(performance, &current, NULL))) return hr; + if (FAILED(hr = IDirectMusicPerformance_GetLatencyTime(performance, &latency))) return hr; if (!(tool = msg->pTool)) tool = &This->IDirectMusicTool_iface; switch (msg->dwFlags & delivery_flags) @@ -107,9 +107,9 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * offset = This->dwBumperLength * 10000; /* fallthrough */ case DMUS_PMSGF_TOOL_ATTIME: - if (msg->rtTime >= offset && msg->rtTime - offset >= current) + if (msg->rtTime >= offset && msg->rtTime - offset >= latency) { - if (timeout) *timeout = (msg->rtTime - offset - current) / 10000; + if (timeout) *timeout = (msg->rtTime - offset - latency) / 10000; return DMUS_S_REQUEUE; }

1 0

Alexandre Julliard : ntdll: Also send segment registers to the server on suspend.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: fba6b7a1ed560c63236e9451010ad1ecf960e0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/fba6b7a1ed560c63236e9451010ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 20:18:28 2023 +0200 ntdll: Also send segment registers to the server on suspend. Fixes some test failures in wow64 mode. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 79d69d11547..eac5d961a07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2117,7 +2117,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs; - context.c.ContextFlags = CONTEXT_FULL; + context.c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS; context_init_xstate( &context.c, &xs ); NtGetContextThread( GetCurrentThread(), &context.c );

1 0

Rémi Bernon : dmusic: Set synth sink master clock when creating port.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: f00d8639e6f34f81d0acd16a8a0e6f05f210fda8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f00d8639e6f34f81d0acd16a8a0e6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 16:20:57 2023 +0200 dmusic: Set synth sink master clock when creating port. --- dlls/dmusic/port.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b23a3f5d4dd..28c5c3cff17 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -714,6 +714,9 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (SUCCEEDED(hr)) hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->parent->master_clock); + if (SUCCEEDED(hr)) + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->parent->master_clock); + if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params);

1 0

Rémi Bernon : dmime: Use port latency time for messages with -1 time.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: a8763aab6fbcab804282a3d909e16e93ead2a867 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8763aab6fbcab804282a3d909e16e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:52:37 2023 +0200 dmime: Use port latency time for messages with -1 time. --- dlls/dmime/performance.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 14e290658e0..4dffadb405d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -490,7 +490,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS if (!(msg->dwFlags & DMUS_PMSGF_REFTIME)) { if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(iface, - msg->mtTime, &msg->rtTime))) + msg->mtTime == -1 ? 0 : msg->mtTime, &msg->rtTime))) goto done; msg->dwFlags |= DMUS_PMSGF_REFTIME; } @@ -1632,6 +1632,8 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, static const UINT event_size = sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); DMUS_BUFFERDESC desc = {.dwSize = sizeof(desc), .cbBuffer = 2 * event_size}; DMUS_MIDI_PMSG *midi = (DMUS_MIDI_PMSG *)msg; + IReferenceClock *latency_clock; + REFERENCE_TIME latency_time; IDirectMusicBuffer *buffer; IDirectMusicPort *port; DWORD group, channel; @@ -1644,6 +1646,13 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, return DMUS_S_FREE; } + if (SUCCEEDED(hr = IDirectMusicPort_GetLatencyClock(port, &latency_clock))) + { + if (FAILED(hr = IReferenceClock_GetTime(latency_clock, &latency_time))) + ERR("Failed to get port latency time, hr %#lx\n", hr); + IReferenceClock_Release(latency_clock); + } + value |= channel; value |= (UINT)midi->bStatus; value |= (UINT)midi->bByte1 << 8; @@ -1651,6 +1660,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, if (SUCCEEDED(hr = IDirectMusic_CreateMusicBuffer(This->dmusic, &desc, &buffer, NULL))) { + if (msg->rtTime == -1) msg->rtTime = latency_time; hr = IDirectMusicBuffer_PackStructured(buffer, msg->rtTime, group, value); if (SUCCEEDED(hr)) hr = IDirectMusicPort_PlayBuffer(port, buffer); IDirectMusicBuffer_Release(buffer);

1 0

Rémi Bernon : dmusic: Forward IDirectMusicPort_Activate to synth and sink.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 72165fc8ec2cfb86ff641ed817b1fb7cace24dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/72165fc8ec2cfb86ff641ed817b1fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 12 11:13:33 2023 +0200 dmusic: Forward IDirectMusicPort_Activate to synth and sink. --- dlls/dmusic/port.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 28c5c3cff17..f98d73f4444 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -274,30 +274,36 @@ static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DW static HRESULT WINAPI synth_port_Activate(IDirectMusicPort *iface, BOOL active) { struct synth_port *This = synth_from_IDirectMusicPort(iface); + HRESULT hr; - FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, active); + TRACE("(%p/%p)->(%d)\n", iface, This, active); - if (This->active == active) - return S_FALSE; + if (This->active == active) return S_FALSE; - if (active) { - /* Acquire the dsound */ - if (!This->dsound) { - IDirectSound_AddRef(This->parent->dsound); - This->dsound = This->parent->dsound; - } - IDirectSound_AddRef(This->dsound); - } else { - /* Release the dsound */ - IDirectSound_Release(This->dsound); - IDirectSound_Release(This->parent->dsound); - if (This->dsound == This->parent->dsound) - This->dsound = NULL; + if (active) + { + if (!This->dsound && FAILED(hr = IDirectMusicPort_SetDirectSound(iface, + This->parent->dsound, NULL))) + return hr; + if (FAILED(hr = IDirectMusicSynthSink_SetDirectSound(This->synth_sink, + This->dsound, This->dsbuffer))) + return hr; + + if (FAILED(hr = IDirectMusicSynth_Activate(This->synth, active))) + return hr; + This->active = TRUE; } + else + { + if (FAILED(hr = IDirectMusicSynth_Activate(This->synth, FALSE))) return hr; + This->active = FALSE; - This->active = active; + if (FAILED(hr = IDirectMusicSynthSink_SetDirectSound(This->synth_sink, NULL, NULL))) + return hr; + hr = IDirectMusicPort_SetDirectSound(iface, NULL, NULL); + } - return S_OK; + return hr; } static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWORD channel_group,

1 0

Rémi Bernon : dmime: Rewrite message thread with a condition variable.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: d5e156fa7fc9ff47c1c99af342047319f0f23bfa URL: https://gitlab.winehq.org/wine/wine/-/commit/d5e156fa7fc9ff47c1c99af3420473… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 15:14:11 2023 +0200 dmime: Rewrite message thread with a condition variable. --- dlls/dmime/performance.c | 105 +++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 72 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 63429023da2..14e290658e0 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -54,11 +54,10 @@ struct performance REFERENCE_TIME rtLatencyTime; DWORD dwBumperLength; DWORD dwPrepareTime; - /** Message Processing */ - HANDLE procThread; - DWORD procThreadId; - BOOL procThreadTicStarted; + + HANDLE message_thread; CRITICAL_SECTION safe; + CONDITION_VARIABLE cond; IReferenceClock *master_clock; REFERENCE_TIME init_time; @@ -124,25 +123,20 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * return hr; } -#define PROCESSMSG_START (WM_APP + 0) -#define PROCESSMSG_EXIT (WM_APP + 1) -#define PROCESSMSG_REMOVE (WM_APP + 2) -#define PROCESSMSG_ADD (WM_APP + 4) - -static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) +static DWORD WINAPI message_thread_proc(void *args) { - struct performance *This = lpParam; - DWORD timeout = INFINITE; - MSG msg; - HRESULT hr; + struct performance *This = args; struct message *message, *next; + HRESULT hr; - while (TRUE) - { - if (timeout > 0) MsgWaitForMultipleObjects(0, NULL, FALSE, timeout, QS_POSTMESSAGE | QS_SENDMESSAGE | QS_TIMER); - timeout = INFINITE; + TRACE("performance %p message thread\n", This); + SetThreadDescription(GetCurrentThread(), L"wine_dmime_message"); - EnterCriticalSection(&This->safe); + EnterCriticalSection(&This->safe); + + while (This->message_thread) + { + DWORD timeout = INFINITE; LIST_FOR_EACH_ENTRY_SAFE(message, next, &This->messages, struct message, entry) { @@ -154,59 +148,15 @@ static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) if (hr != S_OK) break; } - LeaveCriticalSection(&This->safe); - - while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) - { - /** if hwnd we suppose that is a windows event ... */ - if (NULL != msg.hwnd) - { - TranslateMessage(&msg); - DispatchMessageA(&msg); - } - else - { - switch (msg.message) - { - case WM_QUIT: - case PROCESSMSG_EXIT: goto outofthread; - case PROCESSMSG_START: break; - case PROCESSMSG_ADD: break; - case PROCESSMSG_REMOVE: break; - default: ERR("Unhandled message %u. Critical Path\n", msg.message); break; - } - } - } - - /** here we should run a little of current AudioPath */ + SleepConditionVariableCS(&This->cond, &This->safe, timeout); } -outofthread: - TRACE("(%p): Exiting\n", This); + LeaveCriticalSection(&This->safe); + TRACE("(%p): Exiting\n", This); return 0; } -static BOOL PostMessageToProcessMsgThread(struct performance *This, UINT iMsg) { - if (FALSE == This->procThreadTicStarted && PROCESSMSG_EXIT != iMsg) { - BOOL res; - This->procThread = CreateThread(NULL, 0, ProcessMsgThread, This, 0, &This->procThreadId); - if (NULL == This->procThread) return FALSE; - SetThreadPriority(This->procThread, THREAD_PRIORITY_TIME_CRITICAL); - This->procThreadTicStarted = TRUE; - while(1) { - res = PostThreadMessageA(This->procThreadId, iMsg, 0, 0); - /* Let the thread creates its message queue (with MsgWaitForMultipleObjects call) by yielding and retrying */ - if (!res && (GetLastError() == ERROR_INVALID_THREAD_ID)) - Sleep(0); - else - break; - } - return res; - } - return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); -} - static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME music_time) { IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; @@ -424,7 +374,12 @@ static HRESULT WINAPI performance_Init(IDirectMusicPerformance8 *iface, IDirectM return hr; } - PostMessageToProcessMsgThread(This, PROCESSMSG_START); + if (!(This->message_thread = CreateThread(NULL, 0, message_thread_proc, This, 0, NULL))) + { + ERR("Failed to start performance message thread, error %lu\n", GetLastError()); + IDirectMusicPerformance_CloseDown(iface); + return HRESULT_FROM_WIN32(GetLastError()); + } if (dmusic && !*dmusic) { @@ -549,13 +504,13 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS LIST_FOR_EACH_ENTRY(next, &This->messages, struct message, entry) if (next->msg.rtTime > message->msg.rtTime) break; list_add_before(&next->entry, &message->entry); - PostThreadMessageW(This->procThreadId, PROCESSMSG_ADD, 0, 0); hr = S_OK; } done: LeaveCriticalSection(&This->safe); + if (SUCCEEDED(hr)) WakeConditionVariable(&This->cond); return hr; } @@ -1033,14 +988,20 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); struct message *message, *next; + HANDLE message_thread; HRESULT hr; FIXME("(%p): semi-stub\n", This); - if (PostMessageToProcessMsgThread(This, PROCESSMSG_EXIT)) { - WaitForSingleObject(This->procThread, INFINITE); - This->procThreadTicStarted = FALSE; - CloseHandle(This->procThread); + if ((message_thread = This->message_thread)) + { + EnterCriticalSection(&This->safe); + This->message_thread = NULL; + LeaveCriticalSection(&This->safe); + WakeConditionVariable(&This->cond); + + WaitForSingleObject(message_thread, INFINITE); + CloseHandle(message_thread); } This->notification_performance = FALSE;

1 0