diff --git a/rosapps/dxtest/win32kdxtest/main.c b/rosapps/dxtest/win32kdxtest/main.c index 4720cc62176..e1cc5a05ec6 100644 --- a/rosapps/dxtest/win32kdxtest/main.c +++ b/rosapps/dxtest/win32kdxtest/main.c @@ -106,7 +106,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) 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"); @@ -123,7 +123,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) 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"); @@ -137,8 +137,6 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) 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"); - - return retValue; } diff --git a/rosapps/dxtest/win32kdxtest/test.h b/rosapps/dxtest/win32kdxtest/test.h index 969ef606dfb..2255c94480b 100644 --- a/rosapps/dxtest/win32kdxtest/test.h +++ b/rosapps/dxtest/win32kdxtest/test.h @@ -35,7 +35,7 @@ BOOL NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo 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++; \ - printf("FAIL ret=%s, %d == %d )\n",text,input,value); \ + printf("FAIL ret=%s, %d == %d )\n",text,(int)input,(int)value); \ }