Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 21:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove RTEST(pHalInfo->vmiData.fpPrimary != 0 ); for this test was wrong for it is can be zero

Browse source 
cleanup some other part and adding few other as well

svn path=/trunk/; revision=32927
This commit is contained in:
Magnus Olsen 2008-04-12 18:21:41 +00:00
parent 416aaa9cc6
commit 72a3860fd7
1 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

54
rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c
View file

@ -128,7 +128,8 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
if (pHalInfo->dwSize == sizeof(DD_HALINFO)) if (pHalInfo->dwSize == sizeof(DD_HALINFO))
{ {
/*the offset, in bytes, to primary surface in the display memory */ /*the offset, in bytes, to primary surface in the display memory */
RTEST(pHalInfo->vmiData.fpPrimary != 0 ); /* some graphic card like sis 760 GX, Nvida GF7900GS does not set any offset at all */
// RTEST(pHalInfo->vmiData.fpPrimary != 0 );
/* unsuse always 0 */ /* unsuse always 0 */
RTEST(pHalInfo->vmiData.dwFlags == 0 ); RTEST(pHalInfo->vmiData.dwFlags == 0 );
@ -188,6 +189,8 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
/* Test see if we got any hardware acclartions for 2d or 3d, this always fill in /* Test see if we got any hardware acclartions for 2d or 3d, this always fill in
* that mean we found a bugi drv and dx does not work on this drv * that mean we found a bugi drv and dx does not work on this drv
*/ */
/* the SIS 760 GX will never fill it in, it is a bugi drv */
RTEST(pHalInfo->ddCaps.dwSize == sizeof(DDCORECAPS)); RTEST(pHalInfo->ddCaps.dwSize == sizeof(DDCORECAPS));
/* Testing see if we got any hw support for /* Testing see if we got any hw support for
@ -285,7 +288,15 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
* if it windows 2000 or windows xp/2003 * if it windows 2000 or windows xp/2003
*/ */
RTEST(puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)); RTEST(puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS));
/* Nivda like GF7900GS will not follow ms design rule here,
* ContextDestroyAll must alwyas be NULL for it is not longer inuse in windows 2000 and higher
*/
RTEST(puD3dCallbacks->ContextDestroyAll == NULL); RTEST(puD3dCallbacks->ContextDestroyAll == NULL);
/* Nivda like GF7900GS will not follow ms design rule here,
* SceneCapture must alwyas be NULL for it is not longer inuse in windows 2000 and higher
*/
RTEST(puD3dCallbacks->SceneCapture == NULL); RTEST(puD3dCallbacks->SceneCapture == NULL);
RTEST(puD3dCallbacks->dwReserved10 == 0); RTEST(puD3dCallbacks->dwReserved10 == 0);
RTEST(puD3dCallbacks->dwReserved11 == 0); RTEST(puD3dCallbacks->dwReserved11 == 0);
@ -341,7 +352,7 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
RtlCopyMemory(&oldD3dCallbacks, &D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); RtlCopyMemory(&oldD3dCallbacks, &D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS));
/* Next Start 4 */ /* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, */
pHalInfo = &HalInfo; pHalInfo = &HalInfo;
pCallBackFlags = CallBackFlags; pCallBackFlags = CallBackFlags;
puD3dCallbacks = &D3dCallbacks; puD3dCallbacks = &D3dCallbacks;
@ -358,13 +369,16 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
puvmList, puNumFourCC, puvmList, puNumFourCC,
puFourCC)== FALSE); puFourCC)== FALSE);
RTEST(pHalInfo != NULL); RTEST(pHalInfo != NULL);
RTEST(pCallBackFlags != NULL); ASSERT(pHalInfo != NULL);
if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) RTEST(pCallBackFlags != NULL);
{ ASSERT(pCallBackFlags != NULL);
RTEST(puD3dCallbacks != NULL);
RTEST(puD3dDriverData != NULL); RTEST(puD3dCallbacks != NULL);
} ASSERT(puD3dCallbacks != NULL);
RTEST(puD3dDriverData != NULL);
ASSERT(puD3dDriverData != NULL);
RTEST(puD3dBufferCallbacks == NULL); RTEST(puD3dBufferCallbacks == NULL);
RTEST(puD3dTextureFormats == NULL); RTEST(puD3dTextureFormats == NULL);
@ -372,16 +386,18 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
RTEST(puFourCC == NULL); RTEST(puFourCC == NULL);
RTEST(puNumHeaps == NULL); RTEST(puNumHeaps == NULL);
RTEST(puvmList == NULL); RTEST(puvmList == NULL);
ASSERT(pHalInfo != NULL);
/* We do not retesting DD_HALINFO, instead we compare it */ /* We do not retesting DD_HALINFO, instead we compare it */
RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0);
RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[0] != 0);
RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[1] != 0);
/* NT4 this will fail */
RTEST(pCallBackFlags[2] == 0); RTEST(pCallBackFlags[2] == 0);
/* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */
RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0);
/* start test of puD3dDriverData */
/* Next Start 5 */ /* Next Start 5 */
pHalInfo = &HalInfo; pHalInfo = &HalInfo;
pCallBackFlags = CallBackFlags; pCallBackFlags = CallBackFlags;
@ -422,10 +438,11 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0);
RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[0] != 0);
RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[1] != 0);
/* NT4 this will fail */
RTEST(pCallBackFlags[2] == 0); RTEST(pCallBackFlags[2] == 0);
/* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */
RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0);
/* Next Start 6 */ /* Next Start 6 */
pHalInfo = &HalInfo; pHalInfo = &HalInfo;
pCallBackFlags = CallBackFlags; pCallBackFlags = CallBackFlags;
@ -466,10 +483,12 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0);
RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[0] != 0);
RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[1] != 0);
/* NT4 this will fail */
RTEST(pCallBackFlags[2] == 0); RTEST(pCallBackFlags[2] == 0);
/* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */
RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0);
/* Next Start 7 */ /* Next Start 7 */
pHalInfo = &HalInfo; pHalInfo = &HalInfo;
pCallBackFlags = CallBackFlags; pCallBackFlags = CallBackFlags;
@ -524,10 +543,11 @@ Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti)
RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0);
RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[0] != 0);
RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[1] != 0);
/* NT4 this will fail */
RTEST(pCallBackFlags[2] == 0); RTEST(pCallBackFlags[2] == 0);
/* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */
RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0);
/* Todo /* Todo