Author: jimtabor
Date: Tue Apr 21 07:10:54 2009
New Revision: 40626
URL: http://svn.reactos.org/svn/reactos?rev=40626&view=rev
Log:
- Add more EMF records types.
Modified:
trunk/reactos/include/psdk/wingdi.h
trunk/reactos/include/reactos/win32k/ntuser.h
Modified: trunk/reactos/include/psdk/wingdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=40626&r1=40625&r2=40626&view=diff
==============================================================================
--- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Apr 21 07:10:54 2009
@@ -166,6 +166,25 @@
#define EMR_GLSRECORD 102
#define EMR_GLSBOUNDEDRECORD 103
#define EMR_PIXELFORMAT 104
+#if (_WIN32_WINNT >= 0x0500)
+#define EMR_DRAWESCAPE 105
+#define EMR_EXTESCAPE 106
+#define EMR_STARTDOC 107
+#define EMR_SMALLTEXTOUT 108
+#define EMR_FORCEUFIMAPPING 109
+#define EMR_NAMEDESCAPE 110
+#define EMR_COLORCORRECTPALETTE 111
+#define EMR_SETICMPROFILEA 112
+#define EMR_SETICMPROFILEW 113
+#define EMR_ALPHABLEND 114
+#define EMR_ALPHADIBBLEND 115
+#define EMR_TRANSPARENTBLT 116
+#define EMR_TRANSPARENTDIB 117
+#define EMR_GRADIENTFILL 118
+#define EMR_SETLINKEDUFIS 119
+#define EMR_SETTEXTJUSTIFICATION 120
+#define EMR_COLORMATCHTOTARGETW 121
+#endif
#define ENHMETA_SIGNATURE 1179469088
#define EPS_SIGNATURE 0x46535045
#if (_WIN32_WINNT >= 0x0500)
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=40626&r1=40625&r2=40626&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Apr 21
07:10:54 2009
@@ -2,7 +2,7 @@
#define __WIN32K_NTUSER_H
struct _PROCESSINFO;
-struct _W32THREADINFO;
+struct _THREADINFO;
struct _WINDOW;
typedef struct _LARGE_UNICODE_STRING
@@ -149,7 +149,7 @@
keeps a reference to this structure until all the information
is moved to this structure */
struct _PROCESSINFO *pi; /* FIXME: Move to object header some day */
- struct _W32THREADINFO *ti;
+ struct _THREADINFO *ti;
struct _DESKTOP *pdesktop;
RECT WindowRect;
RECT ClientRect;
@@ -362,16 +362,6 @@
DWORD dwcPumpHook;
} CLIENTTHREADINFO, *PCLIENTTHREADINFO;
-typedef struct _W32THREADINFO
-{
- PPROCESSINFO ppi; /* [KERNEL] */
- PDESKTOPINFO pDeskInfo;
-// PVOID DesktopHeapBase;
-// ULONG_PTR DesktopHeapLimit;
- /* A mask of what hooks are currently active */
- ULONG fsHooks;
- CLIENTTHREADINFO ClientThreadInfo;
-} W32THREADINFO, *PW32THREADINFO;
/* Window Client Information structure */
struct _ETHREAD;
@@ -433,6 +423,59 @@
#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo))
+#include <pshpack1.h>
+
+typedef struct _TL
+{
+ struct _TL* next;
+ PVOID pobj;
+ PVOID pfnFree;
+} TL, *PTL;
+
+typedef struct _W32THREAD
+{
+ struct _ETHREAD* pEThread;
+ ULONG RefCount;
+ PTL ptlW32;
+ PVOID pgdiDcattr;
+ PVOID pgdiBrushAttr;
+ PVOID pUMPDObjs;
+ PVOID pUMPDHeap;
+ DWORD dwEngAcquireCount;
+ PVOID pSemTable;
+ PVOID pUMPDObj;
+} W32THREAD, *PW32THREAD;
+
+typedef struct _THREADINFO
+{
+ W32THREAD XzyxW32Thread; /* Do not use! */
+ PTL ptl;
+ PPROCESSINFO ppi;
+ struct _USER_MESSAGE_QUEUE* MessageQueue;
+ struct _KBL* KeyboardLayout;
+ PCLIENTTHREADINFO pcti;
+ struct _DESKTOP* Desktop;
+ PDESKTOPINFO pDeskInfo;
+ PCLIENTINFO pClientInfo;
+ FLONG TIF_flags;
+ HANDLE hDesktop;
+ UINT cPaintsReady; /* Count of paints pending. */
+ UINT cTimersReady; /* Count of timers pending. */
+ LIST_ENTRY PtiLink;
+ ULONG fsHooks;
+
+ CLIENTTHREADINFO cti; /* Internal to win32k */
+/* ReactOS */
+ LIST_ENTRY WindowListHead;
+ LIST_ENTRY W32CallbackListHead;
+ BOOLEAN IsExiting;
+ SINGLE_LIST_ENTRY ReferencesList;
+
+} THREADINFO, *PTHREADINFO;
+
+#include <poppack.h>
+
+
// Server event activity bits.
#define SRV_EVENT_MENU 0x0001
#define SRV_EVENT_END_APPLICATION 0x0002
@@ -465,7 +508,7 @@
LUID luid;
} BROADCASTPARM, *PBROADCASTPARM;
-PW32THREADINFO GetW32ThreadInfo(VOID);
+PTHREADINFO GetW32ThreadInfo(VOID);
PPROCESSINFO GetW32ProcessInfo(VOID);
typedef struct _WNDMSG
