gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices. (try 5)

Anton Baskanov baskanov at gmail.com
Sat Oct 17 10:35:01 CDT 2015


Signed-off-by: Anton Baskanov <baskanov at gmail.com>

Fixes rendering artifacts in Marble Drop and also bug https://bugs.winehq.org/show_bug.cgi?id=39171

try3:
 - fixed incorrect condition (spotted by Sebastian Lackner)
 - added tests from Sebastian Lackner
 - use metafile instead of memory dc in tests

try4:
 - removed unused variable

try5:
 - moved the code for getting the default entries to nulldrv_GetSystemPaletteEntries()
---
 dlls/gdi32/driver.c        |  25 +++++++++
 dlls/gdi32/tests/palette.c | 126 +++++++++++++++++++++++++++++++++++++++++++++
 dlls/winex11.drv/palette.c |   5 ++
 3 files changed, 156 insertions(+)

diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index a6b138c..2dc423b 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -373,6 +373,31 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT
 
 static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries )
 {
+    if (entries && start < 256)
+    {
+        UINT i;
+        const RGBQUAD *default_entries;
+
+        if (start + count > 256) count = 256 - start;
+
+        default_entries = get_default_color_table( 8 );
+        for (i = 0; i < count; ++i)
+        {
+            if (start + i < 10 || start + i >= 246)
+            {
+                entries[i].peRed = default_entries[start + i].rgbRed;
+                entries[i].peGreen = default_entries[start + i].rgbGreen;
+                entries[i].peBlue = default_entries[start + i].rgbBlue;
+            }
+            else
+            {
+                entries[i].peRed = 0;
+                entries[i].peGreen = 0;
+                entries[i].peBlue = 0;
+            }
+            entries[i].peFlags = 0;
+        }
+    }
     return 0;
 }
 
diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c
index f95c0d3..043a49c 100644
--- a/dlls/gdi32/tests/palette.c
+++ b/dlls/gdi32/tests/palette.c
@@ -191,9 +191,135 @@ static void test_halftone_palette(void)
     ReleaseDC( 0, hdc );
 }
 
+static void check_system_palette_entries(HDC hdc)
+{
+    PALETTEENTRY entries[256];
+    PALETTEENTRY defpal[20];
+    int i, count;
+
+    memset( defpal, 0xaa, sizeof(defpal) );
+    count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal );
+    ok( count == 20, "wrong size %u\n", count );
+
+    memset( entries, 0x55, sizeof(entries) );
+    count = GetSystemPaletteEntries( hdc, 0, 256, entries );
+    ok( count == 0, "wrong size %u\n", count);
+    for (i = 0; i < 10; i++)
+    {
+        ok( entries[i].peRed   == defpal[i].peRed &&
+            entries[i].peGreen == defpal[i].peGreen &&
+            entries[i].peBlue  == defpal[i].peBlue &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags,
+            defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue );
+    }
+    for (i = 10; i < 246; ++i)
+    {
+        ok( !entries[i].peRed   &&
+            !entries[i].peGreen &&
+            !entries[i].peBlue  &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags);
+    }
+    for (i = 246; i < 256; i++)
+    {
+        int idx = i - 246 + 10;
+        ok( entries[i].peRed   == defpal[idx].peRed &&
+            entries[i].peGreen == defpal[idx].peGreen &&
+            entries[i].peBlue  == defpal[idx].peBlue &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags,
+            defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue );
+    }
+
+    memset( entries, 0x55, sizeof(entries) );
+    count = GetSystemPaletteEntries( hdc, 0, 10, entries );
+    ok( count == 0, "wrong size %u\n", count);
+    for (i = 0; i < 10; i++)
+    {
+        ok( entries[i].peRed   == defpal[i].peRed &&
+            entries[i].peGreen == defpal[i].peGreen &&
+            entries[i].peBlue  == defpal[i].peBlue &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags,
+            defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue );
+    }
+
+    memset( entries, 0x55, sizeof(entries) );
+    count = GetSystemPaletteEntries( hdc, 10, 246, entries );
+    ok( count == 0, "wrong size %u\n", count);
+    for (i = 0; i < 236; ++i)
+    {
+        ok( !entries[i].peRed   &&
+            !entries[i].peGreen &&
+            !entries[i].peBlue  &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags);
+    }
+    for (i = 236; i < 246; i++)
+    {
+        int idx = i - 236 + 10;
+        ok( entries[i].peRed   == defpal[idx].peRed &&
+            entries[i].peGreen == defpal[idx].peGreen &&
+            entries[i].peBlue  == defpal[idx].peBlue &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags,
+            defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue );
+    }
+
+    memset( entries, 0x55, sizeof(entries) );
+    count = GetSystemPaletteEntries( hdc, 246, 10, entries );
+    ok( count == 0, "wrong size %u\n", count);
+    for (i = 0; i < 10; i++)
+    {
+        int idx = i + 10;
+        ok( entries[i].peRed   == defpal[idx].peRed &&
+            entries[i].peGreen == defpal[idx].peGreen &&
+            entries[i].peBlue  == defpal[idx].peBlue &&
+            !entries[i].peFlags,
+            "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i,
+            entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags,
+            defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue );
+    }
+}
+
+static void test_system_palette_entries()
+{
+    HDC hdc;
+    HDC metafile_dc;
+    HMETAFILE metafile;
+
+    hdc = GetDC(0);
+
+    if (!(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE))
+    {
+        check_system_palette_entries(hdc);
+    }
+    else
+    {
+        skip( "device is palette-based, skipping test\n" );
+    }
+
+    ReleaseDC( 0, hdc );
+
+    metafile_dc = CreateMetaFileA(NULL);
+
+    check_system_palette_entries(metafile_dc);
+
+    metafile = CloseMetaFile(metafile_dc);
+    DeleteMetaFile(metafile);
+}
+
 START_TEST(palette)
 {
     test_DIB_PAL_COLORS();
     test_palette_entries();
     test_halftone_palette();
+    test_system_palette_entries();
 }
diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c
index a399ec9..460615c 100644
--- a/dlls/winex11.drv/palette.c
+++ b/dlls/winex11.drv/palette.c
@@ -1215,6 +1215,11 @@ UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALE
 {
     UINT i;
 
+    if (!palette_size)
+    {
+        dev = GET_NEXT_PHYSDEV(dev, pGetSystemPaletteEntries);
+        return dev->funcs->pGetSystemPaletteEntries(dev, start, count, entries);
+    }
     if (!entries) return palette_size;
     if (start >= palette_size) return 0;
     if (start + count >= palette_size) count = palette_size - start;
-- 
2.1.0




More information about the wine-patches mailing list