Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the build of ReactX and smaller typos

Browse source 
svn path=/branches/reactx/; revision=29859
This commit is contained in:
Magnus Olsen 2007-10-24 23:18:05 +00:00
parent d1c1e99025
commit 8dce1974ed
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/drivers/directx/dxg/dxg_int.h
View file

@ -21,6 +21,8 @@
#include <dde.h> #include <dde.h>
#include <wincon.h> #include <wincon.h>
#include <reactos/drivers/directx/directxint.h>
#include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdityp.h>
#include <reactos/win32k/ntgdihdl.h> #include <reactos/win32k/ntgdihdl.h>
@ -44,3 +46,10 @@ DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize);
BOOL DdHmgCreate(); BOOL DdHmgCreate();
BOOL DdHmgDestroy(); 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]

4
reactos/include/reactos/drivers/directx/dxeng.h
View file

@ -132,8 +132,7 @@ DWORD DxEngIncDispUniq();
/* resverd in msdn for internal use in win32k */ /* resverd in msdn for internal use in win32k */
#define HDEVGETDATA_DWRESERVED19 1 #define HDEVGETDATA_DWRESERVED19 1
/* Get the destory palette functions */ #define HDEVGETDATA_PALETTECALLBACKS_DWFLAGS 2
#define HDEVGETDATA_PFN_DESTORYPALETTE 2
/* resverd in msdn for internal use in win32k */ /* resverd in msdn for internal use in win32k */
#define HDEVGETDATA_DWRESERVED24 3 #define HDEVGETDATA_DWRESERVED24 3
@ -141,7 +140,6 @@ DWORD DxEngIncDispUniq();
/* Unknown */ /* Unknown */
#define HDEVGETDATA_UNK_54C_20 4 #define HDEVGETDATA_UNK_54C_20 4
/* Get the DD_CALLBACKS dwSize member value */
#define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5 #define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5
/* Unknown */ /* Unknown */

4
reactos/subsystems/win32/win32k/ntddraw/dxeng.c
View file

@ -318,8 +318,8 @@ DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl,
case HDEVGETDATA_DWRESERVED19: case HDEVGETDATA_DWRESERVED19:
return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19; return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19;
case HDEVGETDATA_PFN_DESTORYPALETTE: case HDEVGETDATA_PALETTECALLBACKS_DWFLAGS:
return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette; return (DWORD)pEDDgpl->ddPaletteCallbacks.dwFlags;
case HDEVGETDATA_DWRESERVED24: case HDEVGETDATA_DWRESERVED24:
return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24; return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24;