From a811ab72f39071c076909b075f9a7616eeeed2ce Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 4 May 2008 19:58:33 +0000 Subject: [PATCH] Fixed one test so it be more fair. svn path=/trunk/; revision=33278 --- .../w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c b/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c index 71a4e4a0c9e..a73c0dc11c7 100644 --- a/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -210,14 +210,20 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) RTEST( pHalInfo->ddCaps.dwFXAlphaCaps == 0); - /* if this fail we do not have a dx driver install acodring ms, some version of windows it + /* basic dx 2 is found if this flags not set + * if this fail we do not have a dx driver install acodring ms, some version of windows it * is okay this fail and drv does then only support basic dx + * */ - RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); + if (pHalInfo->dwFlags != 0) + { + RTEST( (pHalInfo->dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0 ); + RTEST( ( (DWORD)pHalInfo->GetDriverInfo & 0x80000000) != 0 ); + ASSERT( ((DWORD)pHalInfo->GetDriverInfo & 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 ); - ASSERT( ((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