[greatlrd] 29857: Header fix only --------------------- update DxEngGetHdevData define values in dxeng.h add new member to PDEV the _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; add missing struct D3DNTHAL_CALLBACKS2 and D3DNTHAL_CALLBACKS3 to ddk/d3dnthal.h add missing struct _EDD_DIRECTDRAW_LOCAL to directxint.h from "Windows Graphics Programming Win32 GDI and DirectDraw by Feng Yuan" fixed smaller typos in directxint.h
Author: greatlrd Date: Thu Oct 25 02:49:06 2007 New Revision: 29857
URL: http://svn.reactos.org/svn/reactos?rev=29857&view=rev Log: Header fix only --------------------- update DxEngGetHdevData define values in dxeng.h add new member to PDEV the _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; add missing struct D3DNTHAL_CALLBACKS2 and D3DNTHAL_CALLBACKS3 to ddk/d3dnthal.h add missing struct _EDD_DIRECTDRAW_LOCAL to directxint.h from "Windows Graphics Programming Win32 GDI and DirectDraw by Feng Yuan" fixed smaller typos in directxint.h
Modified: branches/reactx/reactos/include/ddk/d3dnthal.h branches/reactx/reactos/include/reactos/drivers/directx/directxint.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h
Modified: branches/reactx/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/ddk/d3dnt... ============================================================================== --- branches/reactx/reactos/include/ddk/d3dnthal.h (original) +++ branches/reactx/reactos/include/ddk/d3dnthal.h Thu Oct 25 02:49:06 2007 @@ -167,6 +167,36 @@ ULONG_PTR dwReserved9; } D3DNTHAL_CALLBACKS, *LPD3DNTHAL_CALLBACKS;
+typedef DWORD (APIENTRY *LPD3DNTHAL_SETRENDERTARGETCB)(LPD3DNTHAL_SETRENDERTARGETDATA); + +typedef struct _D3DNTHAL_CALLBACKS2 +{ + DWORD dwSize; + DWORD dwFlags; + + LPD3DNTHAL_SETRENDERTARGETCB SetRenderTarget; + LPVOID dwReserved1; + LPVOID dwReserved2; + LPVOID dwReserved3; + LPVOID dwReserved4; +} D3DNTHAL_CALLBACKS2, *LPD3DNTHAL_CALLBACKS2; + +typedef DWORD (APIENTRY *LPD3DNTHAL_CLEAR2CB)(LPD3DNTHAL_CLEAR2DATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_DRAWPRIMITIVES2CB)(LPD3DNTHAL_DRAWPRIMITIVES2DATA); + +typedef struct _D3DNTHAL_CALLBACKS3 +{ + DWORD dwSize; + DWORD dwFlags; + + LPD3DNTHAL_CLEAR2CB Clear2; + LPVOID lpvReserved; + LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB ValidateTextureStageState; + LPD3DNTHAL_DRAWPRIMITIVES2CB DrawPrimitives2; +} D3DNTHAL_CALLBACKS3, *LPD3DNTHAL_CALLBACKS3; + + typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA { ULONG_PTR dwhContext;
Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/d... ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Thu Oct 25 02:49:06 2007 @@ -1,20 +1,31 @@ -// -// Surface Object Flags -// -#define DDPF_ALPHAPIXELS 0x0001 -#define DDPF_ALPHA 0x0002 -#define DDPF_FOURCC 0x0004 -#define DDPF_PALETTEINDEXED4 0x0008 -#define DDPF_PALETTEINDEXEDTO8 0x0010 -#define DDPF_PALETTEINDEXED8 0x0020 -#define DDPF_RGB 0x0040 -#define DDPF_COMPRESSED 0x0080 -#define DDPF_RGBTOYUV 0x0100 -#define DDPF_YUV 0x0200 -#define DDPF_ZBUFFER 0x0400 -#define DDPF_PALETTEINDEXED1 0x0800 -#define DDPF_PALETTEINDEXED2 0x1000 -#define DDPF_ZPIXELS 0x2000 + +#ifndef _DXINTERNEL_ +#define _DXINTERNEL_ + +typedef struct _EDD_DIRECTDRAW_LOCAL +{ + // + // GDI Object Header + // + HANDLE hHmgr; + PVOID pEntry; + INT cExcLock; + HANDLE Tid; + + struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; + struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; + struct _EDD_SURFACE * peSurface_DdList; + ULONG unk_01c[2]; + struct _EDD_DIRECTDRAW_LOCAL * peDirectDrawLocalNext; + FLATPTR fpProcess; + FLONG fl; + HANDLE UniqueProcess; + PEPROCESS Process; + ULONG unk_038[2]; + VOID *unk_040; + VOID *unk_044; +} EDD_DIRECTDRAW_LOCAL, PEDD_DIRECTDRAW_LOCAL; +
// // Surface Object @@ -33,7 +44,7 @@ // Direct Draw Surface Data // DD_SURFACE_LOCAL ddsSurfaceLocal; - DD_SURCFACE_MORE ddsSurfaceMore; + DD_SURFACE_MORE ddsSurfaceMore; DD_SURFACE_GLOBAL ddsSurfaceGlobal; DD_SURFACE_INT ddsSurfaceInt;
@@ -77,7 +88,7 @@ // // Surface Lock // - ERECTL rclLock; + RECTL rclLock; ULONG field_FC[2]; } EDD_SURFACE, *PEDD_SURFACE;
@@ -89,17 +100,17 @@ /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; /* 0x018 */ LONG cDriverReferences; -/* 0x01C */ ULONG unk_01c[3]; /* CallBackFlags ? */ +/* 0x01C */ ULONG unk_01c[3]; /* 0x028 */ LONGLONG llAssertModeTimeout; /* 0x030 */ DWORD dwNumHeaps; /* 0x034 */ VIDEOMEMORY *pvmList; /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; -/* 0x040 */ DD_HHALINFO ddHalInfo; +/* 0x040 */ DD_HALINFO ddHalInfo; /* 0x1E0 */ ULONG unk_1e0[44]; /* 0x290 */ DD_CALLBACKS ddCallbacks; /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; -/* 0x304 */ DD_PALETTE_CALLBACKS ddPaletteCallbacks; +/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; /* 0x314 */ ULONG unk_314[48]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; @@ -127,4 +138,4 @@ /* 0x70C */ ULONG unk_70C; } EDD_DIRECTDRAW_GLOBAL, *PEDD_DIRECTDRAW_GLOBAL;
- +#endif
Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/d... ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Thu Oct 25 02:49:06 2007 @@ -95,14 +95,14 @@ DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpSpritesVisible(DWORD x1); -DWORD DxEngGetHdevData(DWORD x1, DWORD x2); +DWORD DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, DWORD Index); DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); DWORD DxEngCleanDC(DWORD x1); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngGetDCState(DWORD x1, DWORD x2); +DWORD DxEngGetDCState(HDC hDC, DWORD type); DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD DxEngDeleteSurface(DWORD x1); @@ -147,6 +147,18 @@ /* Unknown */ #define HDEVGETDATA_UNK_70C 6
+/* Get the DD_SURFACECALLBACKS dwFlag member value */ +#define HDEVGETDATA_SURFACECALLBACK_DWFLAGS 7 + +/* Unknown */ +#define HDEVGETDATA_UNK_588 8 + +/* Unknown */ +#define HDEVGETDATA_UNK_01C_F400 9 + +/* Unknown */ +#define HDEVGETDATA_UNK_01C_F20000 10 + /* Get if the driver is refens or not */ #define HDEVGETDATA_CDRIVERREF 16
Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/d... ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Thu Oct 25 02:49:06 2007 @@ -120,7 +120,7 @@ /***********************************************************************************/ /* Driver Functions Protypes */ /***********************************************************************************/ -typedef DWORD (NTAPI *PGD_DXDXGGENERICTHUNK)(ULONG_PTR, ULONG_PTR, SIZE_T *, PVOID, SIZE_T *, PVOID); +typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); //typedef x (NTAPI *PGD_DxD3dContextCreate)( //typedef x (NTAPI *PGD_DxD3dContextDestroy)( //typedef x (NTAPI *PGD_DxD3dContextDestroyAll)(
Modified: branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/w... ============================================================================== --- branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h Thu Oct 25 02:49:06 2007 @@ -473,6 +473,9 @@ DHPDEV PDev; INT DC_Type; INT DC_Flags; + + struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; + PDC_ATTR pDc_Attr; DC_ATTR Dc_Attr;
-
greatlrd＠svn.reactos.org