From afe388c584e63e626c74f44d1672330567a50706 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sat, 12 May 2007 13:58:27 +0000 Subject: [PATCH] sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix. svn path=/trunk/; revision=26722 --- .../dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c | 1 + .../win32kdxtest/NtGdiDdDeleteDirectDrawObject.c | 3 ++- .../win32kdxtest/NtGdiDdWaitForVerticalBlank.c | 2 ++ rostests/dxtest/win32kdxtest/dump.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c b/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c index 1b11558b8a2..e3662f490bf 100644 --- a/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c +++ b/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "test.h" /* diff --git a/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c b/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c index ed3a36c9afc..c2dd32bb54d 100644 --- a/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c +++ b/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c @@ -25,4 +25,5 @@ test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); -} \ No newline at end of file +} + diff --git a/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c b/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c index 345bd21d682..9b51d15d9c6 100644 --- a/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c +++ b/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c @@ -5,6 +5,8 @@ #include #include #include + +#include #include "test.h" /* diff --git a/rostests/dxtest/win32kdxtest/dump.c b/rostests/dxtest/win32kdxtest/dump.c index 8e50ecfbe71..56e039db2dc 100644 --- a/rostests/dxtest/win32kdxtest/dump.c +++ b/rostests/dxtest/win32kdxtest/dump.c @@ -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 @@ dump_halinfo(DD_HALINFO *pHalInfo, char *text) 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 @@ dump_halinfo(DD_HALINFO *pHalInfo, char *text) 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 @@ dump_halinfo(DD_HALINFO *pHalInfo, char *text) } else { - printf("none pHalInfo from the driver\n",pHalInfo->dwSize); + printf("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize); } } }