mirror of
https://github.com/reactos/reactos.git
synced 2025-02-25 09:50:02 +00:00
- Move XLATEOBJ_hGetColorTransform to xlate.c
- 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:
parent
5b403acdfc
commit
8333c72806
7 changed files with 35 additions and 27 deletions
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS win32 subsystem
|
* PROJECT: ReactOS win32 subsystem
|
||||||
* PURPOSE: Mouse pointer functions
|
* PURPOSE: Mouse pointer functions
|
||||||
* FILE: subsystems/win32k/eng/mouse.c
|
* FILE: subsystems/win32k/eng/mouse.c
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -988,18 +988,6 @@ HT_Get8BPPMaskPalette(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* @unimplemented
|
|
||||||
*/
|
|
||||||
HANDLE APIENTRY
|
|
||||||
XLATEOBJ_hGetColorTransform(
|
|
||||||
IN XLATEOBJ *XlateObj)
|
|
||||||
{
|
|
||||||
UNIMPLEMENTED;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @unimplemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
|
@ -2747,7 +2735,7 @@ EngFntCacheAlloc(IN ULONG FastCheckSum,
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngFntCacheFault(IN ULONG ulFastCheckSum,
|
EngFntCacheFault(IN ULONG ulFastCheckSum,
|
||||||
|
@ -2755,7 +2743,7 @@ EngFntCacheFault(IN ULONG ulFastCheckSum,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
PVOID
|
PVOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngFntCacheLookUp(IN ULONG FastCheckSum,
|
EngFntCacheLookUp(IN ULONG FastCheckSum,
|
||||||
|
@ -2772,7 +2760,7 @@ FLOATOBJ_AddFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
|
FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
|
@ -2780,7 +2768,7 @@ FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
|
FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
|
@ -2788,7 +2776,7 @@ FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
|
FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
|
@ -2796,7 +2784,7 @@ FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
PVOID
|
PVOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngAllocSectionMem(IN PVOID SectionObject,
|
EngAllocSectionMem(IN PVOID SectionObject,
|
||||||
|
@ -2807,7 +2795,7 @@ EngAllocSectionMem(IN PVOID SectionObject,
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngFileIoControl(IN PFILE_OBJECT FileObject,
|
EngFileIoControl(IN PFILE_OBJECT FileObject,
|
||||||
|
@ -2821,7 +2809,7 @@ EngFileIoControl(IN PFILE_OBJECT FileObject,
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return STATUS_NOT_IMPLEMENTED;
|
return STATUS_NOT_IMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngFileWrite(IN PFILE_OBJECT FileObject,
|
EngFileWrite(IN PFILE_OBJECT FileObject,
|
||||||
|
@ -2831,7 +2819,7 @@ EngFileWrite(IN PFILE_OBJECT FileObject,
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
|
EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
|
||||||
|
@ -2856,7 +2844,7 @@ EngGetTickCount(VOID)
|
||||||
return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
|
return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
|
||||||
(Multiplier * (TickCount.HighPart << 8)));
|
(Multiplier * (TickCount.HighPart << 8)));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngMapSection(IN PVOID Section,
|
EngMapSection(IN PVOID Section,
|
||||||
|
@ -2867,7 +2855,7 @@ EngMapSection(IN PVOID Section,
|
||||||
UNIMPLEMENTED;
|
UNIMPLEMENTED;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
APIENTRY
|
APIENTRY
|
||||||
EngNineGrid(IN SURFOBJ* pDestSurfaceObj,
|
EngNineGrid(IN SURFOBJ* pDestSurfaceObj,
|
||||||
|
|
Loading…
Reference in a new issue