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

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

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS win32 subsystem
* PURPOSE: Mouse pointer functions
* FILE: subsystems/win32k/eng/mouse.c
@ -420,7 +420,7 @@ EngSetPointerShape(
BWColors, 0, 0, 0);
DestPalette = ppdev->DevInfo.hpalDefault;
pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED,
pgp->XlateObject = IntEngCreateXlate(0, 0,
DestPalette, BWPalette);
EngDeletePalette(BWPalette);
}

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

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

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

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

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

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

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

@ -314,7 +314,7 @@ IntSetDIBits(
}
// 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)
{
PALETTE_FreePaletteByHandle(DIB_Palette);

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

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

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

@ -988,18 +988,6 @@ HT_Get8BPPMaskPalette(
return 0;
}
/*
* @unimplemented
*/
HANDLE APIENTRY
XLATEOBJ_hGetColorTransform(
IN XLATEOBJ *XlateObj)
{
UNIMPLEMENTED;
return NULL;
}
/*
* @unimplemented
*/
@ -2747,7 +2735,7 @@ EngFntCacheAlloc(IN ULONG FastCheckSum,
UNIMPLEMENTED;
return NULL;
}
VOID
APIENTRY
EngFntCacheFault(IN ULONG ulFastCheckSum,
@ -2755,7 +2743,7 @@ EngFntCacheFault(IN ULONG ulFastCheckSum,
{
UNIMPLEMENTED;
}
PVOID
APIENTRY
EngFntCacheLookUp(IN ULONG FastCheckSum,
@ -2772,7 +2760,7 @@ FLOATOBJ_AddFloatObj(PFLOATOBJ pFloatObj1,
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
@ -2780,7 +2768,7 @@ FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
@ -2788,7 +2776,7 @@ FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
@ -2796,7 +2784,7 @@ FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
{
UNIMPLEMENTED;
}
PVOID
APIENTRY
EngAllocSectionMem(IN PVOID SectionObject,
@ -2807,7 +2795,7 @@ EngAllocSectionMem(IN PVOID SectionObject,
UNIMPLEMENTED;
return NULL;
}
NTSTATUS
APIENTRY
EngFileIoControl(IN PFILE_OBJECT FileObject,
@ -2821,7 +2809,7 @@ EngFileIoControl(IN PFILE_OBJECT FileObject,
UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED;
}
VOID
APIENTRY
EngFileWrite(IN PFILE_OBJECT FileObject,
@ -2831,7 +2819,7 @@ EngFileWrite(IN PFILE_OBJECT FileObject,
{
UNIMPLEMENTED;
}
BOOLEAN
APIENTRY
EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
@ -2856,7 +2844,7 @@ EngGetTickCount(VOID)
return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
(Multiplier * (TickCount.HighPart << 8)));
}
BOOLEAN
APIENTRY
EngMapSection(IN PVOID Section,
@ -2867,7 +2855,7 @@ EngMapSection(IN PVOID Section,
UNIMPLEMENTED;
return FALSE;
}
BOOLEAN
APIENTRY
EngNineGrid(IN SURFOBJ* pDestSurfaceObj,