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

Prevent ddraw from removing the WS_CLIPCHILDREN style

Browse Source 
In borderless fullscreen mode, ddraw removes the WS_CLIPCHILDREN style
from the device window for some reason, but it doesn't do that in
exclusive fullscreen mode.

Preventing ddraw from removing the style fixes invisible menus in
Tiberian Sun when using FullscreenMode=borderless.
This commit is contained in:
narzoul 2022-06-26 20:58:10 +02:00
parent 027b52686e
commit f13d842c24
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
DDrawCompat/Gdi/WinProc.cpp
View File

@ -68,6 +68,7 @@ namespace
void onUninitMenuPopup(HMENU menu);
void onWindowPosChanged(HWND hwnd, const WINDOWPOS& wp);
void onWindowPosChanging(HWND hwnd, WINDOWPOS& wp);
LONG WINAPI setWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong);
void setWindowProc(HWND hwnd, WNDPROC wndProcA, WNDPROC wndProcW);
template <auto func, typename Result, typename... Params>
@ -195,6 +196,30 @@ namespace
return ddcWindowProc(hwnd, uMsg, wParam, lParam, CallWindowProcW, getWindowProc(hwnd).wndProcW);
}
LONG WINAPI ddrawSetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong)
{
LOG_FUNC("ddrawSetWindowLongA", hWnd, nIndex, dwNewLong);
if (GWL_WNDPROC == nIndex)
{
return setWindowLongA(hWnd, GWL_WNDPROC, dwNewLong);
}
if (GWL_STYLE == nIndex)
{
auto style = CALL_ORIG_FUNC(GetWindowLongA)(hWnd, GWL_STYLE);
if (style & WS_CLIPCHILDREN)
{
dwNewLong = style | WS_CLIPCHILDREN;
if (dwNewLong == style)
{
return LOG_RESULT(style);
}
}
}
return LOG_RESULT(CALL_ORIG_FUNC(SetWindowLongA)(hWnd, nIndex, dwNewLong));
}
BOOL WINAPI getMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax,
decltype(&GetMessageA) origGetMessage)
{
@ -670,6 +695,8 @@ namespace Gdi
HOOK_FUNCTION(user32, SetWindowLongW, setWindowLongW);
HOOK_FUNCTION(user32, SetWindowPos, setWindowPos);
Compat::hookIatFunction(Dll::g_origDDrawModule, "SetWindowLongA", ddrawSetWindowLongA);
SetWinEventHook(EVENT_OBJECT_CREATE, EVENT_OBJECT_CREATE,
Dll::g_currentModule, &winEventProc, GetCurrentProcessId(), 0, WINEVENT_INCONTEXT);
SetWinEventHook(EVENT_OBJECT_NAMECHANGE, EVENT_OBJECT_NAMECHANGE,