[greatlrd] 25878: 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.
22 Feb
2007
22 Feb
'07
7:21 p.m.
Author: greatlrd
Date: Thu Feb 22 22:21:10 2007
New Revision: 25878
URL: http://svn.reactos.org/svn/reactos?rev=25878&view=rev
Log:
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.
Removed:
trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h
trunk/rosapps/dxtest/win32kdxtest/sysreactos.h
trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln
trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj
trunk/rosapps/dxtest/win32kdxtest/windowsos.h
Modified:
trunk/rosapps/dxtest/win32kdxtest/dump.c
trunk/rosapps/dxtest/win32kdxtest/main.c
trunk/rosapps/dxtest/win32kdxtest/test.h
trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild
Removed: trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/Window…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (original)
+++ trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (removed)
@@ -1,11 +1,0 @@
-
-
-#if !defined(__REACTOS__)
-
- #define syscallid_NtGdiDdCreateDirectDrawObject 0x1039
- #define syscallid_NtGdiDdDeleteDirectDrawObject 0x103E
- #define syscallid_NtGdiDdQueryDirectDrawObject 0x1053
-
-#endif
-
-
Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/dump.c…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/dump.c (original)
+++ trunk/rosapps/dxtest/win32kdxtest/dump.c Thu Feb 22 22:21:10 2007
@@ -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);
Modified: trunk/rosapps/dxtest/win32kdxtest/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/main.c (original)
+++ trunk/rosapps/dxtest/win32kdxtest/main.c Thu Feb 22 22:21:10 2007
@@ -9,41 +9,17 @@
#include <wingdi.h>
#include <winddi.h>
#include <d3dnthal.h>
-
-
-
-
+#include <dll/directx/d3d8thk.h>
#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 @@
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 @@
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 @@
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 @@
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 @@
*/
pHalInfo = &HalInfo;
- retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
+ retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo,
pCallBackFlags, puD3dCallbacks,
puD3dDriverData, puD3dBufferCallbacks,
puD3dTextureFormats, puNumHeaps,
@@ -181,18 +157,12 @@
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 @@
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");
Removed: trunk/rosapps/dxtest/win32kdxtest/sysreactos.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/sysrea…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (original)
+++ trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (removed)
@@ -1,7 +1,0 @@
-
-
-#if defined(__REACTOS__)
- #define sysNtGdiDdCreateDirectDrawObject NtGdiDdCreateDirectDrawObject
- #define sysNtGdiDdDeleteDirectDrawObject NtGdiDdDeleteDirectDrawObject
- #define sysNtGdiDdQueryDirectDrawObject NtGdiDdQueryDirectDrawObject
-#endif
Modified: trunk/rosapps/dxtest/win32kdxtest/test.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/test.h…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/test.h (original)
+++ trunk/rosapps/dxtest/win32kdxtest/test.h Thu Feb 22 22:21:10 2007
@@ -4,30 +4,13 @@
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);
+
+
+
Modified: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (original)
+++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Thu Feb 22 22:21:10 2007
@@ -7,9 +7,7 @@
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
+ <library>d3d8thk</library>
<file>main.c</file>
- <file>dump.c</file>
- <file>../../../../dll/win32/gdi32/misc/win32k.S</file>
-
-
+ <file>dump.c</file>
</module>
Removed: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (original)
+++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (removed)
@@ -1,32 +1,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
Removed: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (original)
+++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (removed)
@@ -1,617 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="win32kdxtest"
- ProjectGUID="{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}"
- RootNamespace="win32kdxtest"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- <DefaultToolFile
- FileName="masm.rules"
- />
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- FavorSizeOrSpeed="1"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release;..\..\..\..\output-i386\dll\win32\user32\vc8\Release"
- GenerateDebugInformation="true"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Speed|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- MinimalRebuild="false"
- BasicRuntimeChecks="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="0"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="0"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed"
- GenerateDebugInformation="false"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug - Wine headers|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug
- Wine headers"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug
- Wine headers"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- PreprocessorDefinitions=";DBG;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- GeneratePreprocessedFile="0"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- AssemblerOutput="3"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug
- Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug - Wine headers"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release - Wine headers|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release
- Wine headers"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release
- Wine headers"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- FavorSizeOrSpeed="1"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release
- Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Release - Wine headers"
- GenerateDebugInformation="true"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Speed - Wine headers|Win32"
- OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed
- Wine headers"
- IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed
- Wine headers"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="MASM"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__"
- MinimalRebuild="false"
- BasicRuntimeChecks="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="0"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="0"
- CallingConvention="0"
- CompileAs="1"
- ForcedIncludeFiles="warning.h"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib user32.lib"
- OutputFile="$(OutDir)/win32kdxtest.exe"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed
- Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed - Wine headers"
- GenerateDebugInformation="false"
- SubSystem="1"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="false"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S"
- >
- <File
- RelativePath=".\dump.c"
- >
- </File>
- <File
- RelativePath=".\main.c"
- >
- </File>
- <File
- RelativePath=".\sysreactos.h"
- >
- </File>
- <File
- RelativePath=".\test.h"
- >
- </File>
- <File
- RelativePath=".\Windows2000Sp4.h"
- >
- </File>
- <File
- RelativePath=".\windowsos.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Removed: trunk/rosapps/dxtest/win32kdxtest/windowsos.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/window…
==============================================================================
--- trunk/rosapps/dxtest/win32kdxtest/windowsos.h (original)
+++ trunk/rosapps/dxtest/win32kdxtest/windowsos.h (removed)
@@ -1,32 +1,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
6470
days inactive
6470
days old
0 comments
1 participants
participants (1)
-
greatlrd＠svn.reactos.org