From 1163b5af3c68eae41f8ec6671dd274bed15671aa Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Fri, 2 May 2008 05:45:29 +0000 Subject: [PATCH] Fixed some struct member positions in EDD_DIRECTDRAW_GLOBAL svn path=/trunk/; revision=33227 --- reactos/include/reactos/drivers/directx/directxint.h | 6 +++--- reactos/subsystems/win32/win32k/ntddraw/ddraw.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/include/reactos/drivers/directx/directxint.h b/reactos/include/reactos/drivers/directx/directxint.h index 01cb654bebc..2b76b442e1f 100644 --- a/reactos/include/reactos/drivers/directx/directxint.h +++ b/reactos/include/reactos/drivers/directx/directxint.h @@ -143,16 +143,16 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL /* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo /* 0x1E0 */ ULONG unk_1e0[46]; /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks -/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks +/* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x300 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x300 <-- verified to match Windows XP, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; -/* 0x460 */ ULONG unk_460[7]; +/* 0x460 */ ULONG unk_460[9]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; /* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verified to match Windows XP, ddVideoPortCallback /* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verified to match Windows XP, ddMiscellanousCallbacks /* 0x4EC */ DD_MISCELLANEOUS2CALLBACKS ddMiscellanous2Callbacks; // 0x4EC <-- verified to match Windows XP, ddMiscellanous2Callbacks -/* 0x504 */ ULONG unk_504[12]; +/* 0x504 */ ULONG unk_504[10]; /* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; /* 0x5A4 */ ULONG unk_544; /* 0x5A8 */ ULONG unk_548; diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 4372e948cbc..d1e4e62dc19 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -811,6 +811,8 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[4] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[4]) - (DWORD)pEddgbl),pEddgbl->unk_460[4]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[5] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[5]) - (DWORD)pEddgbl),pEddgbl->unk_460[5]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[6] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[6]); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[7] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[7]); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[8] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[8]); // D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%08lx\n",(((DWORD)&pEddgbl->d3dNtHalCallbacks2) - (DWORD)pEddgbl),pEddgbl->d3dNtHalCallbacks2); @@ -854,9 +856,7 @@ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[7] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[7]) - (DWORD)pEddgbl),pEddgbl->unk_504[7]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[8] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[8]) - (DWORD)pEddgbl),pEddgbl->unk_504[8]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[9] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[9]) - (DWORD)pEddgbl),pEddgbl->unk_504[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[10] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[10]) - (DWORD)pEddgbl),pEddgbl->unk_504[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[11] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[11]) - (DWORD)pEddgbl),pEddgbl->unk_504[11]); - + // D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%08lx\n",(((DWORD)&pEddgbl->d3dNtHalCallbacks3) - (DWORD)pEddgbl),pEddgbl->d3dNtHalCallbacks3); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_544 : 0x%08lx\n",(((DWORD)&pEddgbl->unk_544) - (DWORD)pEddgbl), pEddgbl->unk_544);