ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: GetPaletteEntries should not filter peFlags (test included).

Browse Source
This commit is contained in:
Roderick Colenbrander 2008-02-17 13:57:16 +00:00 committed by Alexandre Julliard
parent 1fa9e526ff
commit c937634376
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/palette.c
View File

@ -300,9 +300,6 @@ UINT WINAPI GetPaletteEntries(
} }
memcpy( entries, &palPtr->logpalette.palPalEntry[start], memcpy( entries, &palPtr->logpalette.palPalEntry[start],
count * sizeof(PALETTEENTRY) ); count * sizeof(PALETTEENTRY) );
for( numEntries = 0; numEntries < count ; numEntries++ )
if (entries[numEntries].peFlags & 0xF0)
entries[numEntries].peFlags = 0;
} }
GDI_ReleaseObj( hpalette ); GDI_ReleaseObj( hpalette );

26
dlls/gdi32/tests/palette.c
View File

@ -120,7 +120,33 @@ static void test_DIB_PAL_COLORS(void) {
ReleaseDC( NULL, hdc ); ReleaseDC( NULL, hdc );
} }
static void test_palette_entries(void)
{
char logpalettebuf[sizeof(LOGPALETTE) + sizeof(logpalettedata)];
PLOGPALETTE logpalette = (PLOGPALETTE)logpalettebuf;
HPALETTE hpal;
UINT res=0;
PALETTEENTRY palEntry = { 0x1, 0x2, 0x3, 0xff };
PALETTEENTRY getEntryResult;
/* Initalize the logical palette with a few colours */
logpalette->palVersion = 0x300;
logpalette->palNumEntries = 8;
memcpy( logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata) );
hpal = CreatePalette( logpalette );
/* Set a new entry with peFlags to 0xff */
SetPaletteEntries(hpal, 0, 1, &palEntry);
/* Retrieve the entry to see if GDI32 performs any filtering on peFlags */
res = GetPaletteEntries(hpal, 0, 1, &getEntryResult);
ok(res == 1, "GetPaletteEntries should have returned 1 but returned %d\n", res);
ok( palEntry.peFlags == getEntryResult.peFlags, "palEntry.peFlags (%#x) != getEntryResult.peFlags (%#x)\n", palEntry.peFlags, getEntryResult.peFlags );
}
START_TEST(palette) START_TEST(palette)
{ {
test_DIB_PAL_COLORS(); test_DIB_PAL_COLORS();
test_palette_entries();
} }