dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use SignalObjectAndWait since we do not support older than Windows XP anymore

Browse Source
This commit is contained in:
Rubidium
2023-06-28 22:20:19 +02:00
committed by rubidium42
parent 69d5b9d326
commit fd380127f0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sound/win32_s.cpp
View File

@@ -98,8 +98,7 @@ void SoundDriver_Win32::Stop()
/* Stop the sound thread. */ /* Stop the sound thread. */
_waveout = nullptr; _waveout = nullptr;
SetEvent(_event); SignalObjectAndWait(_event, _thread, INFINITE, FALSE);
WaitForSingleObject(_thread, INFINITE);
/* Close the sound device. */ /* Close the sound device. */
waveOutReset(waveout); waveOutReset(waveout);

6
src/video/dedicated_v.cpp
View File

@@ -64,10 +64,8 @@ static void WINAPI CheckForConsoleInput()
if (nb >= lengthof(_win_console_thread_buffer)) nb = lengthof(_win_console_thread_buffer) - 1; if (nb >= lengthof(_win_console_thread_buffer)) nb = lengthof(_win_console_thread_buffer) - 1;
_win_console_thread_buffer[nb] = '\0'; _win_console_thread_buffer[nb] = '\0';
/* Signal input waiting that input is read and wait for it being handled /* Signal input waiting that input is read and wait for it being handled. */
* SignalObjectAndWait() should be used here, but it's unsupported in Win98< */ SignalObjectAndWait(_hInputReady, _hWaitForInputHandling, INFINITE, FALSE);
SetEvent(_hInputReady);
WaitForSingleObject(_hWaitForInputHandling, INFINITE);
} }
} }