Author: greatlrd Date: Sat Apr 12 07:32:32 2008 New Revision: 32920
URL: http://svn.reactos.org/svn/reactos?rev=32920&view=rev Log: fixed more test after my notes of old testkit I wrote for private use.
Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c
Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/NtG... ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sat Apr 12 07:32:32 2008 @@ -201,13 +201,19 @@ */ RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 );
- if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) - { - /* it is store in kmode so we check if it kmode address or not */ - RTEST( ( (DWORD)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); - RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); - RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); - } + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)pHalInfo->GetDriverInfo & (~0x80000000)) != 0 ); + + + /* the pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE will be ignore, only way detect it proper follow code, + * this will be fill in of all drv, it is not only for 3d stuff, this always fill by win32k.sys or dxg.sys depns + * if it windows 2000 or windows xp/2003 + * + * point to kmode direcly to the win32k.sys, win32k.sys is kmode and it is kmode address we getting back + */ + RTEST( ( (DWORD)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); + RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + RTEST( ( (DWORD)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); }
/* Backup DD_HALINFO so we do not need resting it */