[ros-diffs] [tkreuzer] 41847: - 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.

Author: tkreuzer
Date: Fri Jul 10 21:01:12 2009
New Revision: 41847

URL: http://svn.reactos.org/svn/reactos?rev=41847&view=rev
Log:
- 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.

Modified:
    trunk/reactos/subsystems/win32/win32k/eng/mouse.c
    trunk/reactos/subsystems/win32/win32k/eng/xlate.c
    trunk/reactos/subsystems/win32/win32k/include/inteng.h
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
    trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
    trunk/reactos/subsystems/win32/win32k/stubs/stubs.c

Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Jul 10 21:01:12
2009
@@ -1,4 +1,4 @@
-/* 
+/*
  * PROJECT:          ReactOS win32 subsystem
  * PURPOSE:          Mouse pointer functions
  * FILE:             subsystems/win32k/eng/mouse.c
@@ -420,7 +420,7 @@
                                      BWColors, 0, 0, 0);
 
         DestPalette = ppdev->DevInfo.hpalDefault;
-        pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED,
+        pgp->XlateObject = IntEngCreateXlate(0, 0,
                                              DestPalette, BWPalette);
         EngDeletePalette(BWPalette);
     }

Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Jul 10 21:01:12
2009
@@ -31,6 +31,11 @@
 
 #define NDEBUG
 #include <debug.h>
+
+VOID
+InitXlateImpl(VOID)
+{
+}
 
 static __inline ULONG
 ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
@@ -671,6 +676,17 @@
    return 0;
 }
 
+/*
+ * @unimplemented
+ */
+HANDLE APIENTRY
+XLATEOBJ_hGetColorTransform(
+   IN XLATEOBJ *XlateObj)
+{
+   UNIMPLEMENTED;
+   return NULL;
+}
+
 // HACK!
 XLATEOBJ*
 IntCreateBrushXlate(PDC pdc, BRUSH *pbrush)

Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Fri Jul 10
21:01:12 2009
@@ -89,6 +89,8 @@
                    RECTL *prclExtents,
                    POINTL *pptlDitherOrg,
                    ULONG ulMode);
+
+VOID InitXlateImpl(VOID);
 
 XLATEOBJ* FASTCALL
 IntEngCreateXlate(USHORT DestPalType,

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri Jul 10 21:01:12
2009
@@ -528,6 +528,8 @@
       return STATUS_UNSUCCESSFUL;
     }
 
+  InitXlateImpl();
+
   /* Create stock objects, ie. precreated objects commonly
      used by win32 applications */
   CreateStockObjects();

Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Jul 10
21:01:12 2009
@@ -314,7 +314,7 @@
     }
 
     // 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);

Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Fri Jul 10
21:01:12 2009
@@ -923,7 +923,7 @@
     PalDestGDI = PALETTE_LockPalette(hDestPalette);
     if (PalDestGDI)
     {
-        Mode = PalDestGDI->Mode;
+        Mode = 0;
         PALETTE_UnlockPalette(PalDestGDI);
     }
     else

Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Fri Jul 10 21:01:12
2009
@@ -987,18 +987,6 @@
    UNIMPLEMENTED;
    return 0;
 }
-
-/*
- * @unimplemented
- */
-HANDLE APIENTRY
-XLATEOBJ_hGetColorTransform(
-   IN XLATEOBJ *XlateObj)
-{
-   UNIMPLEMENTED;
-   return NULL;
-}
-
 
 /*
  * @unimplemented
@@ -2747,7 +2735,7 @@
     UNIMPLEMENTED;
     return NULL;
 }
- 
+
 VOID
 APIENTRY
 EngFntCacheFault(IN ULONG ulFastCheckSum,
@@ -2755,7 +2743,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 PVOID
 APIENTRY
 EngFntCacheLookUp(IN ULONG FastCheckSum,
@@ -2772,7 +2760,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 VOID
 APIENTRY
 FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
@@ -2780,7 +2768,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 VOID
 APIENTRY
 FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
@@ -2788,7 +2776,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 VOID
 APIENTRY
 FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
@@ -2796,7 +2784,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 PVOID
 APIENTRY
 EngAllocSectionMem(IN PVOID SectionObject,
@@ -2807,7 +2795,7 @@
     UNIMPLEMENTED;
     return NULL;
 }
- 
+
 NTSTATUS
 APIENTRY
 EngFileIoControl(IN PFILE_OBJECT FileObject,
@@ -2821,7 +2809,7 @@
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
 }
- 
+
 VOID
 APIENTRY
 EngFileWrite(IN PFILE_OBJECT FileObject,
@@ -2831,7 +2819,7 @@
 {
     UNIMPLEMENTED;
 }
- 
+
 BOOLEAN
 APIENTRY
 EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
@@ -2856,7 +2844,7 @@
     return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
             (Multiplier * (TickCount.HighPart << 8)));
 }
- 
+
 BOOLEAN
 APIENTRY
 EngMapSection(IN PVOID Section,
@@ -2867,7 +2855,7 @@
     UNIMPLEMENTED;
     return FALSE;
 }
- 
+
 BOOLEAN
 APIENTRY
 EngNineGrid(IN SURFOBJ* pDestSurfaceObj,