From 06b4e06c8ae25fa22c9acb92de3a9612dc4f07d0 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Thu, 22 Feb 2007 19:21:10 +0000 Subject: [PATCH] win32k dx test are now compatible with all Windows and ReactOS that got a d3d8thk.dll file rember that file are diffent for Windows 2000 and Windows XP/2003 ReactOS d38thk.dll are Windows XP/2003 compatible. svn path=/trunk/; revision=25878 --- rosapps/dxtest/win32kdxtest/Windows2000Sp4.h | 11 - rosapps/dxtest/win32kdxtest/dump.c | 2 +- rosapps/dxtest/win32kdxtest/main.c | 72 +- rosapps/dxtest/win32kdxtest/sysreactos.h | 7 - rosapps/dxtest/win32kdxtest/test.h | 25 +- .../dxtest/win32kdxtest/win32kdxtest.rbuild | 6 +- .../win32kdxtest/win32kdxtest_vc8_auto.sln | 32 - .../win32kdxtest/win32kdxtest_vc8_auto.vcproj | 617 ------------------ rosapps/dxtest/win32kdxtest/windowsos.h | 32 - 9 files changed, 28 insertions(+), 776 deletions(-) delete mode 100644 rosapps/dxtest/win32kdxtest/Windows2000Sp4.h delete mode 100644 rosapps/dxtest/win32kdxtest/sysreactos.h delete mode 100644 rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln delete mode 100644 rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj delete mode 100644 rosapps/dxtest/win32kdxtest/windowsos.h diff --git a/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h b/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h deleted file mode 100644 index d443d797b92..00000000000 --- a/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h +++ /dev/null @@ -1,11 +0,0 @@ - - -#if !defined(__REACTOS__) - - #define syscallid_NtGdiDdCreateDirectDrawObject 0x1039 - #define syscallid_NtGdiDdDeleteDirectDrawObject 0x103E - #define syscallid_NtGdiDdQueryDirectDrawObject 0x1053 - -#endif - - diff --git a/rosapps/dxtest/win32kdxtest/dump.c b/rosapps/dxtest/win32kdxtest/dump.c index 6e2b9aeac07..f739ed20574 100644 --- a/rosapps/dxtest/win32kdxtest/dump.c +++ b/rosapps/dxtest/win32kdxtest/dump.c @@ -11,7 +11,7 @@ void -dump(DD_HALINFO *pHalInfo, char *text) +dump_halinfo(DD_HALINFO *pHalInfo, char *text) { printf("dumping the DD_HALINFO from %s\n",text); diff --git a/rosapps/dxtest/win32kdxtest/main.c b/rosapps/dxtest/win32kdxtest/main.c index 8f66fcc3d3b..4b5ee1699f1 100644 --- a/rosapps/dxtest/win32kdxtest/main.c +++ b/rosapps/dxtest/win32kdxtest/main.c @@ -9,41 +9,17 @@ #include #include #include - - - - +#include #include "test.h" -/* which syscall table shall we use WIndows or ReactOS */ +/* we using d3d8thk.dll it is doing the real syscall in windows 2000 + * in ReactOS and Windows XP and higher d3d8thk.dll it linking to + * gdi32.dll instead doing syscall, gdi32.dll export DdEntry1-56 + * and doing the syscall direcly. I did forget about it, This + * test program are now working on any Windows and ReactOS + * that got d3d8thk.dll + */ -/* Windows 2000 sp4 syscall table for win32k */ -#include "Windows2000Sp4.h" - -/* Windows syscall code */ -#include "windowsos.h" - -/* ReactOS syscall code */ -#include "sysreactos.h" - - -/* -#define DdQueryDirectDrawObject GdiEntry2 - -#define DdCreateSurfaceObject GdiEntry4 -#define DdDeleteSurfaceObject GdiEntry5 -#define DdResetVisrgn GdiEntry6 -#define DdGetDC GdiEntry7 -#define DdReleaseDC GdiEntry8 -#define DdCreateDIBSection GdiEntry9 -#define DdReenableDirectDrawObject GdiEntry10 -#define DdAttachSurface GdiEntry11 -#define DdUnattachSurface GdiEntry12 -#define DdQueryDisplaySettingsUniqueness GdiEntry13 -#define DdGetDxHandle GdiEntry14 -#define DdSetGammaRamp GdiEntry15 -#define DdSwapTextureHandles GdiEntry16 -*/ int main(int argc, char **argv) { HANDLE hDirectDrawLocal; @@ -69,10 +45,10 @@ test_NtGdiDdCreateDirectDrawObject() printf("Start testing of NtGdiDdCreateDirectDrawObject\n"); - retValue = sysNtGdiDdCreateDirectDrawObject(NULL); + retValue = OsThunkDdCreateDirectDrawObject(NULL); testing_noteq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(NULL);\0"); - retValue = sysNtGdiDdCreateDirectDrawObject(hdc); + retValue = OsThunkDdCreateDirectDrawObject(hdc); testing_eq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(hdc);\0"); show_status(fails, "NtGdiDdCreateDirectDrawObject\0"); @@ -107,9 +83,9 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC D3dTextureFormats; - //DWORD NumHeaps = 0; + // DWORD NumHeaps = 0; VIDEOMEMORY vmList; - //DWORD NumFourCC = 0; + // DWORD NumFourCC = 0; //DWORD FourCC = 0; /* clear data */ @@ -124,7 +100,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); /* testing NULL */ - retValue = sysNtGdiDdQueryDirectDrawObject( NULL, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -140,7 +116,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -163,7 +139,7 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) */ pHalInfo = &HalInfo; - retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -181,18 +157,12 @@ test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); -#if DBG - dump(pHalInfo, "NtGdiDdQueryDirectDrawObject frist call"); -#endif - //pCallBackFlags = (DWORD *)&CallBackFlags; - //retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, NULL, - // pCallBackFlags, puD3dCallbacks, - // puD3dDriverData, puD3dBufferCallbacks, - // puD3dTextureFormats, puNumHeaps, - // puvmList, puNumFourCC, - // puFourCC); + + + + show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); } @@ -208,10 +178,10 @@ test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) BOOL retValue=FALSE; printf("Start testing of NtGdiDdDeleteDirectDrawObject\n"); - retValue = sysNtGdiDdDeleteDirectDrawObject(hDirectDrawLocal); + retValue = OsThunkDdDeleteDirectDrawObject(hDirectDrawLocal); testing_eq(retValue,FALSE,fails,"NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal);\0"); - retValue = sysNtGdiDdDeleteDirectDrawObject(NULL); + retValue = OsThunkDdDeleteDirectDrawObject(NULL); testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); diff --git a/rosapps/dxtest/win32kdxtest/sysreactos.h b/rosapps/dxtest/win32kdxtest/sysreactos.h deleted file mode 100644 index e9ef92bec9c..00000000000 --- a/rosapps/dxtest/win32kdxtest/sysreactos.h +++ /dev/null @@ -1,7 +0,0 @@ - - -#if defined(__REACTOS__) - #define sysNtGdiDdCreateDirectDrawObject NtGdiDdCreateDirectDrawObject - #define sysNtGdiDdDeleteDirectDrawObject NtGdiDdDeleteDirectDrawObject - #define sysNtGdiDdQueryDirectDrawObject NtGdiDdQueryDirectDrawObject -#endif diff --git a/rosapps/dxtest/win32kdxtest/test.h b/rosapps/dxtest/win32kdxtest/test.h index aaddb1cc365..f9ef67c6811 100644 --- a/rosapps/dxtest/win32kdxtest/test.h +++ b/rosapps/dxtest/win32kdxtest/test.h @@ -4,30 +4,13 @@ HANDLE test_NtGdiDdCreateDirectDrawObject(); void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); -void dump(DD_HALINFO *pHalInfo, char *text); +void dump_halinfo(DD_HALINFO *pHalInfo, char *text); + + + -HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc); -BOOL sysNtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal); -BOOL sysNtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC); -HANDLE NtGdiDdCreateDirectDrawObject(HDC hdc); -BOOL NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal); -BOOL NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC); diff --git a/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild b/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild index 44f7a3ef71f..5f01268bdf2 100644 --- a/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild +++ b/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild @@ -7,9 +7,7 @@ kernel32 user32 gdi32 + d3d8thk main.c - dump.c - ../../../../dll/win32/gdi32/misc/win32k.S - - + dump.c \ No newline at end of file diff --git a/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln b/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln deleted file mode 100644 index 4bab19fcccd..00000000000 --- a/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln +++ /dev/null @@ -1,32 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32kdxtest", "win32kdxtest_vc8_auto.vcproj", "{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - Wine headers|Win32 = Debug - Wine headers|Win32 - Debug|Win32 = Debug|Win32 - Release - Wine headers|Win32 = Release - Wine headers|Win32 - Release|Win32 = Release|Win32 - Speed - Wine headers|Win32 = Speed - Wine headers|Win32 - Speed|Win32 = Speed|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.ActiveCfg = Debug - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.Build.0 = Debug - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.Build.0 = Debug|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.ActiveCfg = Release - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.Build.0 = Release - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.ActiveCfg = Release|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.Build.0 = Release|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.ActiveCfg = Speed - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.Build.0 = Speed - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.ActiveCfg = Speed|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.Build.0 = Speed|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj b/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj deleted file mode 100644 index 952f4c888f3..00000000000 --- a/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rosapps/dxtest/win32kdxtest/windowsos.h b/rosapps/dxtest/win32kdxtest/windowsos.h deleted file mode 100644 index a81c81c2d2f..00000000000 --- a/rosapps/dxtest/win32kdxtest/windowsos.h +++ /dev/null @@ -1,32 +0,0 @@ - -#if !defined(__REACTOS__) - - HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc) - { - INT retValue; - win_syscall(hdc,retValue, syscallid_NtGdiDdCreateDirectDrawObject); - return retValue; - } - - BOOL sysNtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) - { - INT retValue; - win_syscall(hDirectDrawLocal,retValue, syscallid_NtGdiDdDeleteDirectDrawObject); - return retValue; - } - - BOOL sysNtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC) - { - INT retValue; - win_syscall(hDirectDrawLocal,retValue, syscallid_NtGdiDdQueryDirectDrawObject); - return retValue; - } - -#endif