Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Move XLATEOBJ_hGetColorTransform to xlate.c

Browse source 
- Implement InitXlateImpl(), that currently does ... nothing :)
- Don't pass a palette type to IntEngCreateXlate, when already passing a valid palette.

svn path=/trunk/; revision=41847
This commit is contained in:
Timo Kreuzer 2009-07-10 17:01:12 +00:00
parent 5b403acdfc
commit 8333c72806
7 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/eng/mouse.c
View file

@ -420,7 +420,7 @@ EngSetPointerShape(
BWColors, 0, 0, 0); BWColors, 0, 0, 0);
DestPalette = ppdev->DevInfo.hpalDefault; DestPalette = ppdev->DevInfo.hpalDefault;
pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED, pgp->XlateObject = IntEngCreateXlate(0, 0,
DestPalette, BWPalette); DestPalette, BWPalette);
EngDeletePalette(BWPalette); EngDeletePalette(BWPalette);
} }

16
reactos/subsystems/win32/win32k/eng/xlate.c
View file

@ -32,6 +32,11 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
VOID
InitXlateImpl(VOID)
{
}
static __inline ULONG static __inline ULONG
ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color) ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
{ {
@ -671,6 +676,17 @@ XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, ULONG PalOutType, ULONG cPal,
return 0; return 0;
} }
/*
* @unimplemented
*/
HANDLE APIENTRY
XLATEOBJ_hGetColorTransform(
IN XLATEOBJ *XlateObj)
{
UNIMPLEMENTED;
return NULL;
}
// HACK! // HACK!
XLATEOBJ* XLATEOBJ*
IntCreateBrushXlate(PDC pdc, BRUSH *pbrush) IntCreateBrushXlate(PDC pdc, BRUSH *pbrush)

2
reactos/subsystems/win32/win32k/include/inteng.h
View file

@ -90,6 +90,8 @@ IntEngGradientFill(SURFOBJ *psoDest,
POINTL *pptlDitherOrg, POINTL *pptlDitherOrg,
ULONG ulMode); ULONG ulMode);
VOID InitXlateImpl(VOID);
XLATEOBJ* FASTCALL XLATEOBJ* FASTCALL
IntEngCreateXlate(USHORT DestPalType, IntEngCreateXlate(USHORT DestPalType,
USHORT SourcePalType, USHORT SourcePalType,

2
reactos/subsystems/win32/win32k/main/dllmain.c
View file

@ -528,6 +528,8 @@ DriverEntry (
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
InitXlateImpl();
/* Create stock objects, ie. precreated objects commonly /* Create stock objects, ie. precreated objects commonly
used by win32 applications */ used by win32 applications */
CreateStockObjects(); CreateStockObjects();

2
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -314,7 +314,7 @@ IntSetDIBits(
} }
// Determine XLATEOBJ for color translation // Determine XLATEOBJ for color translation
XlateObj = IntEngCreateXlate(DDB_Palette_Type, DIB_Palette_Type, DDB_Palette, DIB_Palette); XlateObj = IntEngCreateXlate(0, 0, DDB_Palette, DIB_Palette);
if (NULL == XlateObj) if (NULL == XlateObj)
{ {
PALETTE_FreePaletteByHandle(DIB_Palette); PALETTE_FreePaletteByHandle(DIB_Palette);

2
reactos/subsystems/win32/win32k/objects/fillshap.c
View file

@ -923,7 +923,7 @@ IntGdiGradientFill(
PalDestGDI = PALETTE_LockPalette(hDestPalette); PalDestGDI = PALETTE_LockPalette(hDestPalette);
if (PalDestGDI) if (PalDestGDI)
{ {
Mode = PalDestGDI->Mode; Mode = 0;
PALETTE_UnlockPalette(PalDestGDI); PALETTE_UnlockPalette(PalDestGDI);
} }
else else

12
reactos/subsystems/win32/win32k/stubs/stubs.c
View file

@ -988,18 +988,6 @@ HT_Get8BPPMaskPalette(
return 0; return 0;
} }
/*
* @unimplemented
*/
HANDLE APIENTRY
XLATEOBJ_hGetColorTransform(
IN XLATEOBJ *XlateObj)
{
UNIMPLEMENTED;
return NULL;
}
/* /*
* @unimplemented * @unimplemented
*/ */