sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix.

svn path=/trunk/; revision=26722
This commit is contained in:
Magnus Olsen 2007-05-12 13:58:27 +00:00
parent 52e0d50e08
commit afe388c584
4 changed files with 13 additions and 8 deletions

View file

@ -6,6 +6,7 @@
#include <winddi.h> #include <winddi.h>
#include <d3dnthal.h> #include <d3dnthal.h>
#include <dll/directx/d3d8thk.h> #include <dll/directx/d3d8thk.h>
#include <ddrawi.h>
#include "test.h" #include "test.h"
/* /*

View file

@ -25,4 +25,5 @@ test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal)
testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0");
show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0");
} }

View file

@ -5,6 +5,8 @@
#include <winddi.h> #include <winddi.h>
#include <d3dnthal.h> #include <d3dnthal.h>
#include <dll/directx/d3d8thk.h> #include <dll/directx/d3d8thk.h>
#include <ddrawi.h>
#include "test.h" #include "test.h"
/* /*

View file

@ -16,18 +16,18 @@
{ \ { \
printf("| "); \ printf("| "); \
} \ } \
dwflag = dwflag - dwvalue; \ dwflag = (ULONG)dwflag - (ULONG)dwvalue; \
printf("%s ",text); \ printf("%s ",text); \
count++; \ count++; \
} }
#define endcheckflag(dwflag,text) \ #define endcheckflag(dwflag,text) \
if (count==0) \ if (count==0) \
printf("0x%08lx\n",dwflag);\ printf("0x%08lx\n", (ULONG) dwflag);\
else \ else \
printf("\n");\ printf("\n");\
if (flag != 0) \ 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; int t;
UINT flag; UINT flag;
INT count=0; INT count=0;
LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; // LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData;
printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); printf("DD_HALINFO Version NT 2000/XP/2003 found \n");
printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize);
@ -438,8 +438,9 @@ dump_halinfo(DD_HALINFO *pHalInfo, char *text)
flag = pHalInfo->dwFlags; flag = pHalInfo->dwFlags;
count = 0; count = 0;
checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); // FIXME missing DDHALINFO_ISPRIMARYDISPLAY and DDHALINFO_MODEXILLEGAL in currrent headers
checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); // checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY");
// checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL");
checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET"); checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET");
checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2"); checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2");
endcheckflag(flag,"pHalInfo->dwFlags"); endcheckflag(flag,"pHalInfo->dwFlags");
@ -456,7 +457,7 @@ dump_halinfo(DD_HALINFO *pHalInfo, char *text)
} }
else else
{ {
printf("none pHalInfo from the driver\n",pHalInfo->dwSize); printf("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize);
} }
} }
} }