[ros-diffs] [greatlrd] 32922: Bugfix : disable a testcase that does crash on xp but not on windows 2000.

Author: greatlrd
Date: Sat Apr 12 07:46:02 2008
New Revision: 32922

URL: http://svn.reactos.org/svn/reactos?rev=32922&view=rev
Log:
Bugfix : disable a testcase that does crash on xp but not on windows 2000. 

Modified:
    trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c

Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi…
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1]
(original)
+++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sat Apr
12 07:46:02 2008
@@ -79,6 +79,7 @@
                                                 puD3dTextureFormats, puNumHeaps,
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
+
     testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(NULL,
...);\0");
     testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL,
...);\0");
     testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL,
...);\0");
@@ -99,15 +100,15 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puD3dCallbacks,NULL,fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puD3dDriverData,NULL,fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puD3dBufferCallbacks,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puD3dTextureFormats,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(retValue,FALSE,fails,"10.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(pHalInfo,NULL,fails,"11.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(pCallBackFlags,NULL,fails,"12.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puD3dCallbacks,NULL,fails,"13.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puD3dDriverData,NULL,fails,"14.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puD3dBufferCallbacks,NULL,fails,"15.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puD3dTextureFormats,NULL,fails,"16.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"17.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(puFourCC,NULL,fails,"18.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
 
     /* testing  OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, .... 
*/
     printf("testing  DdQueryDirectDrawObject( hDD, pHalInfo, NULL, ....)\n");
@@ -120,27 +121,41 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(puD3dCallbacks,NULL,fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(puD3dDriverData,NULL,fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(puD3dBufferCallbacks,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(puD3dTextureFormats,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, NULL, ...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
-
+    testing_noteq(retValue,FALSE,fails,"19.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_eq(pHalInfo,NULL,fails,"20.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(pCallBackFlags,NULL,fails,"21.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(puD3dCallbacks,NULL,fails,"22.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(puD3dDriverData,NULL,fails,"23.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(puD3dBufferCallbacks,NULL,fails,"24.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(puD3dTextureFormats,NULL,fails,"25.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, NULL, ...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"26.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+    testing_noteq(puFourCC,NULL,fails,"27.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0");
+
+    /*
     if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
         (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
     {
-        printf("10. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n");
+        printf("28. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n");
         fails++;
     }
+    */
 
     if (dumping_on == TRUE)
     {
         dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, NULL, ...)");
     }
+
+
+
+
+
+
+
+
+
+
+
+
 
     /* testing  OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
pCallBackFlags, NULL, ....  */
     printf("testing  DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, NULL,
....)\n");
@@ -157,21 +172,23 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_eq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puD3dCallbacks,NULL,fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puD3dDriverData,NULL,fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puD3dBufferCallbacks,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puD3dTextureFormats,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
-    testing_noteq(puFourCC,NULL,fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(retValue,FALSE,fails,"29.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_eq(pHalInfo,NULL,fails,"30.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_eq(pCallBackFlags,NULL,fails,"31.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puD3dCallbacks,NULL,fails,"32.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puD3dDriverData,NULL,fails,"33.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puD3dBufferCallbacks,NULL,fails,"34.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puD3dTextureFormats,NULL,fails,"35.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"36.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    testing_noteq(puFourCC,NULL,fails,"37.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\0");
+    /*
     if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
         (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
     {
-        printf("10. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\n");
+        printf("38. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL,
...);\n");
         fails++;
     }
+    */
 
     if (dumping_on == TRUE)
     {
@@ -179,7 +196,7 @@
        
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
     }
 
-    /* testing  OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
pCallBackFlags, NULL, ....  */
+    /* testing  OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
pCallBackFlags, D3dCallbacks, ....  */
     printf("testing  DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags,
puD3dCallbacks, NULL, ....)\n");
 
     pHalInfo = &HalInfo;
@@ -196,22 +213,26 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_eq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-
-    testing_noteq(puD3dDriverData,NULL,fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_noteq(puD3dBufferCallbacks,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_noteq(puD3dTextureFormats,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_noteq(retValue,FALSE,fails,"39.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_eq(pHalInfo,NULL,fails,"40.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_eq(pCallBackFlags,NULL,fails,"41.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+   
+    
+    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"42.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+
+    testing_noteq(puD3dDriverData,NULL,fails,"43.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_noteq(puD3dBufferCallbacks,NULL,fails,"44.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_noteq(puD3dTextureFormats,NULL,fails,"45.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"46.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    testing_noteq(puFourCC,NULL,fails,"47.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+    /*
     if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
         (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
     {
-        printf("10. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\n");
+        printf("48. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\n");
         fails++;
     }
+    */
 
     if (dumping_on == TRUE)
     {
@@ -239,23 +260,25 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_eq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-
-   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
-
-    testing_noteq(puD3dBufferCallbacks,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_noteq(puD3dTextureFormats,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_noteq(retValue,FALSE,fails,"49.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_eq(pHalInfo,NULL,fails,"50.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_eq(pCallBackFlags,NULL,fails,"51.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"52.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+
+   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"53.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
NULL, ...);\0");
+
+    testing_noteq(puD3dBufferCallbacks,NULL,fails,"54.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_noteq(puD3dTextureFormats,NULL,fails,"55.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"56.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    testing_noteq(puFourCC,NULL,fails,"57.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\0");
+    /*
     if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
         (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
     {
-        printf("10. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\n");
+        printf("58. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, NULL, ...);\n");
         fails++;
     }
+    */
 
     if (dumping_on == TRUE)
     {
@@ -286,26 +309,28 @@
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-    testing_eq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-
-   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dBufferCallbacks, NULL, ...);\0");
-
-    testing_noteq(puD3dTextureFormats,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-    testing_noteq(puNumFourCC,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"8.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_noteq(retValue,FALSE,fails,"59.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_eq(pHalInfo,NULL,fails,"60.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_eq(pCallBackFlags,NULL,fails,"61.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"62.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+
+   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"63.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dBufferCallbacks, NULL, ...);\0");
+
+    testing_noteq(puD3dTextureFormats,NULL,fails,"64.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,  pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_noteq(puNumFourCC,NULL,fails,"65.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    testing_noteq(puFourCC,NULL,fails,"66.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0");
+    /*
     if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
         (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
     {
-        printf("9. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\n");
+        printf("67. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\n");
         fails++;
     }
+    */
 
     if (puD3dBufferCallbacks)
     {
-       
testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"11.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL...);\0");
+       
testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"68.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, NULL...);\0");
     }
 
     if (dumping_on == TRUE)
@@ -319,77 +344,83 @@
     }
 
 /* testing  OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags,
puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, */
-    printf("testing  DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags,
puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL,
....)\n");
-
-    pHalInfo = &HalInfo;
-    pCallBackFlags = CallBackFlags;
-    puD3dCallbacks = &D3dCallbacks;
-    puD3dDriverData = &D3dDriverData;
-    puD3dBufferCallbacks = &D3dBufferCallbacks;
-
-    RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO));
-    RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3);
-    RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS));
-    //RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS));
-    RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS));
-
-    if (puD3dDriverData)
-    {
-        puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats *
sizeof(DDSURFACEDESC2));
-        if (!puD3dTextureFormats)
-            printf("Waring Out of memory\n");
-
-        RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats *
sizeof(DDSURFACEDESC2));
-    }
-
-    retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
-                                                pCallBackFlags, puD3dCallbacks,
-                                                puD3dDriverData, puD3dBufferCallbacks,
-                                                puD3dTextureFormats, puNumHeaps,
-                                                puvmList, puNumFourCC,
-                                                puFourCC);
-
-    testing_noteq(retValue,FALSE,fails,"1.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-    testing_eq(pHalInfo,NULL,fails,"2.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-    testing_eq(pCallBackFlags,NULL,fails,"3.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-    testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-
-   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-
-    testing_noteq(puNumFourCC,NULL,fails,"6.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-    testing_noteq(puFourCC,NULL,fails,"7.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
-    if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
-        (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
-    {
-        printf("8. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\n");
-        fails++;
-    }
-
-    if (puD3dBufferCallbacks)
-    {
-       
testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"9.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL...);\0");
-    }
-
-    if (puD3dTextureFormats)
-    {
-        /* fixme test case for it */
-    }
-
-    if (dumping_on == TRUE)
-    {
-        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-        /* FIXME dump puD3dCallbacks */
-        /* FIXME dump puD3dDriverData */
-        /* FIXME dump D3dBufferCallbacks */
-        /* FIXME dump puD3dTextureFormats */
-    }
-
-
-
-
-
-    if (puD3dTextureFormats)
-        free (puD3dTextureFormats);
+    //printf("testing  DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags,
puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL,
....)\n");
+
+    //pHalInfo = &HalInfo;
+    //pCallBackFlags = CallBackFlags;
+    //puD3dCallbacks = &D3dCallbacks;
+    //puD3dDriverData = &D3dDriverData;
+    //puD3dBufferCallbacks = &D3dBufferCallbacks;
+
+    //RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO));
+    //RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3);
+    //RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS));
+    ////RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS));
+    //RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS));
+
+    //if (puD3dDriverData)
+    //{
+    //    puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats *
sizeof(DDSURFACEDESC2));
+    //    if (!puD3dTextureFormats)
+    //        printf("Waring Out of memory\n");
+
+    //    RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats *
sizeof(DDSURFACEDESC2));
+    //}
+
+    //retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
+    //                                            pCallBackFlags, puD3dCallbacks,
+    //                                            puD3dDriverData, puD3dBufferCallbacks,
+    //                                            puD3dTextureFormats, puNumHeaps,
+    //                                            puvmList, puNumFourCC,
+    //                                            puFourCC);
+
+//    testing_noteq(retValue,FALSE,fails,"69.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//    testing_eq(pHalInfo,NULL,fails,"70.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//    testing_eq(pCallBackFlags,NULL,fails,"71.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//    
+//    /* does not work nice in xp */
+//    //
testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"72.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//
+//   
testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"73.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//
+//    testing_noteq(puNumFourCC,NULL,fails,"74.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//    testing_noteq(puFourCC,NULL,fails,"75.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0");
+//
+//    /*
+//    if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) &&
+//        (pHalInfo->dwSize != sizeof(DD_HALINFO_V4)))
+//    {
+//        printf("8. if this show for NT 2000/XP/2003 ignore it,
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\n");
+//        fails++;
+//    }
+//    */
+//
+//    if (puD3dBufferCallbacks)
+//    {
+//        /* does not work nice in xp */
+//        //
testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"76.
NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL...);\0");
+//    }
+//
+//    if (puD3dTextureFormats)
+//    {
+//        /* fixme test case for it */
+//    }
+//
+//    if (dumping_on == TRUE)
+//    {
+//        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
+//       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
+//        /* FIXME dump puD3dCallbacks */
+//        /* FIXME dump puD3dDriverData */
+//        /* FIXME dump D3dBufferCallbacks */
+//        /* FIXME dump puD3dTextureFormats */
+//    }
+//
+//
+//
+//
+//
+//    if (puD3dTextureFormats)
+//        free (puD3dTextureFormats);
     show_status(fails, "NtGdiDdQueryDirectDrawObject\0");
 }