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

Hide GuiThread windows from enumeration

Browse Source 
Fixes invisible videos in Prince of Persia 3D (issue #273).
This commit is contained in:
narzoul 2024-03-29 13:07:30 +01:00
parent edcd3b1aca
commit 086b7740d9
6 changed files with 156 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DDrawCompat/Dll/DllMain.cpp
View File

@ -128,7 +128,6 @@ namespace
LOG_INFO << "Installing GDI hooks";
Gdi::installHooks();
Compat::closeDbgEng();
Gdi::GuiThread::start();
LOG_INFO << "Finished installing hooks";
Dll::g_isHooked = true;
}

3
DDrawCompat/Gdi/Gdi.cpp
View File

@ -76,6 +76,7 @@ namespace Gdi
Cursor::installHooks();
Font::installHooks();
WinProc::installHooks();
GuiThread::installHooks();
}
bool isDisplayDc(HDC dc)
@ -87,7 +88,7 @@ namespace Gdi
void redraw(HRGN rgn)
{
EnumWindows(&redrawWindowCallback, reinterpret_cast<LPARAM>(rgn));
CALL_ORIG_FUNC(EnumWindows)(&redrawWindowCallback, reinterpret_cast<LPARAM>(rgn));
}
void redrawWindow(HWND hwnd, HRGN rgn)

153
DDrawCompat/Gdi/GuiThread.cpp
View File

@ -20,12 +20,140 @@ namespace
{
const UINT WM_USER_EXECUTE = WM_USER;
struct EnumWindowsArgs
{
WNDENUMPROC lpEnumFunc;
LPARAM lParam;
};
unsigned g_threadId = 0;
Overlay::ConfigWindow* g_configWindow = nullptr;
Overlay::StatsWindow* g_statsWindow = nullptr;
HWND g_messageWindow = nullptr;
bool g_isReady = false;
BOOL CALLBACK enumWindowsProc(HWND hwnd, LPARAM lParam)
{
if (Gdi::GuiThread::isGuiThreadWindow(hwnd))
{
return TRUE;
}
auto& args = *reinterpret_cast<EnumWindowsArgs*>(lParam);
return args.lpEnumFunc(hwnd, args.lParam);
}
BOOL WINAPI enumChildWindows(HWND hWndParent, WNDENUMPROC lpEnumFunc, LPARAM lParam)
{
LOG_FUNC("EnumWindows", hWndParent, lpEnumFunc, lParam);
if (!lpEnumFunc)
{
return LOG_RESULT(CALL_ORIG_FUNC(EnumChildWindows)(hWndParent, lpEnumFunc, lParam));
}
EnumWindowsArgs args = { lpEnumFunc, lParam };
return LOG_RESULT(CALL_ORIG_FUNC(EnumChildWindows)(hWndParent, enumWindowsProc, reinterpret_cast<LPARAM>(&args)));
}
BOOL WINAPI enumDesktopWindows(HDESK hDesktop, WNDENUMPROC lpfn, LPARAM lParam)
{
LOG_FUNC("EnumDesktopWindows", hDesktop, lpfn, lParam);
if (!lpfn)
{
return LOG_RESULT(CALL_ORIG_FUNC(EnumDesktopWindows)(hDesktop, lpfn, lParam));
}
EnumWindowsArgs args = { lpfn, lParam };
return LOG_RESULT(CALL_ORIG_FUNC(EnumDesktopWindows)(hDesktop, enumWindowsProc, reinterpret_cast<LPARAM>(&args)));
}
BOOL WINAPI enumThreadWindows(DWORD dwThreadId, WNDENUMPROC lpfn, LPARAM lParam)
{
LOG_FUNC("EnumThreadWindows", dwThreadId, lpfn, lParam);
if (lpfn && dwThreadId == g_threadId)
{
return LOG_RESULT(FALSE);
}
return LOG_RESULT(CALL_ORIG_FUNC(EnumThreadWindows)(dwThreadId, lpfn, lParam));
}
BOOL WINAPI enumWindows(WNDENUMPROC lpEnumFunc, LPARAM lParam)
{
LOG_FUNC("EnumWindows", lpEnumFunc, lParam);
if (!lpEnumFunc)
{
return LOG_RESULT(CALL_ORIG_FUNC(EnumWindows)(lpEnumFunc, lParam));
}
EnumWindowsArgs args = { lpEnumFunc, lParam };
return LOG_RESULT(CALL_ORIG_FUNC(EnumWindows)(enumWindowsProc, reinterpret_cast<LPARAM>(&args)));
}
template <typename Char, typename FindWindowExProc>
HWND WINAPI findWindowEx(HWND hWndParent, HWND hWndChildAfter, const Char* lpszClass, const Char* lpszWindow,
FindWindowExProc origFindWindowEx)
{
HWND hwnd = origFindWindowEx(hWndParent, hWndChildAfter, lpszClass, lpszWindow);
while (hwnd && Gdi::GuiThread::isGuiThreadWindow(hwnd))
{
hwnd = origFindWindowEx(hWndParent, hwnd, lpszClass, lpszWindow);
}
return hwnd;
}
HWND WINAPI findWindowA(LPCSTR lpClassName, LPCSTR lpWindowName)
{
LOG_FUNC("FindWindowA", lpClassName, lpWindowName);
return LOG_RESULT(findWindowEx(nullptr, nullptr, lpClassName, lpWindowName, CALL_ORIG_FUNC(FindWindowExA)));
}
HWND WINAPI findWindowW(LPCWSTR lpClassName, LPCWSTR lpWindowName)
{
LOG_FUNC("FindWindowW", lpClassName, lpWindowName);
return LOG_RESULT(findWindowEx(nullptr, nullptr, lpClassName, lpWindowName, CALL_ORIG_FUNC(FindWindowExW)));
}
HWND WINAPI findWindowExA(HWND hWndParent, HWND hWndChildAfter, LPCSTR lpszClass, LPCSTR lpszWindow)
{
LOG_FUNC("FindWindowExA", hWndParent, hWndChildAfter, lpszClass, lpszWindow);
return LOG_RESULT(findWindowEx(hWndParent, hWndChildAfter, lpszClass, lpszWindow, CALL_ORIG_FUNC(FindWindowExA)));
}
HWND WINAPI findWindowExW(HWND hWndParent, HWND hWndChildAfter, LPCWSTR lpszClass, LPCWSTR lpszWindow)
{
LOG_FUNC("FindWindowExW", hWndParent, hWndChildAfter, lpszClass, lpszWindow);
return LOG_RESULT(findWindowEx(hWndParent, hWndChildAfter, lpszClass, lpszWindow, CALL_ORIG_FUNC(FindWindowExW)));
}
HWND getNonGuiThreadWindow(HWND hWnd, UINT uCmd)
{
while (hWnd && Gdi::GuiThread::isGuiThreadWindow(hWnd))
{
hWnd = CALL_ORIG_FUNC(GetWindow)(hWnd, uCmd);
}
return hWnd;
}
HWND WINAPI getTopWindow(HWND hWnd)
{
LOG_FUNC("GetTopWindow", hWnd);
return LOG_RESULT(getNonGuiThreadWindow(CALL_ORIG_FUNC(GetTopWindow)(hWnd), GW_HWNDNEXT));
}
HWND WINAPI getWindow(HWND hWnd, UINT uCmd)
{
LOG_FUNC("GetWindow", hWnd, uCmd);
HWND result = CALL_ORIG_FUNC(GetWindow)(hWnd, uCmd);
switch (uCmd)
{
case GW_CHILD:
case GW_HWNDFIRST:
case GW_HWNDNEXT:
return LOG_RESULT(getNonGuiThreadWindow(result, GW_HWNDNEXT));
case GW_HWNDLAST:
case GW_HWNDPREV:
return LOG_RESULT(getNonGuiThreadWindow(result, GW_HWNDPREV));
}
return LOG_RESULT(result);
}
BOOL CALLBACK initChildWindow(HWND hwnd, LPARAM /*lParam*/)
{
Gdi::WinProc::onCreateWindow(hwnd);
@ -39,7 +167,7 @@ namespace
if (GetCurrentProcessId() == windowPid)
{
Gdi::WinProc::onCreateWindow(hwnd);
EnumChildWindows(hwnd, &initChildWindow, 0);
CALL_ORIG_FUNC(EnumChildWindows)(hwnd, &initChildWindow, 0);
if (8 == Win32::DisplayMode::getBpp())
{
PostMessage(hwnd, WM_PALETTECHANGED, reinterpret_cast<WPARAM>(GetDesktopWindow()), 0);
@ -96,7 +224,7 @@ namespace
{
D3dDdi::ScopedCriticalSection lock;
g_isReady = true;
EnumWindows(initTopLevelWindow, 0);
CALL_ORIG_FUNC(EnumWindows)(initTopLevelWindow, 0);
}
MSG msg = {};
@ -168,6 +296,22 @@ namespace Gdi
return g_statsWindow;
}
void installHooks()
{
Dll::createThread(messageWindowThreadProc, &g_threadId, THREAD_PRIORITY_TIME_CRITICAL, 0);
HOOK_FUNCTION(user32, EnumChildWindows, enumChildWindows);
HOOK_FUNCTION(user32, EnumDesktopWindows, enumDesktopWindows);
HOOK_FUNCTION(user32, EnumThreadWindows, enumThreadWindows);
HOOK_FUNCTION(user32, EnumWindows, enumWindows);
HOOK_FUNCTION(user32, FindWindowA, findWindowA);
HOOK_FUNCTION(user32, FindWindowW, findWindowW);
HOOK_FUNCTION(user32, FindWindowExA, findWindowExA);
HOOK_FUNCTION(user32, FindWindowExW, findWindowExW);
HOOK_FUNCTION(user32, GetTopWindow, getTopWindow);
HOOK_FUNCTION(user32, GetWindow, getWindow);
}
bool isGuiThreadWindow(HWND hwnd)
{
return GetWindowThreadProcessId(hwnd, nullptr) == g_threadId;
@ -188,10 +332,5 @@ namespace Gdi
}
});
}
void start()
{
Dll::createThread(messageWindowThreadProc, &g_threadId, THREAD_PRIORITY_TIME_CRITICAL, 0);
}
}
}

2
DDrawCompat/Gdi/GuiThread.h
View File

@ -32,6 +32,6 @@ namespace Gdi
bool isGuiThreadWindow(HWND hwnd);
bool isReady();
void start();
void installHooks();
}
}

4
DDrawCompat/Gdi/Window.cpp
View File

@ -630,7 +630,7 @@ namespace Gdi
{
D3dDdi::ScopedCriticalSection lock;
g_windowZOrder.clear();
EnumWindows(updateWindow, reinterpret_cast<LPARAM>(&context));
CALL_ORIG_FUNC(EnumWindows)(updateWindow, reinterpret_cast<LPARAM>(&context));
for (auto it = g_windows.begin(); it != g_windows.end();)
{
@ -711,7 +711,7 @@ namespace Gdi
wp.flags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOREDRAW | SWP_NOSENDCHANGING;
if (IsWindowVisible(owner))
{
wp.hwndInsertAfter = GetWindow(owner, GW_HWNDPREV);
wp.hwndInsertAfter = CALL_ORIG_FUNC(GetWindow)(owner, GW_HWNDPREV);
if (!wp.hwndInsertAfter)
{
wp.hwndInsertAfter = (GetWindowLong(owner, GWL_EXSTYLE) & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP;

10
DDrawCompat/Win32/DisplayMode.cpp
View File

@ -258,7 +258,7 @@ namespace
{
ClipCursor(nullptr);
SetCursorPos(currDevMode.dmPosition.x + res.cx / 2, currDevMode.dmPosition.y + res.cy / 2);
EnumWindows(sendDisplayChange, (res.cy << 16) | res.cx);
CALL_ORIG_FUNC(EnumWindows)(sendDisplayChange, (res.cy << 16) | res.cx);
}
Gdi::VirtualScreen::update();
@ -439,7 +439,7 @@ namespace
case COLORRES:
if (8 == Win32::DisplayMode::getBpp() && Gdi::isDisplayDc(hdc))
{
return 24;
return LOG_RESULT(24);
}
break;
@ -448,7 +448,7 @@ namespace
if (Gdi::isDisplayDc(hdc))
{
const auto& r = Win32::DisplayMode::getMonitorInfo().rcEmulated;
return HORZRES == nIndex ? (r.right - r.left) : (r.bottom - r.top);
return LOG_RESULT(HORZRES == nIndex ? (r.right - r.left) : (r.bottom - r.top));
}
break;
@ -456,7 +456,7 @@ namespace
case NUMRESERVED:
if (8 == Win32::DisplayMode::getBpp() && Gdi::isDisplayDc(hdc))
{
return 20;
return LOG_RESULT(20);
}
break;
@ -470,7 +470,7 @@ namespace
case SIZEPALETTE:
if (8 == Win32::DisplayMode::getBpp() && Gdi::isDisplayDc(hdc))
{
return 256;
return LOG_RESULT(256);
}
break;
}