Merge numerous changes from ReactOS. Submitted by Filip Navara.

3 files changed, 34 insertions, 17 deletions

diff --git a/winsup/w32api/include/ddk/ntapi.h b/winsup/w32api/include/ddk/ntapi.h
index a9a6b6e5c..c653e765b 100644
--- a/winsup/w32api/include/ddk/ntapi.h
+++ b/winsup/w32api/include/ddk/ntapi.h
@@ -48,6 +48,12 @@ typedef PVOID POBJECT_TYPE_LIST;
 typedef PVOID PEXECUTION_STATE;
 typedef PVOID PLANGID;
 
+#ifndef NtCurrentProcess
+#define NtCurrentProcess() ((HANDLE)0xFFFFFFFF)
+#endif /* NtCurrentProcess */
+#ifndef NtCurrentThread
+#define NtCurrentThread() ((HANDLE)0xFFFFFFFE)
+#endif /* NtCurrentThread */
 
 /* System information and control */
 
@@ -1924,9 +1930,6 @@ NTAPI
 ZwStopProfile(
   IN HANDLE  ProfileHandle);
 
-
-
-
 /* Local Procedure Call (LPC) */
 
 typedef struct _LPC_MESSAGE {
@@ -1940,6 +1943,8 @@ typedef struct _LPC_MESSAGE {
 	UCHAR  Data[ANYSIZE_ARRAY];
 } LPC_MESSAGE, *PLPC_MESSAGE;
 
+#define LPC_MESSAGE_BASE_SIZE	24
+
 typedef enum _LPC_TYPE {
 	LPC_NEW_MESSAGE,
 	LPC_REQUEST,
diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h
index b09c16306..0621d83c6 100644
--- a/winsup/w32api/include/ddk/ntifs.h
+++ b/winsup/w32api/include/ddk/ntifs.h
@@ -32,11 +32,11 @@
 extern "C" {
 #endif
 
-#pragma pack(push,4)
-
 #include "ntddk.h"
 #include "ntapi.h"
 
+#pragma pack(push,4)
+
 #define VER_PRODUCTBUILD 10000
 
 #ifndef NTSYSAPI
diff --git a/winsup/w32api/include/ddk/winddi.h b/winsup/w32api/include/ddk/winddi.h
index 5659e6f89..c658f4910 100644
--- a/winsup/w32api/include/ddk/winddi.h
+++ b/winsup/w32api/include/ddk/winddi.h
@@ -38,12 +38,9 @@ extern "C" {
 #include "ntddk.h"
 #include <wingdi.h>
 
-#if 1
+#ifndef __DD_INCLUDED__
 /* FIXME: Some DirectDraw structures not added yet */
 typedef ULONG_PTR FLATPTR;
-typedef PVOID LPVIDMEM;
-typedef PVOID LPVMEMHEAP;
-typedef PVOID PGLYPHOS;
 typedef struct _DD_SURFACECALLBACKS {
 } DD_SURFACECALLBACKS, *PDD_SURFACECALLBACKS;
 typedef struct _DD_PALETTECALLBACKS {
@@ -52,10 +49,6 @@ typedef struct _DD_CALLBACKS {
 } DD_CALLBACKS, *PDD_CALLBACKS;
 typedef struct _DD_HALINFO {
 } DD_HALINFO, *PDD_HALINFO;
-typedef struct _DDSCAPS {
-} DDSCAPS, *PDDSCAPS;
-typedef struct _DDSCAPSEX {
-} DDSCAPSEX, *PDDSCAPSEX;
 typedef struct _VIDEOMEMORY {
 } VIDEOMEMORY, *LPVIDEOMEMORY;
 typedef struct _DD_DIRECTDRAW_GLOBAL {
@@ -64,6 +57,18 @@ typedef struct _DD_SURFACE_LOCAL {
 } DD_SURFACE_LOCAL, *PDD_SURFACE_LOCAL, *LPDD_SURFACE_LOCAL;
 #endif
 
+#ifndef __DDRAWI_INCLUDED__
+typedef PVOID LPVIDMEM;
+#endif
+
+#if !defined(__DD_INCLUDED__) && !defined(__DDRAWI_INCLUDED__)
+typedef struct _DDSCAPS {
+} DDSCAPS, *PDDSCAPS;
+typedef struct _DDSCAPSEX {
+} DDSCAPSEX, *PDDSCAPSEX;
+typedef PVOID LPVMEMHEAP;
+#endif
+
 #if defined(_WIN32K_)
 #define WIN32KAPI DECL_EXPORT
 #else
@@ -464,6 +469,13 @@ typedef struct _DRVENABLEDATA {
 
 DECLARE_HANDLE(HSEMAPHORE);
 
+typedef struct {
+  DWORD  nSize;
+  HDC  hdc;
+  PBYTE  pvEMF;
+  PBYTE  pvCurrentRecord;
+} EMFINFO, *PEMFINFO;
+
 typedef struct _ENGSAFESEMAPHORE {
   HSEMAPHORE  hsem;
   LONG  lCount;
@@ -2147,7 +2159,7 @@ EngStretchBlt(
   IN CLIPOBJ  *pco,
   IN XLATEOBJ  *pxlo,
   IN COLORADJUSTMENT  *pca,
-  IN POINTL  pptlHTOrg,
+  IN POINTL  *pptlHTOrg,
   IN RECTL  *prclDest,
   IN RECTL  *prclSrc,
   IN POINTL  *pptlMask,
@@ -2211,7 +2223,7 @@ EngTextOut(
   IN RECTL  *prclOpaque,
   IN BRUSHOBJ  *pboFore,
   IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  pptlOrg,
+  IN POINTL  *pptlOrg,
   IN MIX  mix);
 
 WIN32KAPI
@@ -2490,7 +2502,7 @@ FONTOBJ_cGetGlyphs(
   IN ULONG  iMode,
   IN ULONG  cGlyph,
   IN HGLYPH  *phg,
-  OUT PVOID  **ppvGlyph);
+  OUT PVOID  *ppvGlyph);
 
 WIN32KAPI
 FD_GLYPHSET*
@@ -2684,7 +2696,7 @@ DDKAPI
 STROBJ_bEnumPositionsOnly(
   IN STROBJ  *pstro,
   OUT ULONG  *pc,
-  OUT PGLYPHOS  **ppgpos);
+  OUT PGLYPHPOS  *ppgpos);
 
 WIN32KAPI
 BOOL