Author: greatlrd
Date: Thu Oct 25 03:18:05 2007
New Revision: 29859
URL:
http://svn.reactos.org/svn/reactos?rev=29859&view=rev
Log:
Fix the build of ReactX and smaller typos
Modified:
branches/reactx/reactos/drivers/directx/dxg/dxg_int.h
branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h
branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/…
==============================================================================
--- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original)
+++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Thu Oct 25 03:18:05 2007
@@ -20,6 +20,8 @@
#include <prntfont.h>
#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 @@
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]
Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/…
==============================================================================
--- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original)
+++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Thu Oct 25 03:18:05
2007
@@ -132,8 +132,7 @@
/* 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 @@
/* Unknown */
#define HDEVGETDATA_UNK_54C_20 4
-/* Get the DD_CALLBACKS dwSize member value */
#define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5
/* Unknown */
Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Oct 25 03:18:05
2007
@@ -318,8 +318,8 @@
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;