backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Fixed deadlock in VirtualScreen::update

Browse Source
This commit is contained in:
narzoul 2021-01-31 12:25:32 +01:00
parent 0a39f17089
commit 27ae9affb8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DDrawCompat/Gdi/VirtualScreen.cpp
View File

@ -228,27 +228,29 @@ namespace Gdi
bool update() bool update()
{ {
LOG_FUNC("VirtualScreen::update"); LOG_FUNC("VirtualScreen::update");
Compat::ScopedCriticalSection lock(g_cs);
static auto prevDisplaySettingsUniqueness = Win32::DisplayMode::queryDisplaySettingsUniqueness() - 1; static auto prevDisplaySettingsUniqueness = Win32::DisplayMode::queryDisplaySettingsUniqueness() - 1;
const auto currentDisplaySettingsUniqueness = Win32::DisplayMode::queryDisplaySettingsUniqueness();
const auto bpp = Win32::DisplayMode::getBpp();
if (currentDisplaySettingsUniqueness == prevDisplaySettingsUniqueness && bpp == g_bpp)
{
return LOG_RESULT(false);
}
prevDisplaySettingsUniqueness = currentDisplaySettingsUniqueness; {
Compat::ScopedCriticalSection lock(g_cs);
if (Win32::DisplayMode::queryDisplaySettingsUniqueness() == prevDisplaySettingsUniqueness &&
Win32::DisplayMode::getBpp() == g_bpp)
{
return LOG_RESULT(false);
}
}
{ {
D3dDdi::ScopedCriticalSection driverLock; D3dDdi::ScopedCriticalSection driverLock;
Compat::ScopedCriticalSection lock(g_cs);
prevDisplaySettingsUniqueness = Win32::DisplayMode::queryDisplaySettingsUniqueness();
D3dDdi::Device::setGdiResourceHandle(nullptr); D3dDdi::Device::setGdiResourceHandle(nullptr);
g_region = Region(); g_region = Region();
EnumDisplayMonitors(nullptr, nullptr, addMonitorRectToRegion, reinterpret_cast<LPARAM>(&g_region)); EnumDisplayMonitors(nullptr, nullptr, addMonitorRectToRegion, reinterpret_cast<LPARAM>(&g_region));
GetRgnBox(g_region, &g_bounds); GetRgnBox(g_region, &g_bounds);
g_bpp = bpp; g_bpp = Win32::DisplayMode::getBpp();
g_width = g_bounds.right - g_bounds.left; g_width = g_bounds.right - g_bounds.left;
g_height = g_bounds.bottom - g_bounds.top; g_height = g_bounds.bottom - g_bounds.top;
g_pitch = (g_width * g_bpp / 8 + 3) & ~3; g_pitch = (g_width * g_bpp / 8 + 3) & ~3;