actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert Crash.cpp changes that attempted to restore display settings due to causing instability after crash

Browse Source 
This reverts parts of commit e37c1a9e72184669b59d15b2b7064518c5fc98a4.
This commit is contained in:
glitchbear
2025-01-23 13:32:58 -06:00
committed by teejusb
parent 3266fda819
commit 71c4fa6bc0
1 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/archutils/Win32/Crash.cpp
+4 -36
View File
@@ -349,45 +349,13 @@ static DWORD WINAPI MainExceptionHandler( LPVOID lpParameter )
/* The thread that crashed was the thread that created the main window.
* Hide the window. This will also restore the video mode, if necessary. */
ShowWindow( g_hForegroundWnd, SW_HIDE );
}
else {
} else {
/* A different thread crashed. Simply kill all other windows. We can't
* safely call ShowWindow; the main thread might be deadlocked. */
RageThread::HaltAllThreads(true);
auto deviceModeIsValid = [=](const DEVMODE& mode) {
return (mode.dmFields & DM_PELSWIDTH) && (mode.dmFields & DM_PELSHEIGHT)
&& (mode.dmFields & DM_DISPLAYFREQUENCY)
&& (mode.dmBitsPerPel >= 32 || !(mode.dmFields & DM_BITSPERPEL));
};
DEVMODE devmode;
ZeroMemory(&devmode, sizeof(DEVMODE));
devmode.dmSize = sizeof(DEVMODE);
devmode.dmDriverExtra = 0;
DWORD deviceIter = 0;
DISPLAY_DEVICE dd;
ZeroMemory(&dd, sizeof(dd));
dd.cb = sizeof(dd);
/* Since we don't know which display was modified for fullscreen exclusive mode,
* loop through all displays it could have been to restore the video mode. */
while (EnumDisplayDevices(NULL, deviceIter++, &dd, 0))
{
while (EnumDisplaySettingsEx(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devmode, 0))
{
if (deviceModeIsValid(devmode))
{
ChangeDisplaySettingsEx(dd.DeviceName, nullptr, nullptr, 0, nullptr);
}
ZeroMemory(&devmode, sizeof(DEVMODE));
devmode.dmSize = sizeof(DEVMODE);
devmode.dmDriverExtra = 0;
}
}
ZeroMemory(&dd, sizeof(dd));
dd.cb = sizeof(dd);
RageThread::HaltAllThreads( true );
ChangeDisplaySettings( nullptr, 0 );
}
InHere = false;
SetUnhandledExceptionFilter(nullptr);