[ros-diffs] [greatlrd] 26722: sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix.

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Sat May 12 17:58:27 2007
New Revision: 26722

URL: http://svn.reactos.org/svn/reactos?rev=26722&view=rev
Log:
sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix. 

Modified:
    trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c
    trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c
    trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c
    trunk/rostests/dxtest/win32kdxtest/dump.c

Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c?rev=26722&r1=26721&r2=26722&view=diff
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c (original)
+++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c Sat May 12 17:58:27 2007
@@ -6,6 +6,7 @@
 #include <winddi.h>
 #include <d3dnthal.h>
 #include <dll/directx/d3d8thk.h>
+#include <ddrawi.h>
 #include "test.h"
 
 /*

Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c?rev=26722&r1=26721&r2=26722&view=diff
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c (original)
+++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c Sat May 12 17:58:27 2007
@@ -25,4 +25,5 @@
     testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0");
 
     show_status(fails, "NtGdiDdDeleteDirectDrawObject\0");
-}
+}
+

Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c?rev=26722&r1=26721&r2=26722&view=diff
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c (original)
+++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c Sat May 12 17:58:27 2007
@@ -5,6 +5,8 @@
 #include <winddi.h>
 #include <d3dnthal.h>
 #include <dll/directx/d3d8thk.h>
+
+#include <ddrawi.h>
 #include "test.h"
 
 /*

Modified: trunk/rostests/dxtest/win32kdxtest/dump.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.c?rev=26722&r1=26721&r2=26722&view=diff
==============================================================================
--- trunk/rostests/dxtest/win32kdxtest/dump.c (original)
+++ trunk/rostests/dxtest/win32kdxtest/dump.c Sat May 12 17:58:27 2007
@@ -16,18 +16,18 @@
             { \
                 printf("| "); \
             } \
-            dwflag = dwflag - dwvalue; \
+            dwflag = (ULONG)dwflag - (ULONG)dwvalue; \
             printf("%s ",text); \
             count++; \
         }
 
 #define endcheckflag(dwflag,text) \
     if (count==0) \
-        printf("0x%08lx\n",dwflag);\
+        printf("0x%08lx\n", (ULONG) dwflag);\
     else \
         printf("\n");\
     if (flag != 0) \
-        printf("undoc value in %s flags value %04lx\n",text,dwflag);
+        printf("undoc value in %s flags value %08lx\n",text, (ULONG) dwflag);
 
 
 
@@ -191,7 +191,7 @@
         int t;
         UINT flag;
         INT count=0;
-        LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData;
+        // LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData;
 
         printf("DD_HALINFO Version NT 2000/XP/2003 found \n");
         printf(" pHalInfo->dwSize                                  : 0x%08lx\n",(long)pHalInfo->dwSize);
@@ -438,8 +438,9 @@
 
         flag = pHalInfo->dwFlags;
         count = 0;
-        checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY");
-        checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL");
+        // FIXME missing DDHALINFO_ISPRIMARYDISPLAY and DDHALINFO_MODEXILLEGAL in currrent headers
+        // checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY");
+        // checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL");
         checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET");
         checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2");
         endcheckflag(flag,"pHalInfo->dwFlags");
@@ -456,7 +457,7 @@
         }
         else
         {
-            printf("none pHalInfo from the driver\n",pHalInfo->dwSize);
+            printf("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize);
         }
     }
 }