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

Corrected naming convention on CompatPrimarySurface variables

Browse Source
This commit is contained in:
narzoul 2016-08-10 14:14:39 +02:00
parent b8a674ffdd
commit 08fb2fc9b4
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DDrawCompat/CompatDirectDrawPalette.cpp
View File

@ -19,11 +19,11 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawPalette::SetEntries(
DWORD dwCount,
LPPALETTEENTRY lpEntries)
{
if (This == CompatPrimarySurface::palette)
if (This == CompatPrimarySurface::g_palette)
{
waitForNextUpdate();
if (lpEntries && dwStartingEntry + dwCount <= 256 &&
0 == std::memcmp(&CompatPrimarySurface::paletteEntries[dwStartingEntry],
0 == std::memcmp(&CompatPrimarySurface::g_paletteEntries[dwStartingEntry],
lpEntries, dwCount * sizeof(PALETTEENTRY)))
{
return DD_OK;
@ -31,9 +31,9 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawPalette::SetEntries(
}
HRESULT result = s_origVtable.SetEntries(This, dwFlags, dwStartingEntry, dwCount, lpEntries);
if (This == CompatPrimarySurface::palette && SUCCEEDED(result))
if (This == CompatPrimarySurface::g_palette && SUCCEEDED(result))
{
std::memcpy(&CompatPrimarySurface::paletteEntries[dwStartingEntry], lpEntries,
std::memcpy(&CompatPrimarySurface::g_paletteEntries[dwStartingEntry], lpEntries,
dwCount * sizeof(PALETTEENTRY));
RealPrimarySurface::updatePalette(dwStartingEntry, dwCount);
}

4
DDrawCompat/CompatDirectDrawSurface.cpp
View File

@ -497,7 +497,7 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawSurface<TSurface>::SetPalette(
{
CompatDirectDrawPalette::waitForNextUpdate();
}
if (lpDDPalette == CompatPrimarySurface::palette)
if (lpDDPalette == CompatPrimarySurface::g_palette)
{
return DD_OK;
}
@ -506,7 +506,7 @@ HRESULT STDMETHODCALLTYPE CompatDirectDrawSurface<TSurface>::SetPalette(
HRESULT result = s_origVtable.SetPalette(This, lpDDPalette);
if (isPrimary && SUCCEEDED(result))
{
CompatPrimarySurface::palette = lpDDPalette;
CompatPrimarySurface::g_palette = lpDDPalette;
RealPrimarySurface::setPalette();
}
return result;

2
DDrawCompat/CompatGdi.cpp
View File

@ -239,7 +239,7 @@ namespace CompatGdi
void updatePalette(DWORD startingEntry, DWORD count)
{
if (isEmulationEnabled() && CompatPrimarySurface::palette)
if (isEmulationEnabled() && CompatPrimarySurface::g_palette)
{
CompatGdiDcCache::updatePalette(startingEntry, count);
}

6
DDrawCompat/CompatGdiDcCache.cpp
View File

@ -200,15 +200,15 @@ namespace CompatGdiDcCache
{
PALETTEENTRY entries[256] = {};
std::memcpy(&entries[startingEntry],
&CompatPrimarySurface::paletteEntries[startingEntry],
&CompatPrimarySurface::g_paletteEntries[startingEntry],
count * sizeof(PALETTEENTRY));
for (DWORD i = startingEntry; i < startingEntry + count; ++i)
{
if (entries[i].peFlags & PC_RESERVED)
{
entries[i] = CompatPrimarySurface::paletteEntries[0];
entries[i].peFlags = CompatPrimarySurface::paletteEntries[i].peFlags;
entries[i] = CompatPrimarySurface::g_paletteEntries[0];
entries[i].peFlags = CompatPrimarySurface::g_paletteEntries[i].peFlags;
}
}

4
DDrawCompat/CompatPaletteConverter.cpp
View File

@ -149,10 +149,10 @@ namespace CompatPaletteConverter
void updatePalette(DWORD startingEntry, DWORD count)
{
if (g_dc && CompatPrimarySurface::palette)
if (g_dc && CompatPrimarySurface::g_palette)
{
RGBQUAD entries[256] = {};
std::memcpy(entries, &CompatPrimarySurface::paletteEntries[startingEntry],
std::memcpy(entries, &CompatPrimarySurface::g_paletteEntries[startingEntry],
count * sizeof(PALETTEENTRY));
convertPaletteEntriesToRgbQuad(entries, count);
SetDIBColorTable(g_dc, startingEntry, count, entries);

8
DDrawCompat/CompatPrimarySurface.cpp
View File

@ -22,8 +22,8 @@ namespace
g_primarySurfacePtrs.clear();
g_primarySurface = nullptr;
CompatPrimarySurface::palette = nullptr;
ZeroMemory(&CompatPrimarySurface::paletteEntries, sizeof(CompatPrimarySurface::paletteEntries));
CompatPrimarySurface::g_palette = nullptr;
ZeroMemory(&CompatPrimarySurface::g_paletteEntries, sizeof(CompatPrimarySurface::g_paletteEntries));
ZeroMemory(&g_primarySurfaceDesc, sizeof(g_primarySurfaceDesc));
RealPrimarySurface::release();
@ -76,6 +76,6 @@ namespace CompatPrimarySurface
releaseNotifierPtr, sizeof(releaseNotifierPtr), DDSPD_IUNKNOWNPOINTER);
}
CompatWeakPtr<IDirectDrawPalette> palette;
PALETTEENTRY paletteEntries[256] = {};
CompatWeakPtr<IDirectDrawPalette> g_palette;
PALETTEENTRY g_paletteEntries[256] = {};
}

4
DDrawCompat/CompatPrimarySurface.h
View File

@ -16,6 +16,6 @@ namespace CompatPrimarySurface
bool isPrimary(void* surface);
void setPrimary(CompatRef<IDirectDrawSurface7> surface);
extern CompatWeakPtr<IDirectDrawPalette> palette;
extern PALETTEENTRY paletteEntries[256];
extern CompatWeakPtr<IDirectDrawPalette> g_palette;
extern PALETTEENTRY g_paletteEntries[256];
}

4
DDrawCompat/RealPrimarySurface.cpp
View File

@ -350,7 +350,7 @@ void RealPrimarySurface::setPalette()
{
if (g_surfaceDesc.ddpfPixelFormat.dwRGBBitCount <= 8)
{
g_frontBuffer->SetPalette(g_frontBuffer, CompatPrimarySurface::palette);
g_frontBuffer->SetPalette(g_frontBuffer, CompatPrimarySurface::g_palette);
}
updatePalette(0, 256);
@ -376,7 +376,7 @@ void RealPrimarySurface::updatePalette(DWORD startingEntry, DWORD count)
{
CompatPaletteConverter::updatePalette(startingEntry, count);
CompatGdi::updatePalette(startingEntry, count);
if (CompatPrimarySurface::palette)
if (CompatPrimarySurface::g_palette)
{
invalidate(nullptr);
update();