[ros-diffs] [greatlrd] 33278: Fixed one test so it be more fair.

Author: greatlrd
Date: Sun May  4 14:58:33 2008
New Revision: 33278

URL: http://svn.reactos.org/svn/reactos?rev=33278&view=rev
Log:
Fixed one test so it be more fair. 

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/Nt…
==============================================================================
--- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1]
(original)
+++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun
May  4 14:58:33 2008
@@ -210,14 +210,20 @@
         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