Revert "fix MxPalette::GetDefaultPalette"

This reverts commit 63f2215737.
This commit is contained in:
Joshua Peisach 2023-06-29 17:26:23 -04:00
parent 8be8301d70
commit 11ab4ae167

View File

@ -27,18 +27,16 @@ MxResult MxPalette::GetEntries(LPPALETTEENTRY p_entries)
void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries) void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries)
{ {
HDC hdc = GetDC((HWND) NULL); HDC hdc = GetDC((HWND) NULL);
PALETTEENTRY *src; int rasterCaps = GetDeviceCaps(hdc, RASTERCAPS);
if ((rasterCaps & RC_PALETTE) != 0) {
if ((rasterCaps & RC_PALETTE) != 0 && GetDeviceCaps(hdc, SIZEPALETTE) == 256) { int paletteSize = GetDeviceCaps(hdc, SIZEPALETTE);
GetSystemPaletteEntries(hdc, 0, 256, p_entries); if (paletteSize == 256) {
count = 256 - 2 * 10; GetSystemPaletteEntries(hdc, 0, 256, p_entries);
src = &g_defaultPalette[10]; p_entries += 10;
p_entries += 10; memcpy(p_entries, this->m_entries, sizeof(this->m_entries));
} else { }
src = g_defaultPalette;
count = 256;
} }
memcpy(dest, p_entries, count * sizeof(PALETTEENTRY));
ReleaseDC((HWND) NULL, hdc); ReleaseDC((HWND) NULL, hdc);
} }