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 a race condition leading to a crash when installing hooks

Browse Source 
See issue #306.
This commit is contained in:
narzoul 2024-05-20 18:01:32 +02:00
parent ed40a6d5e9
commit 24bb72138d
2 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DDrawCompat/DDraw/DirectDraw.cpp
View File

@ -336,6 +336,7 @@ namespace DDraw
void onCreate(GUID* guid, CompatRef<IDirectDraw7> dd)
{
DDraw::ScopedThreadLock lock;
static std::map<LUID, CompatWeakPtr<IDirectDraw7>> repositories;
auto adapterInfo = D3dDdi::KernelModeThunks::getAdapterInfo(dd);
auto it = repositories.find(adapterInfo.luid);

13
DDrawCompat/Dll/DllMain.cpp
View File

@ -20,6 +20,7 @@
#include <DDraw/DirectDraw.h>
#include <DDraw/Hooks.h>
#include <DDraw/LogUsedResourceFormat.h>
#include <DDraw/ScopedThreadLock.h>
#include <Direct3d/Hooks.h>
#include <Dll/Dll.h>
#include <Gdi/Gdi.h>
@ -81,9 +82,18 @@ namespace
void installHooks()
{
if (!Dll::g_isHooked)
if (Dll::g_isHooked)
{
return;
}
DDraw::ScopedThreadLock lock;
if (Dll::g_isHooked)
{
return;
}
Dll::g_isHooked = true;
DDraw::SuppressResourceFormatLogs suppressResourceFormatLogs;
Overlay::Steam::installHooks();
LOG_INFO << "Installing display mode hooks";
@ -133,7 +143,6 @@ namespace
Compat::closeDbgEng();
LOG_INFO << "Finished installing hooks";
}
}
unsigned WINAPI installHooksThreadProc(LPVOID /*lpParameter*/)
{