From 8dce1974ed0ce1c860139b818e5ed420bca82f7c Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Wed, 24 Oct 2007 23:18:05 +0000
Subject: [PATCH] Fix the build of ReactX and smaller typos

svn path=/branches/reactx/; revision=29859
---
 reactos/drivers/directx/dxg/dxg_int.h           | 9 +++++++++
 reactos/include/reactos/drivers/directx/dxeng.h | 4 +---
 reactos/subsystems/win32/win32k/ntddraw/dxeng.c | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/reactos/drivers/directx/dxg/dxg_int.h b/reactos/drivers/directx/dxg/dxg_int.h
index 996b3941f80..24135a1e967 100644
--- a/reactos/drivers/directx/dxg/dxg_int.h
+++ b/reactos/drivers/directx/dxg/dxg_int.h
@@ -21,6 +21,8 @@
 #include <dde.h>
 #include <wincon.h>
 
+#include <reactos/drivers/directx/directxint.h>
+
 #include <reactos/win32k/ntgdityp.h>
 #include <reactos/win32k/ntgdihdl.h>
 
@@ -44,3 +46,10 @@ DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize);
 BOOL DdHmgCreate();
 BOOL DdHmgDestroy();
 
+/* define stuff */
+#define drvDxEngLockDC          gpEngFuncs[DXENG_INDEX_DxEngLockDC]
+#define drvDxEngGetDCState      gpEngFuncs[DXENG_INDEX_DxEngGetDCState]
+#define drvDxEngGetHdevData     gpEngFuncs[DXENG_INDEX_DxEngGetHdevData]
+#define drvDxEngUnlockDC        gpEngFuncs[DXENG_INDEX_DxEngUnlockDC]
+#define drvDxEngUnlockHdev      gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev]
+#define drvDxEngLockHdev        gpEngFuncs[DXENG_INDEX_DxEngLockHdev]
diff --git a/reactos/include/reactos/drivers/directx/dxeng.h b/reactos/include/reactos/drivers/directx/dxeng.h
index f132845e1d8..12a03222988 100644
--- a/reactos/include/reactos/drivers/directx/dxeng.h
+++ b/reactos/include/reactos/drivers/directx/dxeng.h
@@ -132,8 +132,7 @@ DWORD DxEngIncDispUniq();
 /* resverd in msdn for internal use in win32k */
 #define HDEVGETDATA_DWRESERVED19                1
 
-/* Get the destory palette functions */
-#define HDEVGETDATA_PFN_DESTORYPALETTE          2
+#define HDEVGETDATA_PALETTECALLBACKS_DWFLAGS    2
 
 /* resverd in msdn for internal use in win32k */
 #define HDEVGETDATA_DWRESERVED24                3
@@ -141,7 +140,6 @@ DWORD DxEngIncDispUniq();
 /* Unknown */
 #define HDEVGETDATA_UNK_54C_20                  4
 
-/* Get the DD_CALLBACKS dwSize member value */
 #define DEVGETDATA_PALETTECALLBACKS_DWSIZE      5
 
 /* Unknown */
diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
index f39663e53c0..0d937b61b48 100644
--- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
+++ b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
@@ -318,8 +318,8 @@ DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl,
         case HDEVGETDATA_DWRESERVED19:
             return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19;
 
-        case HDEVGETDATA_PFN_DESTORYPALETTE:
-            return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette;
+        case HDEVGETDATA_PALETTECALLBACKS_DWFLAGS:
+            return (DWORD)pEDDgpl->ddPaletteCallbacks.dwFlags;
 
         case HDEVGETDATA_DWRESERVED24:
             return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24;