[ros-diffs] [sginsberg] 36589: - Sync Timo's float changes in winddi.h, ntgdityp.h and ntgdihdl.h to trunk - Make ntgdi.h more compatible with MS' version -- Define POLYPATBLT and the spooler routines internally, and don't define NtGdiFlushUserBatch outside win32k (not a system call since 2K3)

Author: sginsberg
Date: Mon Sep 29 07:45:22 2008
New Revision: 36589

URL: http://svn.reactos.org/svn/reactos?rev=36589&view=rev
Log:
- Sync Timo's float changes in winddi.h, ntgdityp.h and ntgdihdl.h to trunk
- Make ntgdi.h more compatible with MS' version -- Define POLYPATBLT and the spooler
routines internally, and don't define NtGdiFlushUserBatch outside win32k (not a system
call since 2K3)

Modified:
    branches/nwin32/include/ddk/winddi.h
    branches/nwin32/include/psdk/ntgdi.h
    branches/nwin32/include/reactos/win32k/ntgdihdl.h
    branches/nwin32/include/reactos/win32k/ntgdityp.h

Modified: branches/nwin32/include/ddk/winddi.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/ddk/winddi.h?rev…
==============================================================================
--- branches/nwin32/include/ddk/winddi.h [iso-8859-1] (original)
+++ branches/nwin32/include/ddk/winddi.h [iso-8859-1] Mon Sep 29 07:45:22 2008
@@ -2472,9 +2472,9 @@
 #define FLOATOBJ_Equal(pf, pf1)         (*(pf) == *(pf1))
 #define FLOATOBJ_GreaterThan(pf, pf1)   (*(pf) > *(pf1))
 #define FLOATOBJ_LessThan(pf, pf1)      (*(pf) < *(pf1))
-#define FLOATOBJ_EqualLong(pf, 1)       (*(pf) == (FLOAT)(1))
-#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1))
-#define FLOATOBJ_LessThanLong(pf, 1)    (*(pf) < (FLOAT)(1))
+#define FLOATOBJ_EqualLong(pf, l)       (*(pf) == (FLOAT)(l))
+#define FLOATOBJ_GreaterThanLong(pf, l) (*(pf) > (FLOAT)(l))
+#define FLOATOBJ_LessThanLong(pf, l)    (*(pf) < (FLOAT)(l))
 
 #endif
 

Modified: branches/nwin32/include/psdk/ntgdi.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev…
==============================================================================
--- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original)
+++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Sep 29 07:45:22 2008
@@ -61,14 +61,7 @@
     DWORD dwFlags;
 } LOGCOLORSPACEEXW, *PLOGCOLORSPACEEXW;
 
-typedef struct _POLYPATBLT
-{
-  INT nXLeft;
-  INT nYLeft;
-  INT nWidth;
-  INT nHeight;
-  HBRUSH hBrush;
-} POLYPATBLT, *PPOLYPATBLT;
+typedef struct _POLYPATBLT POLYPATBLT, *PPOLYPATBLT;
 
 /* NtGdiAddRemoteMMInstanceToDC */
 typedef struct tagDOWNLOADDESIGNVECTOR
@@ -1703,11 +1696,6 @@
 );
 
 W32KAPI
-NTSTATUS
-APIENTRY
-NtGdiFlushUserBatch(VOID);
-
-W32KAPI
 HRGN
 APIENTRY
 NtGdiPathToRegion(
@@ -3656,17 +3644,4 @@
     IN HANDLE h
 );
 
-W32KAPI
-BOOL
-APIENTRY
-NtGdiInitSpool();
-
-/* FIXME wrong prototypes fix the build */
-W32KAPI
-INT
-APIENTRY
-NtGdiGetSpoolMessage( DWORD u1,
-                      DWORD u2,
-                      DWORD u3,
-                      DWORD u4);
 #endif

Modified: branches/nwin32/include/reactos/win32k/ntgdihdl.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n…
==============================================================================
--- branches/nwin32/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original)
+++ branches/nwin32/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon Sep 29 07:45:22
2008
@@ -290,13 +290,13 @@
     LONG lBreakExtra;
     LONG cBreak;
     HANDLE hlfntNew;
-    MATRIX_S mxWorldToDevice;
-    MATRIX_S mxDeviceToWorld;
-    MATRIX_S mxWorldToPage;
-    EFLOAT_S efM11PtoD;
-    EFLOAT_S efM22PtoD;
-    EFLOAT_S efDxPtoD;
-    EFLOAT_S efDyPtoD;
+    MATRIX mxWorldToDevice;
+    MATRIX mxDeviceToWorld;
+    MATRIX mxWorldToPage;
+    FLOATOBJ efM11PtoD;
+    FLOATOBJ efM22PtoD;
+    FLOATOBJ efDxPtoD;
+    FLOATOBJ efDyPtoD;
     INT iMapMode;
     DWORD dwLayout;
     LONG lWindowOrgx;

Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n…
==============================================================================
--- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original)
+++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Sep 29 07:45:22
2008
@@ -101,6 +101,9 @@
 enum
 {
     MX_SCALE = 1,
+    MX_IDENTITYSCALE = 2,
+    MX_INTEGER = 4,
+    MX_NOTRANSLATE = 8,
 };
 
 typedef enum GDIObjType
@@ -174,6 +177,27 @@
 
 /* DEFINES *******************************************************************/
 
+/* Routines missing in ntgdi.h */
+#ifndef W32KAPI
+#define W32KAPI  DECLSPEC_ADDRSAFE
+#endif
+
+W32KAPI
+BOOL
+APIENTRY
+NtGdiInitSpool(
+    VOID
+);
+
+/* FIXME: prototypes */
+W32KAPI
+INT
+APIENTRY
+NtGdiGetSpoolMessage(DWORD u1,
+                     DWORD u2,
+                     DWORD u3,
+                     DWORD u4);
+
 #define GDIBATCHBUFSIZE 0x136*4
 #define GDI_BATCH_LIMIT 20
 
@@ -355,6 +379,19 @@
     FIX fxDy;
     FLONG flAccel;
 } MATRIX_S;
+
+typedef struct _MATRIX
+{
+    FLOATOBJ efM11;
+    FLOATOBJ efM12;
+    FLOATOBJ efM21;
+    FLOATOBJ efM22;
+    FLOATOBJ efDx;
+    FLOATOBJ efDy;
+    FIX fxDx;
+    FIX fxDy;
+    FLONG flAccel;
+} MATRIX, *PMATRIX;
 
 /* Gdi XForm storage union */
 typedef union