1
0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00

use GetSystemPaletteEntries hook for any display DC

This commit is contained in:
FunkyFr3sh 2024-12-22 22:49:05 +01:00
parent 02a97cf9f7
commit d6a80273fc

View File

@ -1426,10 +1426,7 @@ UINT WINAPI fake_GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LP
pPalEntries, pPalEntries,
_ReturnAddress()); _ReturnAddress());
if (g_ddraw.ref && if (g_ddraw.ref && g_ddraw.bpp == 8 && pPalEntries && GetObjectType(hdc) == OBJ_DC)
g_ddraw.bpp == 8 &&
pPalEntries &&
((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow()))
{ {
TRACE(" Display DC\n"); TRACE(" Display DC\n");
@ -1441,10 +1438,7 @@ UINT WINAPI fake_GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LP
{ {
for (int i = iStart, x = 0; i < iStart + cEntries && i < 256; i++, x++) for (int i = iStart, x = 0; i < iStart + cEntries && i < 256; i++, x++)
{ {
pPalEntries[x].peRed = g_ddp_default_palette[i].peRed; pPalEntries[x] = g_ddp_default_palette[i];
pPalEntries[x].peGreen = g_ddp_default_palette[i].peGreen;
pPalEntries[x].peBlue = g_ddp_default_palette[i].peBlue;
pPalEntries[x].peFlags = g_ddp_default_palette[i].peFlags;
} }
} }