reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-02 00:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dsound: Do not wait on mixer thread exit on dsound release.

Browse Source 
This fixes a loader deadlock if the dsound object is being released
during a dll unload.
This commit is contained in:
Aric Stewart 2015-03-17 11:35:47 -05:00 committed by Alexandre Julliard
parent 0221688cdd
commit 0aea30e44c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dsound/dsound.c
View File

@ -208,8 +208,9 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
SetEvent(device->sleepev);
if (device->thread) {
WaitForSingleObject(device->thread, INFINITE);
WaitForSingleObject(device->thread_finished, INFINITE);
CloseHandle(device->thread);
CloseHandle(device->thread_finished);
}
CloseHandle(device->sleepev);
@ -384,6 +385,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
hr = DSOUND_PrimaryCreate(device);
if (hr == DS_OK) {
device->thread_finished = CreateEventW(0, 0, 0, 0);
device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0);
SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL);
} else

1
dlls/dsound/dsound_private.h
View File

@ -108,6 +108,7 @@ struct DirectSoundDevice
IAudioRenderClient *render;
HANDLE sleepev, thread;
HANDLE thread_finished;
struct list entry;
};

1
dlls/dsound/mixer.c
View File

@ -909,5 +909,6 @@ DWORD CALLBACK DSOUND_mixthread(void *p)
DSOUND_PerformMix(dev);
RtlReleaseResource(&(dev->buffer_list_lock));
}
SetEvent(dev->thread_finished);
return 0;
}