[ros-diffs] [fireball] 34648: - Rewrite the header file to achieve better compatibility. - Add project/solution for compiling with MSVC (it actually compiles and links), the project file is a tweaked rbuild-generated one.

21 Jul 2008

Author: fireball
Date: Mon Jul 21 16:37:38 2008
New Revision: 34648

URL: http://svn.reactos.org/svn/reactos?rev=34648&view=rev
Log:
- Rewrite the header file to achieve better compatibility.
- Add project/solution for compiling with MSVC (it actually compiles and links), the
project file is a tweaked rbuild-generated one.

Added:
    branches/nwin32/subsystems/win32/win32k/win32k.sln   (with props)
    branches/nwin32/subsystems/win32/win32k/win32k_vc9.vcproj   (with props)
Modified:
    branches/nwin32/subsystems/win32/win32k/include/win32k.h

Modified: branches/nwin32/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…
==============================================================================

--- branches/nwin32/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original)
+++ branches/nwin32/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Mon Jul 21
16:37:38 2008
@@ -3,7 +3,7 @@
  * PROJECT:         ReactOS Win32K
  * FILE:            subsystems/win32/win32k/include/win32k.h
  * PURPOSE:         Main Win32K Header
- * PROGRAMMER:      Stefan Ginsberg (stefan__100__(a)hotmail.com)
+ * PROGRAMMER:      Aleksey Bragin (aleksey(a)reactos.org)
  */
 
 /* INCLUDES ******************************************************************/
@@ -15,14 +15,14 @@
 #define NTDDI_VERSION NTDDI_WS03SP1
 #define WINVER 0x600
 
-#define _NO_COM
-
-/* DDK/NDK/SDK Headers */
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ddk/ntifs.h>
-#include <ddk/tvout.h>
-#include <ndk/ntndk.h>
+/* Initial DDK/IFS Headers */
+#ifdef _MSC_VER
+#include <excpt.h>
+#include <ntdef.h>
+#undef DECLSPEC_IMPORT
+#define DECLSPEC_IMPORT
+#endif
+#include <ntifs.h>
 
 /* Win32 Headers */
 /* FIXME: Defines in winbase.h that we need... */
@@ -40,8 +40,18 @@
 #include <prntfont.h>
 #include <dde.h>
 #include <wincon.h>
+
+/* This set of headers is greatly incompatible */
+/* TODO: Either fix ddrawi.h + all dependencies, or create a new temporary
+         header */
 #define _NOCSECT_TYPE
-#include <ddrawi.h>
+// #include <ddrawi.h>
+typedef LPVOID LPVIDMEM;
+typedef LPVOID LPVMEMHEAP;
+typedef LPVOID LPSURFACEALIGNMENT;
+
+/* NDK Headers */
+#include <ntndk.h>
 
 /* SEH Support with PSEH */
 #include <pseh/pseh.h>
@@ -59,54 +69,9 @@
 #include <win32k/callback.h>
 #include <win32k/ntusrtyp.h>
 #include <win32k/ntuser.h>
+
+/* FIXME */
+#if 0
 #include <win32k/ntgdityp.h>
 #include <ntgdi.h>
-
-
-
-#if 0
-/* DDK/NDK/SDK Headers */
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ddk/ntifs.h>
-#include <ddk/tvout.h>
-#include <ndk/ntndk.h>
-
-/* Win32 Headers */
-/* FIXME: Defines in winbase.h that we need... */
-typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
-#define WINBASEAPI
-#define STARTF_USESIZE 2
-#define STARTF_USEPOSITION 4
-#include <stdarg.h>
-#include <windef.h>
-#include <winerror.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <prntfont.h>
-#include <dde.h>
-#include <wincon.h>
-#define _NOCSECT_TYPE
-#include <ddrawi.h>
-
-/* SEH Support with PSEH */
-#include <pseh/pseh.h>
-
-/* CSRSS Header */
-#include <csrss/csrss.h>
-
-/* Helper Header */
-#include <reactos/helper.h>
-
-/* Probe and capture */
-#include <reactos/probe.h>
-
-/* Public Win32K Headers */
-#include <win32k/callback.h>
-#include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
-#include <win32k/ntgdityp.h>
-#include <win32k/ntgdibad.h>
-#include <ntgdi.h>
 #endif

Added: branches/nwin32/subsystems/win32/win32k/win32k.sln
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…
==============================================================================
--- branches/nwin32/subsystems/win32/win32k/win32k.sln (added)
+++ branches/nwin32/subsystems/win32/win32k/win32k.sln [iso-8859-1] Mon Jul 21 16:37:38
2008
@@ -1,0 +1,32 @@
+ï»¿
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32k",
"win32k_vc9.vcproj", "{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - ReactOS headers|Win32 = Debug - ReactOS headers|Win32
+		Debug|Win32 = Debug|Win32
+		Release - ReactOS headers|Win32 = Release - ReactOS headers|Win32
+		Release|Win32 = Release|Win32
+		Speed - ReactOS headers|Win32 = Speed - ReactOS headers|Win32
+		Speed|Win32 = Speed|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Debug - ReactOS headers|Win32.ActiveCfg = Debug
- ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Debug - ReactOS headers|Win32.Build.0 = Debug -
ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Debug|Win32.Build.0 = Debug|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Release - ReactOS headers|Win32.ActiveCfg =
Release - ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Release - ReactOS headers|Win32.Build.0 =
Release - ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Release|Win32.ActiveCfg = Release|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Release|Win32.Build.0 = Release|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Speed - ReactOS headers|Win32.ActiveCfg = Speed
- ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Speed - ReactOS headers|Win32.Build.0 = Speed -
ReactOS headers|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Speed|Win32.ActiveCfg = Speed|Win32
+		{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}.Speed|Win32.Build.0 = Speed|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Propchange: branches/nwin32/subsystems/win32/win32k/win32k.sln
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/nwin32/subsystems/win32/win32k/win32k_vc9.vcproj
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…
==============================================================================
--- branches/nwin32/subsystems/win32/win32k/win32k_vc9.vcproj (added)
+++ branches/nwin32/subsystems/win32/win32k/win32k_vc9.vcproj [iso-8859-1] Mon Jul 21
16:37:38 2008
@@ -1,0 +1,782 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="win32k"
+	ProjectGUID="{DD15D0E7-FE29-453E-8EF3-FD8AA6744045}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Debug"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Debug"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_CRT_SECURE_NO_WARNINGS;_DEBUG;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Debug;..\..\..\output-i386\hal\hal\vc9\Debug;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Debug;..\..\..\output-i386\lib\sdk\crt\vc9\Debug;..\..\..\output-i386\lib\pseh\vc9\Debug"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/win32k.pdb"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Release"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Release"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_CRT_SECURE_NO_WARNINGS;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				StringPooling="true"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib freetype.lib libcntpr.lib
pseh.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Release;..\..\..\output-i386\hal\hal\vc9\Release;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Release;..\..\..\output-i386\lib\sdk\crt\vc9\Release;..\..\..\output-i386\lib\pseh\vc9\Release"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="true"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Speed|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Speed"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Speed"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_CRT_SECURE_NO_WARNINGS;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="0"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib freetype.lib libcntpr.lib
pseh.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Speed;..\..\..\output-i386\hal\hal\vc9\Speed;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Speed;..\..\..\output-i386\lib\sdk\crt\vc9\Speed;..\..\..\output-i386\lib\pseh\vc9\Speed"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="false"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug - ReactOS headers|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Debug - ReactOS
headers"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Debug -
ReactOS headers"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;_CRT_SECURE_NO_WARNINGS;_DEBUG;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib freetype.lib libcntpr.lib
pseh.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Debug - ReactOS
headers;..\..\..\output-i386\hal\hal\vc9\Debug - ReactOS
headers;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Debug - ReactOS
headers;..\..\..\output-i386\lib\sdk\crt\vc9\Debug - ReactOS
headers;..\..\..\output-i386\lib\pseh\vc9\Debug - ReactOS headers"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/win32k.pdb"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - ReactOS headers|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Release -
ReactOS headers"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Release -
ReactOS headers"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;_CRT_SECURE_NO_WARNINGS;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				StringPooling="true"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib freetype.lib libcntpr.lib
pseh.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Release -
ReactOS headers;..\..\..\output-i386\hal\hal\vc9\Release - ReactOS
headers;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Release - ReactOS
headers;..\..\..\output-i386\lib\sdk\crt\vc9\Release - ReactOS
headers;..\..\..\output-i386\lib\pseh\vc9\Release - ReactOS headers"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="true"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Speed - ReactOS headers|Win32"
+			OutputDirectory="..\..\..\output-i386\subsystems\win32\win32k\vc9\Speed - ReactOS
headers"
+			IntermediateDirectory="..\..\..\obj-i386\subsystems\win32\win32k\vc9\Speed -
ReactOS headers"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+				PreprocessorDefinitions=";DBG=1;KDBG=1;_CRT_SECURE_NO_WARNINGS;_M_IX86;_SEH_ENABLE_TRACE;_USRDLL;_WIN32K_;_WINDOWS;_X86_;__REACTOS__;__i386__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="win32k.h"
+				WarningLevel="0"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+				CallingConvention="2"
+				CompileAs="1"
+				ForcedIncludeFiles="warning.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="./;include;include;../../../include/reactos/subsys;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/mc;../../../include/reactos/libs;..\..\..\obj-i386\include;..\..\..\obj-i386\include\reactos;../../../include/psdk;../../../include/psdk;../../../include/ddk;../../../include/GL"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /ALIGN:0x20 /SECTION:INIT,D
/IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096"
+				AdditionalDependencies="ntoskrnl.lib hal.lib freetype.lib libcntpr.lib
pseh.lib"
+				OutputFile="$(OutDir)/win32k.sys"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\output-i386\ntoskrnl\vc9\Speed - ReactOS
headers;..\..\..\output-i386\hal\hal\vc9\Speed - ReactOS
headers;..\..\..\output-i386\dll\3rdparty\freetype\vc9\Speed - ReactOS
headers;..\..\..\output-i386\lib\sdk\crt\vc9\Speed - ReactOS
headers;..\..\..\output-i386\lib\pseh\vc9\Speed - ReactOS headers"
+				GenerateManifest="false"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile="../../../obj-i386/subsystems/win32/win32k/vc9/win32k_msvc.def"
+				GenerateDebugInformation="false"
+				SubSystem="3"
+				Driver="1"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DriverEntry@8"
+				BaseAddress="0x10000"
+				RandomizedBaseAddress="0"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S"
+			>
+			<Filter
+				Name="eng"
+				>
+				<File
+					RelativePath="eng\engblt.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Speed|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug - ReactOS headers|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release - ReactOS headers|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Speed - ReactOS headers|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="eng\engbrush.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engclip.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engdev.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engdrv.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engerror.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engevent.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engfile.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engfloat.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engfont.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engmem.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engmisc.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engpaint.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engpal.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engpath.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engpoint.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engprint.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engquery.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engrtl.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engsem.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engsurf.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engtext.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engwnd.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engxform.c"
+					>
+				</File>
+				<File
+					RelativePath="eng\engxlate.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gre"
+				>
+				<File
+					RelativePath="gre\init.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="ntddraw"
+				>
+				<File
+					RelativePath="ntddraw\ddeng.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="win32k.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath=".\win32k.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Propchange: branches/nwin32/subsystems/win32/win32k/win32k_vc9.vcproj
------------------------------------------------------------------------------
    svn:eol-style = native


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [fireball] 34648: - Rewrite the header file to achieve better compatibility. - Add project/solution for compiling with MSVC (it actually compiles and links), the project file is a tweaked rbuild-generated one.