fixed all dam warings before some start nag on me
authorMagnus Olsen <magnus@greatlord.com>
Fri, 16 Feb 2007 16:48:54 +0000 (16:48 +0000)
committerMagnus Olsen <magnus@greatlord.com>
Fri, 16 Feb 2007 16:48:54 +0000 (16:48 +0000)
svn path=/trunk/; revision=25816

rosapps/dxtest/win32kdxtest/main.c
rosapps/dxtest/win32kdxtest/test.h

index 4720cc6..e1cc5a0 100644 (file)
@@ -106,7 +106,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal)
                                                 puD3dTextureFormats, puNumHeaps, 
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
                                                 puD3dTextureFormats, puNumHeaps, 
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
-    testing_noteq(retValue,NULL,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
+    testing_noteq(retValue,0,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
     testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0");
@@ -123,7 +123,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal)
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
                                                 puvmList, puNumFourCC,
                                                 puFourCC);
 
-    testing_noteq(retValue,NULL,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0");
+    testing_noteq(retValue,0,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(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");
@@ -137,8 +137,6 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal)
 
 
     show_status(fails, "NtGdiDdQueryDirectDrawObject\0");
 
 
     show_status(fails, "NtGdiDdQueryDirectDrawObject\0");
-
-    return retValue;
 }
 
 /*
 }
 
 /*
@@ -159,8 +157,6 @@ test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal)
     testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0");
 
     show_status(fails, "NtGdiDdDeleteDirectDrawObject\0");
     testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0");
 
     show_status(fails, "NtGdiDdDeleteDirectDrawObject\0");
-
-    return retValue;
 }
 
 
 }
 
 
index 969ef60..2255c94 100644 (file)
@@ -35,7 +35,7 @@ BOOL NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo
         if (input == value) \
         { \
             counter++; \
         if (input == value) \
         { \
             counter++; \
-            printf("FAIL ret=%s, %d != %d )\n",text,input,value); \
+            printf("FAIL ret=%s, %d != %d )\n",text,(int)input,(int)value); \
         }
 
 
         }
 
 
@@ -43,7 +43,7 @@ BOOL NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo
         if (input != value) \
         { \
             counter++; \
         if (input != value) \
         { \
             counter++; \
-            printf("FAIL ret=%s, %d == %d )\n",text,input,value); \
+            printf("FAIL ret=%s, %d == %d )\n",text,(int)input,(int)value); \
         }
 
 
         }