[ros-diffs] [jimtabor] 24551: Win32k GDI Compatibility Project: - Add new Gdi user data structure - Fixed Meta constants - Add new GetDCWord constant

Author: jimtabor
Date: Tue Oct 17 08:32:18 2006
New Revision: 24551

URL: http://svn.reactos.org/svn/reactos?rev=24551&view=rev
Log:
Win32k GDI Compatibility Project:
- Add new Gdi user data structure
- Fixed Meta constants
- Add new GetDCWord constant

Modified:
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/include/reactos/win32k/ntgdihdl.h
    trunk/reactos/include/reactos/win32k/ntgdityp.h

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Oct 17 08:32:18 2006
@@ -422,7 +422,7 @@
 	CONST LPBYTE	Data
 	);
 
-/* Should be done in user-mode. */
+/* Should be NtGdiFlush. */
 BOOL STDCALL NtGdiGdiFlush (VOID);
 
 /* Should be done in user-mode. */

Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Oct 17 08:32:18 2006
@@ -43,10 +43,10 @@
 #define GDI_OBJECT_TYPE_PEN         0x00300000
 #define GDI_OBJECT_TYPE_EXTPEN      0x00500000
 #define GDI_OBJECT_TYPE_COLORSPACE  0x00090000
+#define GDI_OBJECT_TYPE_METADC      0x00660000
+#define GDI_OBJECT_TYPE_METAFILE    0x00260000
+#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000
 /* Following object types made up for ROS */
-#define GDI_OBJECT_TYPE_METADC      0x00710000
-#define GDI_OBJECT_TYPE_METAFILE    0x00720000
-#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00730000
 #define GDI_OBJECT_TYPE_ENHMETADC   0x00740000
 #define GDI_OBJECT_TYPE_MEMDC       0x00750000
 #define GDI_OBJECT_TYPE_DCE         0x00770000
@@ -84,4 +84,25 @@
     PVOID UserData;   /* Points to the user mode structure, usually NULL though */
 } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;
 
+
+typedef struct _GDI_USER_DATA
+{
+  COLORREF  PenColor;
+  COLORREF  BrushColor;
+  INT  ROPmode;
+  INT  PolyFillMode;
+  INT  StretchBltMode;
+  INT  BackgroundMode;
+  COLORREF  BackgroundColor;
+  COLORREF  TextColor;
+  HCOLORSPACE  ColorSpace;
+  INT  TextAlign;         /* Text alignment from SetTextAlign() */
+  INT  CharExtra;         /* Spacing from SetTextCharacterExtra() */
+  INT  GraphicsMode;      /* Graphics mode */
+  INT  MapMode;
+  HFONT  hFont;
+  DWORD  Layout;
+} GDI_USER_DATA, *PGDI_USER_DATA;
+
+
 #endif

Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdityp.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Oct 17 08:32:18 2006
@@ -45,6 +45,7 @@
 {
     GdiGetRelAbs = 1,
     GdiGetArcDirection = 4,
+    GdiGetFontLanguageInfo = 6,
     GdiGetIsMemDc = 7,
 } GETDCDWORD, *PGETDCDWORD;