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

Fixed wrong palette returned by GetSystemPaletteEntries

Browse Source
This commit is contained in:
narzoul 2019-01-02 15:45:56 +01:00
parent 7fe68a6e1e
commit 3de50d98ad
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DDrawCompat/Gdi/Palette.cpp
View File

@ -7,7 +7,6 @@
#include "Common/Hook.h" #include "Common/Hook.h"
#include "Common/Log.h" #include "Common/Log.h"
#include "DDraw/ScopedThreadLock.h" #include "DDraw/ScopedThreadLock.h"
#include "DDraw/Surfaces/PrimarySurface.h"
#include "Gdi/Gdi.h" #include "Gdi/Gdi.h"
#include "Gdi/Palette.h" #include "Gdi/Palette.h"
#include "VirtualScreen.h" #include "VirtualScreen.h"
@ -104,7 +103,7 @@ namespace
} }
DDraw::ScopedThreadLock lock; DDraw::ScopedThreadLock lock;
std::memcpy(lppe, &DDraw::PrimarySurface::s_paletteEntries[iStartIndex], nEntries * sizeof(PALETTEENTRY)); std::memcpy(lppe, &g_systemPalette[iStartIndex], nEntries * sizeof(PALETTEENTRY));
return LOG_RESULT(nEntries); return LOG_RESULT(nEntries);
} }
@ -210,7 +209,7 @@ namespace Gdi
{ {
HPALETTE defaultPalette = reinterpret_cast<HPALETTE>(GetStockObject(DEFAULT_PALETTE)); HPALETTE defaultPalette = reinterpret_cast<HPALETTE>(GetStockObject(DEFAULT_PALETTE));
GetPaletteEntries(defaultPalette, 0, 10, g_systemPalette); GetPaletteEntries(defaultPalette, 0, 10, g_systemPalette);
GetPaletteEntries(defaultPalette, 246, 10, &g_systemPalette[246]); GetPaletteEntries(defaultPalette, 10, 10, &g_systemPalette[246]);
Gdi::VirtualScreen::updatePalette(); Gdi::VirtualScreen::updatePalette();
HOOK_FUNCTION(gdi32, GetSystemPaletteEntries, getSystemPaletteEntries); HOOK_FUNCTION(gdi32, GetSystemPaletteEntries, getSystemPaletteEntries);