https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9813457567a0400adaec034e03d39df2e3d35cd
commit f9813457567a0400adaec034e03d39df2e3d35cd Author: Timo Kreuzer <[email protected]> AuthorDate: Mon Jan 30 19:17:22 2023 +0200 Commit: Timo Kreuzer <[email protected]> CommitDate: Tue Jan 31 18:39:21 2023 +0100 [WIN32KNT_APITEST] Comment out btoken tests for NtGdiDdQueryDirectDrawObject --- .../win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 4eeffc81c4e..3b380dabbe0 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -216,7 +216,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* Testing see if we got any hw support for * This test can fail on video card that does not support 2d/overlay/3d */ - RTEST( pHalInfo->ddCaps.dwCaps != 0); + //RTEST( pHalInfo->ddCaps.dwCaps != 0); RTEST( pHalInfo->ddCaps.ddsCaps.dwCaps != 0); /* This flags is obsolete and should not be used by the driver */ @@ -244,9 +244,9 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * * point to kmode direcly to the win32k.sys, win32k.sys is kmode and it is kmode address we getting back */ - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); - RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DGlobalDriverData & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); + //RTEST( ( (DWORD_PTR)pHalInfo->lpD3DHALCallbacks & (~0x80000000)) != 0 ); } /* Backup DD_HALINFO so we do not need resting it */ @@ -285,8 +285,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * known workaround is to check if the drv really return a kmode pointer for the drv functions * we want to use. */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* testing NtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, D3dCallbacks, NULL, .... */ @@ -317,7 +317,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) * this will be fill in of all drv, it is not only for 3d stuff, this always fill by win32k.sys or dxg.sys depns * 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 @@ -374,8 +374,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* Backup D3DNTHAL_CALLBACKS so we do not need resting it */ @@ -418,8 +418,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting pCallBackFlags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -428,12 +428,12 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* start test of puD3dDriverData */ - RTEST(puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - RTEST(puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)); - RTEST(puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)); - RTEST(puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)); - RTEST(puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)); - RTEST(puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)); + //RTEST(puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + //RTEST(puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)); + //RTEST(puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)); + //RTEST(puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)); + //RTEST(puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)); + //RTEST(puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)); RTEST(puD3dDriverData->hwCaps.dwMaxBufferSize == 0); RTEST(puD3dDriverData->hwCaps.dwMaxVertexCount == 0); @@ -490,8 +490,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -500,7 +500,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); /* start test of puD3dBufferCallbacks */ - RTEST(puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)); + //RTEST(puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)); if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CANCREATED3DBUF) { /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ @@ -607,8 +607,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -706,8 +706,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puvmList == NULL); /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */ @@ -771,8 +771,8 @@ START_TEST(NtGdiDdQueryDirectDrawObject) /* We retesting the flags */ - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); + //RTEST(pCallBackFlags[0] != 0); + //RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); /* We do not retesting instead we compare it */
