[ros-diffs] [greatlrd] 32923: add one more dump data output to win32kdxtest

Author: greatlrd
Date: Sat Apr 12 08:54:48 2008
New Revision: 32923

URL: http://svn.reactos.org/svn/reactos?rev=32923&view=rev
Log:
add one more dump data output to win32kdxtest 

Modified:
    trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c
    trunk/rostests/dxtest/win32kdxtest/dump.c
    trunk/rostests/dxtest/win32kdxtest/test.h

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 08:54:48 2008
@@ -236,9 +236,9 @@
 
     if (dumping_on == TRUE)
     {
-        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-        /* FIXME dump puD3dCallbacks */
+        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...)");
+       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...)");
+       
dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...)");
     }
 
    /* testing  OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags,
puD3dCallbacks, puD3dDriverData, NULL, */
@@ -282,9 +282,9 @@
 
     if (dumping_on == TRUE)
     {
-        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-        /* FIXME dump puD3dCallbacks */
+        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)");
+       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)");
+       
dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)");
         /* FIXME dump puD3dDriverData */
     }
 
@@ -335,9 +335,9 @@
 
     if (dumping_on == TRUE)
     {
-        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, NULL, ...)");
-        /* FIXME dump puD3dCallbacks */
+        dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL,
...)");
+       
dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL,
...)");
+       
dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal,
pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL,
...)");
         /* FIXME dump puD3dDriverData */
         /* FIXME dump D3dBufferCallbacks */
 

Modified: trunk/rostests/dxtest/win32kdxtest/dump.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.…
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] (original)
+++ trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] Sat Apr 12 08:54:48 2008
@@ -461,4 +461,53 @@
 }
 
 
-
+void
+dump_D3dCallbacks(D3DNTHAL_CALLBACKS *puD3dCallbacks, char *text)
+{
+    printf("dumping the D3DNTHAL_CALLBACKS from %s\n",text);
+    if (puD3dCallbacks->dwSize ==  sizeof(D3DNTHAL_CALLBACKS))
+    {
+        printf(" puD3dCallbacks->dwSize                            :
0x%08lx\n",(long)puD3dCallbacks->dwSize);
+        printf(" puD3dCallbacks->ContextCreate                     :
0x%08lx\n",(long)puD3dCallbacks->ContextCreate);
+        printf(" puD3dCallbacks->ContextDestroy                    :
0x%08lx\n",(long)puD3dCallbacks->ContextDestroy);
+        printf(" puD3dCallbacks->ContextDestroyAll                 :
0x%08lx\n",(long)puD3dCallbacks->ContextDestroyAll);
+        printf(" puD3dCallbacks->SceneCapture                      :
0x%08lx\n",(long)puD3dCallbacks->SceneCapture);
+        printf(" puD3dCallbacks->dwReserved10                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved10);
+        printf(" puD3dCallbacks->dwReserved11                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved11);
+        printf(" puD3dCallbacks->dwReserved22                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved22);
+        printf(" puD3dCallbacks->dwReserved23                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved23);
+        printf(" puD3dCallbacks->dwReserved                        :
0x%08lx\n",(long)puD3dCallbacks->dwReserved);
+        printf(" puD3dCallbacks->TextureCreate                     :
0x%08lx\n",(long)puD3dCallbacks->TextureCreate);
+        printf(" puD3dCallbacks->TextureDestroy                    :
0x%08lx\n",(long)puD3dCallbacks->TextureDestroy);
+        printf(" puD3dCallbacks->TextureSwap                       :
0x%08lx\n",(long)puD3dCallbacks->TextureSwap);
+        printf(" puD3dCallbacks->TextureGetSurf                    :
0x%08lx\n",(long)puD3dCallbacks->TextureGetSurf);
+        printf(" puD3dCallbacks->dwReserved12                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved12);
+        printf(" puD3dCallbacks->dwReserved13                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved13);
+        printf(" puD3dCallbacks->dwReserved14                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved14);
+        printf(" puD3dCallbacks->dwReserved15                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved15);
+        printf(" puD3dCallbacks->dwReserved16                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved16);
+        printf(" puD3dCallbacks->dwReserved17                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved17);
+        printf(" puD3dCallbacks->dwReserved18                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved18);
+        printf(" puD3dCallbacks->dwReserved19                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved19);
+        printf(" puD3dCallbacks->dwReserved20                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved20);
+        printf(" puD3dCallbacks->dwReserved21                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved21);
+        printf(" puD3dCallbacks->dwReserved24                      :
0x%08lx\n",(long)puD3dCallbacks->dwReserved24);
+        printf(" puD3dCallbacks->dwReserved0                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved0);
+        printf(" puD3dCallbacks->dwReserved1                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved1);
+        printf(" puD3dCallbacks->dwReserved2                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved2);
+        printf(" puD3dCallbacks->dwReserved3                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved3);
+        printf(" puD3dCallbacks->dwReserved4                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved4);
+        printf(" puD3dCallbacks->dwReserved5                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved5);
+        printf(" puD3dCallbacks->dwReserved6                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved6);
+        printf(" puD3dCallbacks->dwReserved7                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved7);
+        printf(" puD3dCallbacks->dwReserved8                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved8);
+        printf(" puD3dCallbacks->dwReserved9                       :
0x%08lx\n",(long)puD3dCallbacks->dwReserved9);
+    }
+     else
+    {
+        printf("none puD3dCallbacks from the driver
0x%08lx\n",puD3dCallbacks->dwSize);
+    }
+}
+
+
+

Modified: trunk/rostests/dxtest/win32kdxtest/test.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.…
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original)
+++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Sat Apr 12 08:54:48 2008
@@ -10,6 +10,7 @@
 
 void dump_halinfo(DD_HALINFO *pHalInfo, char *text);
 void dump_CallBackFlags(DWORD *pCallBackFlags, char *text);
+void dump_D3dCallbacks(D3DNTHAL_CALLBACKS *puD3dCallbacks, char *text);