Alexandre Julliard : gdi32: Moved the system palette flags to winex11.drv.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed4f22ab5f204742b6e8745c2354a0e3802bdf6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed4f22ab5f204742b6e8745c2354a0e3802bdf6a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Nov 17 13:13:34 2006 +0100

gdi32: Moved the system palette flags to winex11.drv.

---

 dlls/gdi32/palette.c       |   19 -------------------
 dlls/winex11.drv/palette.c |    4 +++-
 include/gdi.h              |    3 ---
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index 52893a0..c136656 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -130,16 +130,6 @@ HPALETTE PALETTE_Init(void)
     return hpalette;
 }
 
-/***********************************************************************
- *           PALETTE_ValidateFlags
- */
-static void PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, int size)
-{
-    int i = 0;
-    for( ; i<size ; i++ )
-        lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07);
-}
-
 
 /***********************************************************************
  * CreatePalette [GDI32.@]
@@ -166,8 +156,6 @@ HPALETTE WINAPI CreatePalette(
                                         PALETTE_MAGIC, (HGDIOBJ *)&hpalette,
 					&palette_funcs ))) return 0;
     memcpy( &palettePtr->logpalette, palette, size );
-    PALETTE_ValidateFlags(palettePtr->logpalette.palPalEntry,
-			  palettePtr->logpalette.palNumEntries);
     palettePtr->mapping = NULL;
     GDI_ReleaseObj( hpalette );
 
@@ -358,8 +346,6 @@ UINT WINAPI SetPaletteEntries(
     if (start+count > numEntries) count = numEntries - start;
     memcpy( &palPtr->logpalette.palPalEntry[start], entries,
 	    count * sizeof(PALETTEENTRY) );
-    PALETTE_ValidateFlags(palPtr->logpalette.palPalEntry,
-			  palPtr->logpalette.palNumEntries);
     UnrealizeObject( hpalette );
     GDI_ReleaseObj( hpalette );
     return count;
@@ -413,8 +399,6 @@ BOOL WINAPI ResizePalette(
 	if( mapping )
 	    memset(palPtr->mapping + cPrevEnt, 0, (cEntries - cPrevEnt)*sizeof(int));
 	memset( (BYTE*)palPtr + prevsize, 0, size - prevsize );
-        PALETTE_ValidateFlags((PALETTEENTRY*)((BYTE*)palPtr + prevsize),
-						     cEntries - cPrevEnt );
     }
     palPtr->logpalette.palNumEntries = cEntries;
     palPtr->logpalette.palVersion = prevVer;
@@ -470,7 +454,6 @@ BOOL WINAPI AnimatePalette(
               pptr->peRed, pptr->peGreen, pptr->peBlue);
             memcpy( &palPtr->logpalette.palPalEntry[StartIndex], pptr,
                     sizeof(PALETTEENTRY) );
-            PALETTE_ValidateFlags(&palPtr->logpalette.palPalEntry[StartIndex], 1);
           } else {
             TRACE("Not animating entry %d -- not PC_RESERVED\n", StartIndex);
           }
@@ -592,8 +575,6 @@ UINT WINAPI GetNearestPaletteIndex(
 
         for( i = 0; i < palObj->logpalette.palNumEntries && diff ; i++, entry++)
         {
-            if (!(entry->peFlags & PC_SYS_USED)) continue;
-
             r = entry->peRed - GetRValue(color);
             g = entry->peGreen - GetGValue(color);
             b = entry->peBlue - GetBValue(color);
diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c
index f7ec7ad..1bf3ec8 100644
--- a/dlls/winex11.drv/palette.c
+++ b/dlls/winex11.drv/palette.c
@@ -48,6 +48,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette);
  * http://premium.microsoft.com/msdn/library/techart/f30/f34/f40/d4d/sa942.htm
  */
 
+#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
+#define PC_SYS_RESERVED        0x40 /* system palentry is not to be mapped to */
+
 static PALETTEENTRY *COLOR_sysPal; /* current system palette */
 
 static int COLOR_gapStart = 256;
@@ -1160,7 +1163,6 @@ static UINT X11DRV_PALETTE_SetMapping( P
 
                 index = X11DRV_SysPaletteLookupPixel( *(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), TRUE);
             }
-	    palPtr->logpalette.palPalEntry[uStart].peFlags |= PC_SYS_USED;
 
             if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index];
         }
diff --git a/include/gdi.h b/include/gdi.h
index 190ddd1..49b231f 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -70,9 +70,6 @@ typedef struct tagGDIOBJHDR
 
 #define NB_RESERVED_COLORS     20   /* number of fixed colors in system palette */
 
-#define PC_SYS_USED            0x80 /* palentry is used (both system and logical) */
-#define PC_SYS_RESERVED        0x40 /* system palentry is not to be mapped to */
-
 typedef struct tagPALETTEOBJ
 {
     GDIOBJHDR                    header;