backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

add GetDesktopWindow check

Browse Source
This commit is contained in:
FunkyFr3sh 2024-12-15 08:01:23 +01:00
parent b15e579ea4
commit 308fefb654
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/winapi_hooks.c
View File

@ -1360,7 +1360,10 @@ UINT WINAPI fake_GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LP
pPalEntries, pPalEntries,
_ReturnAddress()); _ReturnAddress());
if (g_ddraw.ref && g_ddraw.bpp == 8 && pPalEntries && g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) if (g_ddraw.ref &&
g_ddraw.bpp == 8 &&
pPalEntries &&
((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow()))
{ {
TRACE(" WindowFromDC(hdc) == g_ddraw.hwnd\n"); TRACE(" WindowFromDC(hdc) == g_ddraw.hwnd\n");
@ -1387,7 +1390,9 @@ UINT WINAPI fake_GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LP
HPALETTE WINAPI fake_SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd) HPALETTE WINAPI fake_SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd)
{ {
if (g_ddraw.ref && g_ddraw.bpp == 8 && g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) if (g_ddraw.ref &&
g_ddraw.bpp == 8 &&
((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow()))
{ {
if (g_ddraw.primary && g_ddraw.primary->palette) if (g_ddraw.primary && g_ddraw.primary->palette)
{ {
@ -1397,6 +1402,8 @@ HPALETTE WINAPI fake_SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd)
UINT count = GetPaletteEntries(hPal, 0, 256, pal); UINT count = GetPaletteEntries(hPal, 0, 256, pal);
ddp_SetEntries(g_ddraw.primary->palette, 0, 0, count, pal); ddp_SetEntries(g_ddraw.primary->palette, 0, 0, count, pal);
return real_SelectPalette(g_ddraw.primary->hdc, hPal, bForceBkgd);
} }
} }