ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 19:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PALGDI to PALETTE as it's called in gdikdx.

Browse Source 
svn path=/trunk/; revision=40434
This commit is contained in:
Timo Kreuzer
2009-04-09 22:28:54 +00:00
parent fdaa172e95
commit 23ae1270fb
14 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/win32/win32k/eng/palette.c
+4 -4
View File
@@ -36,7 +36,7 @@
//
//
VOID FASTCALL
ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors)
ColorCorrection(PPALETTE PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors)
{
PPDEVOBJ ppdev = (PPDEVOBJ)PalGDI->hPDev;
@@ -91,10 +91,10 @@ EngDeletePalette(IN HPALETTE Palette)
ULONG APIENTRY
PALOBJ_cGetColors(PALOBJ *PalObj, ULONG Start, ULONG Colors, ULONG *PaletteEntry)
{
PALGDI *PalGDI;
PALETTE *PalGDI;
PalGDI = (PALGDI*)PalObj;
/* PalGDI = (PALGDI*)AccessInternalObjectFromUserObject(PalObj); */
PalGDI = (PALETTE*)PalObj;
/* PalGDI = (PALETTE*)AccessInternalObjectFromUserObject(PalObj); */
if (Start >= PalGDI->NumColors)
return 0;
reactos/subsystems/win32/win32k/eng/xlate.c
+8 -8
View File
@@ -95,7 +95,7 @@ ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
}
static __inline VOID
BitMasksFromPal(USHORT PalType, PPALGDI Palette,
BitMasksFromPal(USHORT PalType, PPALETTE Palette,
PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
{
static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{0xFF, 0x00, 0x00}};
@@ -152,8 +152,8 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
PALGDI *SourcePalGDI = 0;
PALGDI *DestPalGDI = 0;
PALETTE *SourcePalGDI = 0;
PALETTE *DestPalGDI = 0;
ULONG SourceRedMask = 0, SourceGreenMask = 0, SourceBlueMask = 0;
ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0;
ULONG i;
@@ -297,7 +297,7 @@ IntEngCreateMonoXlate(
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
PALGDI *SourcePalGDI;
PALETTE *SourcePalGDI;
XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ);
if (XlateGDI == NULL)
@@ -363,7 +363,7 @@ IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
PALGDI *DestPalGDI;
PALETTE *DestPalGDI;
DestPalGDI = PALETTE_LockPalette(PaletteDest);
if (DestPalGDI == NULL)
@@ -487,7 +487,7 @@ IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, SURFACE* psurfDest, SURFACE* psurf
/* DIB sections need special handling */
if (psurfSrc->hSecure)
{
PPALGDI ppal = PALETTE_LockPalette(psurfSrc->hDIBPalette);
PPALETTE ppal = PALETTE_LockPalette(psurfSrc->hDIBPalette);
if (ppal)
{
XlateObj = IntEngCreateSrcMonoXlate(DestPalette, ((ULONG*)ppal->IndexedColors)[0], ((ULONG*)ppal->IndexedColors)[1]);
@@ -564,7 +564,7 @@ ULONG APIENTRY
XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
{
XLATEGDI *XlateGDI;
PALGDI *PalGDI;
PALETTE *PalGDI;
ULONG Closest;
/* Return the original color if there's no color translation object. */
@@ -623,7 +623,7 @@ XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, ULONG PalOutType, ULONG cPal,
{
HPALETTE hPalette;
XLATEGDI *XlateGDI;
PALGDI *PalGDI;
PALETTE *PalGDI;
ULONG *InPal;
XlateGDI = ObjToGDI(XlateObj, XLATE);
reactos/subsystems/win32/win32k/include/dc.h
+1 -1
View File
@@ -43,7 +43,7 @@ typedef struct _XCLIPOBJ
typedef struct _DCLEVEL
{
HPALETTE hpal;
struct _PALGDI * ppal;
struct _PALETTE * ppal;
PVOID pColorSpace; /* COLORSPACE* */
LONG lIcmMode;
LONG lSaveDepth;
reactos/subsystems/win32/win32k/include/palette.h
+4 -4
View File
@@ -40,7 +40,7 @@ typedef struct
int max;
} ColorShifts;
typedef struct _PALGDI
typedef struct _PALETTE
{
/* Header for all gdi objects in the handle table.
Do not (re)move this. */
@@ -56,7 +56,7 @@ typedef struct _PALGDI
ULONG GreenMask;
ULONG BlueMask;
HDEV hPDev;
} PALGDI, *PPALGDI;
} PALETTE, *PPALETTE;
HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode,
ULONG NumColors,
@@ -68,7 +68,7 @@ HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
CONST RGBQUAD *Colors);
#define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette, GDIObjType_PAL_TYPE)
#define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)
#define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
#define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
#define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPalette)
BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody);
@@ -79,7 +79,7 @@ INT APIENTRY PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BO
#endif
INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color);
INT FASTCALL PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer);
INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer);
PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID);
HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL);
reactos/subsystems/win32/win32k/include/pdevobj.h
+1 -1
View File
@@ -86,7 +86,7 @@ typedef struct _PDEVOBJ
// ULONG TagSig;
// PLDEVOBJ pldev;
DHPDEV hPDev; /* dhpdev, DHPDEV for device. */
PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */
PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */
DEVINFO DevInfo; // devinfo
GDIINFO GDIInfo; // gdiinfo
HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */
reactos/subsystems/win32/win32k/objects/bitblt.c
+1 -1
View File
@@ -347,7 +347,7 @@ NtGdiTransparentBlt(
SURFACE *BitmapDest, *BitmapSrc = NULL;
XLATEOBJ *XlateObj = NULL;
HPALETTE SourcePalette = 0, DestPalette = 0;
PPALGDI PalDestGDI, PalSourceGDI;
PPALETTE PalDestGDI, PalSourceGDI;
USHORT PalDestMode, PalSrcMode;
ULONG TransparentColor = 0;
BOOL Ret = FALSE;
reactos/subsystems/win32/win32k/objects/bitmaps.c
+1 -1
View File
@@ -218,7 +218,7 @@ IntCreateCompatibleBitmap(
{
/* Copy the color table */
UINT Index;
PPALGDI PalGDI = PALETTE_LockPalette(psurf->hDIBPalette);
PPALETTE PalGDI = PALETTE_LockPalette(psurf->hDIBPalette);
if (!PalGDI)
{
reactos/subsystems/win32/win32k/objects/color.c
+13 -13
View File
@@ -84,14 +84,14 @@ IntAnimatePalette(HPALETTE hPal,
if( hPal != NtGdiGetStockObject(DEFAULT_PALETTE) )
{
PPALGDI palPtr;
PPALETTE palPtr;
UINT pal_entries;
HDC hDC;
PDC dc;
PWINDOW_OBJECT Wnd;
const PALETTEENTRY *pptr = PaletteColors;
palPtr = (PPALGDI)PALETTE_LockPalette(hPal);
palPtr = (PPALETTE)PALETTE_LockPalette(hPal);
if (!palPtr) return FALSE;
pal_entries = palPtr->NumColors;
@@ -246,7 +246,7 @@ HPALETTE APIENTRY NtGdiCreateHalftonePalette(HDC hDC)
HPALETTE APIENTRY
NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries )
{
PPALGDI PalGDI;
PPALETTE PalGDI;
HPALETTE NewPalette;
pLogPal->palNumEntries = cEntries;
@@ -260,7 +260,7 @@ NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries )
return NULL;
}
PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette);
PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette);
if (PalGDI != NULL)
{
PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors);
@@ -295,14 +295,14 @@ COLORREF APIENTRY NtGdiGetNearestColor(HDC hDC, COLORREF Color)
{
COLORREF nearest = CLR_INVALID;
PDC dc;
PPALGDI palGDI;
PPALETTE palGDI;
LONG RBits, GBits, BBits;
dc = DC_LockDc(hDC);
if (NULL != dc)
{
HPALETTE hpal = dc->dclevel.hpal;
palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
if (!palGDI)
{
DC_UnlockDc(dc);
@@ -339,7 +339,7 @@ COLORREF APIENTRY NtGdiGetNearestColor(HDC hDC, COLORREF Color)
UINT APIENTRY NtGdiGetNearestPaletteIndex(HPALETTE hpal,
COLORREF Color)
{
PPALGDI palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
PPALETTE palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
UINT index = 0;
if (NULL != palGDI)
@@ -358,10 +358,10 @@ IntGetPaletteEntries(HPALETTE hpal,
UINT Entries,
LPPALETTEENTRY pe)
{
PPALGDI palGDI;
PPALETTE palGDI;
UINT numEntries;
palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
if (NULL == palGDI)
{
return 0;
@@ -403,7 +403,7 @@ IntGetSystemPaletteEntries(HDC hDC,
UINT Entries,
LPPALETTEENTRY pe)
{
PPALGDI palGDI = NULL;
PPALETTE palGDI = NULL;
PDC dc = NULL;
UINT EntriesSize = 0;
UINT Ret = 0;
@@ -489,7 +489,7 @@ UINT FASTCALL IntGdiRealizePalette(HDC hDC)
* of bugs in it.
*/
PPALGDI palGDI, sysGDI;
PPALETTE palGDI, sysGDI;
int realized = 0;
PDC dc;
HPALETTE systemPalette;
@@ -608,7 +608,7 @@ IntSetPaletteEntries(HPALETTE hpal,
UINT Entries,
CONST LPPALETTEENTRY pe)
{
PPALGDI palGDI;
PPALETTE palGDI;
WORD numEntries;
if ((UINT)hpal & GDI_HANDLE_STOCK_MASK)
@@ -670,7 +670,7 @@ APIENTRY
NtGdiUnrealizeObject(HGDIOBJ hgdiobj)
{
BOOL Ret = FALSE;
PPALGDI palGDI;
PPALETTE palGDI;
if ( !hgdiobj ||
((UINT)hgdiobj & GDI_HANDLE_STOCK_MASK) ||
reactos/subsystems/win32/win32k/objects/dcobjs.c
+1 -1
View File
@@ -247,7 +247,7 @@ GdiSelectPalette(
{
PDC pdc;
HPALETTE oldPal = NULL;
PPALGDI ppal;
PPALETTE ppal;
// FIXME: mark the palette as a [fore\back]ground pal
pdc = DC_LockDc(hDC);
reactos/subsystems/win32/win32k/objects/dibobj.c
+7 -7
View File
@@ -74,7 +74,7 @@ IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Color
{
PDC dc;
PSURFACE psurf;
PPALGDI PalGDI;
PPALETTE PalGDI;
UINT Index;
ULONG biBitCount;
@@ -143,7 +143,7 @@ IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors)
{
PDC dc;
PSURFACE psurf;
PPALGDI PalGDI;
PPALETTE PalGDI;
UINT Index;
ULONG biBitCount;
@@ -226,7 +226,7 @@ IntSetDIBits(
POINTL ZeroPoint;
RECTL DestRect;
XLATEOBJ *XlateObj;
PPALGDI hDCPalette;
PPALETTE hDCPalette;
//RGBQUAD *lpRGB;
HPALETTE DDB_Palette, DIB_Palette;
ULONG DDB_Palette_Type, DIB_Palette_Type;
@@ -446,7 +446,7 @@ NtGdiSetDIBitsToDeviceInternal(
INT DIBWidth;
SIZEL SourceSize;
XLATEOBJ *XlateObj = NULL;
PPALGDI pDCPalette;
PPALETTE pDCPalette;
HPALETTE DDBPalette, DIBPalette = NULL;
ULONG DDBPaletteType, DIBPaletteType;
@@ -606,8 +606,8 @@ NtGdiGetDIBitsInternal(HDC hDC,
HBITMAP hDestBitmap = NULL;
HPALETTE hSourcePalette = NULL;
HPALETTE hDestPalette = NULL;
PPALGDI SourcePalette = NULL;
PPALGDI DestPalette = NULL;
PPALETTE SourcePalette = NULL;
PPALETTE DestPalette = NULL;
NTSTATUS Status = STATUS_SUCCESS;
ULONG Result = 0;
BOOL bPaletteMatch = FALSE;
@@ -1615,7 +1615,7 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
RGBQUAD *lpRGB;
ULONG nNumColors,i;
USHORT *lpIndex;
PPALGDI palGDI;
PPALETTE palGDI;
palGDI = PALETTE_LockPalette(dc->dclevel.hpal);
reactos/subsystems/win32/win32k/objects/fillshap.c
+1 -1
View File
@@ -851,7 +851,7 @@ IntGdiGradientFill(
ULONG ulMode)
{
SURFACE *psurf;
PPALGDI PalDestGDI;
PPALETTE PalDestGDI;
XLATEOBJ *XlateObj;
RECTL Extent;
POINTL DitherOrg;
reactos/subsystems/win32/win32k/objects/gdiobj.c
+2 -2
View File
@@ -50,7 +50,7 @@ OBJ_TYPE_INFO ObjTypeInfo[BASE_OBJTYPE_COUNT] =
{1, sizeof(SURFACE), TAG_SURFACE, SURFACE_Cleanup}, /* 05 SURFACE */
{1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... */
{1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */
{1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */
{1, sizeof(PALETTE), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */
{1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09 ICMLCS, */
{1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */
{0, 0, TAG_RFONT, NULL}, /* 0b RFONT, unused */
@@ -1721,7 +1721,7 @@ IntGdiGetObject(IN HANDLE Handle,
break;
case GDI_OBJECT_TYPE_PALETTE:
Result = PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuffer);
Result = PALETTE_GetObject((PPALETTE) pGdiObject, cbCount, lpBuffer);
break;
default:
reactos/subsystems/win32/win32k/objects/icm.c
+1 -1
View File
@@ -232,7 +232,7 @@ FASTCALL
UpdateDeviceGammaRamp( HDEV hPDev )
{
BOOL Ret = FALSE;
PPALGDI palGDI;
PPALETTE palGDI;
PALOBJ *palPtr;
PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
reactos/subsystems/win32/win32k/objects/palobj.c
+8 -8
View File
@@ -42,7 +42,7 @@ PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID)
BOOL INTERNAL_CALL
PALETTE_Cleanup(PVOID ObjectBody)
{
PPALGDI pPal = (PPALGDI)ObjectBody;
PPALETTE pPal = (PPALETTE)ObjectBody;
if (NULL != pPal->IndexedColors)
{
ExFreePool(pPal->IndexedColors);
@@ -61,9 +61,9 @@ PALETTE_AllocPalette(ULONG Mode,
ULONG Blue)
{
HPALETTE NewPalette;
PPALGDI PalGDI;
PPALETTE PalGDI;
PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
if (!PalGDI)
{
return NULL;
@@ -108,10 +108,10 @@ PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
CONST RGBQUAD *Colors)
{
HPALETTE NewPalette;
PPALGDI PalGDI;
PPALETTE PalGDI;
UINT i;
PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
if (!PalGDI)
{
return NULL;
@@ -229,8 +229,8 @@ INT APIENTRY PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL map
int index, iRemapped = 0;
int *mapping;
HPALETTE hSysPal = NtGdiGetStockObject(DEFAULT_PALETTE);
PPALGDI pSysPal = PALETTE_LockPalette(hSysPal);
PPALGDI palGDI = CONTAINING_RECORD(palPtr,PALGDI,PalObj);
PPALETTE pSysPal = PALETTE_LockPalette(hSysPal);
PPALETTE palGDI = CONTAINING_RECORD(palPtr,PALETTE,PalObj);
/* FIXME - handle pSysPal == NULL!!!!!!! */
COLOR_sysPal = pSysPal->IndexedColors;
@@ -339,7 +339,7 @@ INT APIENTRY PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL map
#endif
INT FASTCALL
PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer)
PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer)
{
if (!lpBuffer)
{