Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[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.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

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

1 0

[jmorlan] 34647: MmReleasePageMemoryConsumer: When giving the page directly to a pending allocation request, zero it first. (Bug 3543)
by jmorlan＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: jmorlan Date: Mon Jul 21 16:30:41 2008 New Revision: 34647 URL: http://svn.reactos.org/svn/reactos?rev=34647&view=rev Log: MmReleasePageMemoryConsumer: When giving the page directly to a pending allocation request, zero it first. (Bug 3543) Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Jul 21 16:30:41 2008 @@ -115,6 +115,7 @@ Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); KeReleaseSpinLock(&AllocationListLock, oldIrql); if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); + MiZeroPage(Page); Request->Page = Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); }

1 0

[fireball] 34646: - Commit totally stubbed win32k by Stefan Ginsberg.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: fireball Date: Mon Jul 21 16:00:16 2008 New Revision: 34646 URL: http://svn.reactos.org/svn/reactos?rev=34646&view=rev Log: - Commit totally stubbed win32k by Stefan Ginsberg. Added: branches/nwin32/subsystems/win32/win32k/eng/ (with props) branches/nwin32/subsystems/win32/win32k/eng/engblt.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engbrush.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engclip.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engdev.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engdrv.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engerror.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engevent.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engfile.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engfloat.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engfont.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engmem.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engmisc.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engpaint.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engpal.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engpath.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engpoint.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engprint.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engquery.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engrtl.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engsem.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engsurf.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engtext.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engwnd.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engxform.c (with props) branches/nwin32/subsystems/win32/win32k/eng/engxlate.c (with props) branches/nwin32/subsystems/win32/win32k/gre/ (with props) branches/nwin32/subsystems/win32/win32k/gre/init.c (with props) branches/nwin32/subsystems/win32/win32k/include/win32k.h (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/ (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c (with props) branches/nwin32/subsystems/win32/win32k/ntgdi/ (with props) branches/nwin32/subsystems/win32/win32k/ntuser/ (with props) branches/nwin32/subsystems/win32/win32k/todo.c (with props) Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db branches/nwin32/subsystems/win32/win32k/win32k.def branches/nwin32/subsystems/win32/win32k/win32k.rbuild branches/nwin32/subsystems/win32/win32k/win32k.rc Propchange: branches/nwin32/subsystems/win32/win32k/eng/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 21 16:00:16 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nwin32/subsystems/win32/win32k/eng/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nwin32/subsystems/win32/win32k/eng/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nwin32/subsystems/win32/win32k/eng/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nwin32/subsystems/win32/win32k/eng/engblt.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engblt.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engblt.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,119 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engblt.c + * PURPOSE: Bit-Block Transfer Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngAlphaBlend(IN SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN CLIPOBJ* ClipRegion, + IN XLATEOBJ* ColorTranslation, + IN PRECTL DestRect, + IN PRECTL SourceRect, + IN BLENDOBJ* BlendObj) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngBitBlt(SURFOBJ* DestSurf, + SURFOBJ* SourceSurf, + SURFOBJ* Mask, + CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, + PRECTL DestRect, + PPOINTL SourcePoint, + PPOINTL MaskOrigin, + BRUSHOBJ* BrushObj, + PPOINTL BrushOrigin, + ROP4 Rop4) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngStretchBlt(IN SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN SURFOBJ* Mask, + IN CLIPOBJ* ClipRegion, + IN XLATEOBJ* ColorTranslation, + IN COLORADJUSTMENT* ColorAdjustment, + IN PPOINTL BrushOrigin, + IN PRECTL prclDest, + IN PRECTL prclSource, + IN PPOINTL MaskOrigin, + IN ULONG Mode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngPlgBlt( + IN SURFOBJ *Dest, + IN SURFOBJ *Source, + IN SURFOBJ *Mask, + IN CLIPOBJ *Clip, + IN XLATEOBJ *Xlate, + IN COLORADJUSTMENT *ColorAdjustment, + IN POINTL *BrusOrigin, + IN POINTFIX *DestPoints, + IN RECTL *SourceRect, + IN POINTL *MaskPoint, + IN ULONG Mode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngStretchBltROP(IN SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN SURFOBJ* Mask, + IN CLIPOBJ* ClipRegion, + IN XLATEOBJ* ColorTranslation, + IN COLORADJUSTMENT* ColorAdjustment, + IN PPOINTL BrushOrigin, + IN PRECTL DestRect, + IN PRECTL SourceRect, + IN PPOINTL MaskPoint, + IN ULONG Mode, + IN BRUSHOBJ* BrushObj, + IN DWORD Rop4) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngTransparentBlt(IN SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN CLIPOBJ* ClipRegion, + IN XLATEOBJ* ColorTranslation, + IN PRECTL prclDest, + IN PRECTL prclSource, + IN ULONG iTransColor, + IN ULONG ulReserved) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engblt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engbrush.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,48 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engbrush.c + * PURPOSE: BRUSHOBJ Manipulation Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +HANDLE +APIENTRY +BRUSHOBJ_hGetColorTransform(IN BRUSHOBJ* BrushObj) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ* BrushObj, + IN ULONG ObjSize) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ* BrushObj) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +APIENTRY +BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ* BrushObj) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engbrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engclip.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engclip.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engclip.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,60 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engclip.c + * PURPOSE: CLIPOBJ Manipulation Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj, + IN ULONG ObjSize, + OUT PULONG EnumRects) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj, + IN BOOL DoAll, + IN ULONG ClipType, + IN ULONG BuildOrder, + IN ULONG MaxRects) +{ + UNIMPLEMENTED; + return 0; +} + +PATHOBJ* +APIENTRY +CLIPOBJ_ppoGetPath(IN CLIPOBJ* ClipObj) +{ + UNIMPLEMENTED; + return NULL; +} + +CLIPOBJ* +APIENTRY +EngCreateClip(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngDeleteClip(CLIPOBJ* ClipObj) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engclip.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engdev.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engdev.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engdev.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,53 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engdev.c + * PURPOSE: Device Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +EngDeviceIoControl( + IN HANDLE hDevice, + IN DWORD dwIoControlCode, + IN PVOID lpInBuffer, + IN DWORD nInBufferSize, + IN OUT PVOID lpOutBuffer, + IN DWORD nOutBufferSize, + OUT PDWORD lpBytesReturned) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +EngHangNotification(IN HDEV hDev, + IN PVOID Reserved) +{ + UNIMPLEMENTED; + return EHN_ERROR; +} + +BOOL +APIENTRY +EngQueryDeviceAttribute( + IN HDEV hdev, + IN ENG_DEVICE_ATTRIBUTE devAttr, + IN VOID *pvIn, + IN ULONG ulInSize, + OUT VOID *pvOut, + OUT ULONG ulOutSize) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engdev.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engdrv.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engdrv.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engdrv.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,59 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engdrv.c + * PURPOSE: Driver Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +HDRVOBJ +APIENTRY +EngCreateDriverObj(PVOID pvObj, + FREEOBJPROC pFreeObjProc, + HDEV hdev) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngDeleteDriverObj(IN HDRVOBJ hdo, + IN BOOL bCallBack, + IN BOOL bLocked) +{ + UNIMPLEMENTED; + return FALSE; +} + +PWSTR +APIENTRY +EngGetDriverName(IN HDEV hDev) +{ + UNIMPLEMENTED; + return NULL; +} + +DRIVEROBJ* +APIENTRY +EngLockDriverObj(IN HDRVOBJ hDriverObj) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngUnlockDriverObj(IN HDRVOBJ hDriverObj) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engdrv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engerror.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engerror.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engerror.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,39 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engerror.c + * PURPOSE: Error Handling Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID +APIENTRY +EngDebugPrint(IN PCHAR StandardPrefix, + IN PCHAR DebugMessage, + IN va_list ap) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngSetLastError(IN ULONG iError) +{ + UNIMPLEMENTED; +} + +ULONG +APIENTRY +EngGetLastError(VOID) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engerror.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engevent.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,150 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engevent.c + * PURPOSE: Event Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngCreateEvent(OUT PEVENT* Event) +{ + /* Allocate memory for the event */ + *Event = EngAllocMem(FL_NONPAGED_MEMORY, + sizeof(KEVENT), + 0); + + /* Check if we are out of memory */ + if (!*Event) + { + /* We are, fail */ + return FALSE; + } + + /* Initialize the event */ + KeInitializeEvent((PKEVENT)*Event, + SynchronizationEvent, + FALSE); + + /* Return success */ + return TRUE; +} + +BOOL +APIENTRY +EngDeleteEvent(IN PEVENT Event) +{ + /* Free the event */ + EngFreeMem(Event); + + /* Return success */ + return TRUE; +} + +VOID +APIENTRY +EngClearEvent(IN PEVENT Event) +{ + /* Clear the event */ + KeClearEvent((PKEVENT)Event); +} + +LONG +APIENTRY +EngSetEvent(IN PEVENT Event) +{ + /* Set the event */ + return KeSetEvent((PKEVENT)Event, + IO_NO_INCREMENT, + FALSE); +} + +LONG +APIENTRY +EngReadStateEvent(IN PEVENT Event) +{ + /* Read the event state */ + return KeReadStateEvent((PKEVENT)Event); +} + +PEVENT +APIENTRY +EngMapEvent(IN HDEV hDev, + IN HANDLE hUserObject, + IN PVOID Reserved1, + IN PVOID Reserved2, + IN PVOID Reserved3) +{ + PKEVENT Event; + NTSTATUS Status; + + /* FIXME: Should we do anything with the reserved parameters? */ + + /* Reference the object */ + Status = ObReferenceObjectByHandle(hUserObject, + EVENT_MODIFY_STATE, + ExEventObjectType, + KernelMode, + (PVOID*)&Event, + NULL); + + /* Only do this if we succeed */ + if (NT_SUCCESS(Status)) + { + /* Pulse the event */ + KePulseEvent(Event, + EVENT_INCREMENT, + FALSE); + } + + /* Return the event body */ + return (PEVENT)Event; +} + +BOOL +APIENTRY +EngUnmapEvent(IN PEVENT Event) +{ + /* Dereference the event */ + ObDereferenceObject(Event); + + /* Return success */ + return TRUE; +} + +BOOL +APIENTRY +EngWaitForSingleObject(IN PEVENT Event, + IN PLARGE_INTEGER TimeOut) +{ + NTSTATUS Status; + + /* Validate parameters */ + if (!Event) return FALSE; + + /* Wait for the event */ + Status = KeWaitForSingleObject(Event, + Executive, + KernelMode, + FALSE, + TimeOut); + + /* Check if we timed out */ + if (Status != STATUS_SUCCESS) + { + /* We did, fail */ + return FALSE; + } + + /* Return success */ + return TRUE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engevent.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engfile.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engfile.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,165 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engfile.c + * PURPOSE: File Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngDeleteFile(IN PWSTR pwszFileName) +{ + UNIMPLEMENTED; + return FALSE; +} + +NTSTATUS +APIENTRY +EngFileIoControl(IN PFILE_OBJECT FileObject, + IN ULONG IoControlCode, + IN PVOID InputBuffer, + IN SIZE_T InputBufferLength, + OUT PVOID OutputBuffer, + IN SIZE_T OutputBufferLength, + OUT PULONG Information) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +VOID +APIENTRY +EngFileWrite(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN SIZE_T Length, + IN PSIZE_T BytesWritten) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngGetFileChangeTime(IN HANDLE hFile, + OUT PLARGE_INTEGER ChangeTime) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngGetFilePath(IN HANDLE hFile, + OUT WCHAR (*pDest)[MAX_PATH+1]) +{ + UNIMPLEMENTED; + return FALSE; +} + +HANDLE +APIENTRY +EngLoadImage(IN PWSTR pwszDriver) +{ + UNIMPLEMENTED; + return NULL; +} + +HANDLE +APIENTRY +EngLoadModule(IN PWSTR pwszModule) +{ + UNIMPLEMENTED; + return NULL; +} + +HANDLE +APIENTRY +EngLoadModuleForWrite(IN PWSTR pwszModule, + IN ULONG cjSizeOfModule) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngFreeModule(IN HANDLE hModule) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngUnloadImage(IN HANDLE hModule) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngMapFile(IN PWSTR pwsz, + IN ULONG cjSize, + OUT PULONG_PTR piFile) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngUnmapFile(IN ULONG_PTR iFile) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngMapFontFile(ULONG_PTR iFile, + PULONG* ppjBuf, + PULONG pcjBuf) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +EngUnmapFontFile(ULONG_PTR iFile) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngMapFontFileFD(IN ULONG_PTR iFile, + OUT PULONG* ppjBuf, + OUT PULONG pcjBuf) +{ + UNIMPLEMENTED; + return FALSE; +} + +PVOID +APIENTRY +EngMapModule(IN HANDLE hModule, + OUT PULONG Size) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngUnmapFontFileFD(IN ULONG_PTR iFile) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engfile.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engfloat.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engfloat.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engfloat.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,254 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engfloat.c + * PURPOSE: Floating Point Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +ULONG +APIENTRY +EngSaveFloatingPointState(OUT PVOID Buffer, + IN ULONG cjBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL +APIENTRY +EngRestoreFloatingPointState(IN PVOID Buffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +FLOATOBJ_Add (IN OUT PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_AddFloat(IN OUT PFLOATOBJ Float, + IN FLOATL fAddend) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_AddFloatObj(PFLOATOBJ Float1, + PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_AddLong(IN OUT PFLOATOBJ Float, + IN LONG lAddend) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_Div(IN OUT PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_DivFloat(IN OUT PFLOATOBJ Float, + IN FLOATL fDivisor) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_DivFloatObj(PFLOATOBJ Float1, + PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_DivLong(IN OUT PFLOATOBJ Float, + IN LONG lDivisor) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_Mul(IN OUT PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_MulFloat(IN OUT PFLOATOBJ Float1, + IN FLOATL fMultiplicand) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_MulFloatObj(PFLOATOBJ Float1, + PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_MulLong(IN OUT PFLOATOBJ Float, + IN LONG lMultiplicand) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_Sub(IN OUT PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_SubFloat(IN OUT PFLOATOBJ Float, + IN FLOATL fSubtrahend) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_SubFloatObj(PFLOATOBJ Float1, + PFLOATOBJ Float2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_SubLong(IN OUT PFLOATOBJ Float, + IN LONG lSubtrahend) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_Neg(IN OUT PFLOATOBJ Float) +{ + UNIMPLEMENTED; +} + +LONG +APIENTRY +FLOATOBJ_GetFloat(IN PFLOATOBJ Float) +{ + UNIMPLEMENTED; + return 0; +} + +LONG +APIENTRY +FLOATOBJ_GetLong(IN PFLOATOBJ Float) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +APIENTRY +FLOATOBJ_SetFloat(OUT PFLOATOBJ Float, + IN FLOATL fAssignement) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_SetLong(OUT PFLOATOBJ Float, + IN LONG lAssignment) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +FLOATOBJ_Equal(IN PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +FLOATOBJ_EqualLong(IN PFLOATOBJ Float, + IN LONG lCompare) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +FLOATOBJ_GreaterThan(IN PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +FLOATOBJ_GreaterThanLong(IN PFLOATOBJ Float, + IN LONG lCompare) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +FLOATOBJ_LessThan(IN PFLOATOBJ Float1, + IN PFLOATOBJ Float2) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +FLOATOBJ_LessThanLong(IN PFLOATOBJ Float, + IN LONG lCompare) +{ + UNIMPLEMENTED; + return FALSE; +} + Propchange: branches/nwin32/subsystems/win32/win32k/eng/engfloat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engfont.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engfont.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engfont.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,157 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engfont.c + * PURPOSE: Font Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +FD_GLYPHSET* +APIENTRY +EngComputeGlyphSet(IN INT nCodePage, + IN INT nFirstChar, + IN INT cChars) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +EngFntCacheAlloc(IN ULONG FastCheckSum, + IN ULONG ulSize) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngFntCacheFault(IN ULONG ulFastCheckSum, + IN ULONG iFaultMode) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngFntCacheLookUp(IN ULONG FastCheckSum, + OUT PULONG pulSize) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngGetType1FontList( + IN HDEV hdev, + OUT TYPE1_FONT *pType1Buffer, + IN ULONG cjType1Buffer, + OUT PULONG pulLocalFonts, + OUT PULONG pulRemoteFonts, + OUT LARGE_INTEGER *pLastModified) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +FONTOBJ_cGetAllGlyphHandles( + IN FONTOBJ *pfo, + OUT HGLYPH *phg) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +FONTOBJ_cGetGlyphs(IN FONTOBJ *pfo, + IN ULONG iMode, + IN ULONG cGlyph, + IN HGLYPH *phg, + OUT PVOID *ppvGlyph) +{ + UNIMPLEMENTED; + return 0; +} + +FD_GLYPHSET* +APIENTRY +FONTOBJ_pfdg(IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +IFIMETRICS* +APIENTRY +FONTOBJ_pifi(IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +PBYTE +APIENTRY +FONTOBJ_pjOpenTypeTablePointer(IN FONTOBJ *pfo, + IN ULONG ulTag, + OUT ULONG *pcjTable) +{ + UNIMPLEMENTED; + return NULL; +} + +PFD_GLYPHATTR +APIENTRY +FONTOBJ_pQueryGlyphAttrs(IN FONTOBJ *pfo, + IN ULONG iMode) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +FONTOBJ_pvTrueTypeFontFile(IN FONTOBJ *pfo, + OUT ULONG *pcjFile) +{ + UNIMPLEMENTED; + return NULL; +} + +LPWSTR +APIENTRY +FONTOBJ_pwszFontFilePaths(IN FONTOBJ *pfo, + OUT ULONG *pcwc) +{ + UNIMPLEMENTED; + return NULL; +} + +XFORMOBJ* +APIENTRY +FONTOBJ_pxoGetXform(IN FONTOBJ *pfo) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +FONTOBJ_vGetInfo(IN FONTOBJ *pfo, + IN ULONG cjSize, + OUT FONTINFO *pfi) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engfont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engmem.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engmem.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engmem.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,119 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engmem.c + * PURPOSE: Memory Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +PVOID +APIENTRY +EngAllocMem(IN ULONG Flags, + IN ULONG MemSize, + IN ULONG Tag) +{ + PVOID AllocatedMemory; + POOL_TYPE AllocationType; + + /* Get the requested pool type */ + AllocationType = (Flags & FL_NONPAGED_MEMORY) ? NonPagedPool : PagedPool; + + /* Allocate the memory */ + AllocatedMemory = ExAllocatePoolWithTag(AllocationType, + MemSize, + Tag); + + /* Zero initialize the memory if requested */ + if (Flags & FL_ZERO_MEMORY && AllocatedMemory) + { + /* Zero it out */ + RtlZeroMemory(AllocatedMemory, + MemSize); + } + + /* Return the allocated memory */ + return AllocatedMemory; +} + +VOID +APIENTRY +EngFreeMem(IN PVOID Memory) +{ + /* Free the memory */ + ExFreePool(Memory); +} + +PVOID +APIENTRY +EngAllocUserMem(IN SIZE_T cjSize, + IN ULONG Tag) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngFreeUserMem(IN PVOID UserMemory) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngAllocSectionMem(IN PVOID SectionObject, + IN ULONG Flags, + IN SIZE_T MemSize, + IN ULONG Tag) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOLEAN +APIENTRY +EngFreeSectionMem(IN PVOID SectionObject OPTIONAL, + IN PVOID MappedBase) +{ + UNIMPLEMENTED; + return FALSE; +} + +HANDLE +APIENTRY +EngSecureMem(IN PVOID Address, + IN ULONG Length) +{ + /* Secure the memory area for read & write access */ + return MmSecureVirtualMemory(Address, + Length, + PAGE_READWRITE); +} + +VOID +APIENTRY +EngUnsecureMem(IN HANDLE hSecure) +{ + /* Unsecure the memory area */ + MmUnsecureVirtualMemory((PVOID)hSecure); +} + + +BOOLEAN +APIENTRY +EngMapSection(IN PVOID SectionObject, + IN BOOLEAN Map, + IN HANDLE Process, + IN PVOID* BaseAddress) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engmem.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engmisc.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,96 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engmisc.c + * PURPOSE: Miscellaneous Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID +APIENTRY +EngSort(IN OUT PBYTE Buffer, + IN ULONG ElemSize, + IN ULONG ElemCount, + IN SORTCOMP CompFunc) +{ + /* Forward to the CRT */ + qsort(Buffer, ElemCount, ElemSize, CompFunc); +} + +PVOID +APIENTRY +EngFindImageProcAddress(IN HANDLE hModule, + IN PSTR ProcName) +{ + UNIMPLEMENTED; + return NULL; +} + +PVOID +APIENTRY +EngFindResource(IN HANDLE hModule, + IN INT iName, + IN INT iType, + OUT PULONG pulSize) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngLpkInstalled(VOID) +{ + UNIMPLEMENTED; + return FALSE; +} + +INT +APIENTRY +EngMulDiv(IN INT a, + IN INT b, + IN INT c) +{ + UNIMPLEMENTED; + return 0; +} + +HANDLE +APIENTRY +EngGetCurrentProcessId(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +HANDLE +APIENTRY +EngGetCurrentThreadId(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +HANDLE +APIENTRY +EngGetProcessHandle(VOID) +{ + /* Deprecated */ + return NULL; +} + +ULONGLONG +APIENTRY +EngGetTickCount(VOID) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engmisc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engpaint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engpaint.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engpaint.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,61 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engpaint.c + * PURPOSE: Miscellaneous Painting Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngGradientFill( + IN SURFOBJ *psoDest, + IN CLIPOBJ *pco, + IN XLATEOBJ *pxlo, + IN TRIVERTEX *pVertex, + IN ULONG nVertex, + IN PVOID pMesh, + IN ULONG nMesh, + IN RECTL *prclExtents, + IN POINTL *pptlDitherOrg, + IN ULONG ulMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngPaint(IN SURFOBJ *pso, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +APIENTRY +EngNineGrid(IN SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN CLIPOBJ* ClipObj, + IN XLATEOBJ* XlateObj, + IN RECTL* prclSource, + IN RECTL* prclDest, + PVOID pvUnknown1, + PVOID pvUnknown2, + DWORD dwReserved) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engpaint.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engpal.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engpal.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engpal.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,113 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engpal.c + * PURPOSE: Path Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +HPALETTE +APIENTRY +EngCreatePalette( + IN ULONG iMode, + IN ULONG cColors, + IN ULONG *pulColors, + IN FLONG flRed, + IN FLONG flGreen, + IN FLONG flBlue) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngDeletePalette(IN HPALETTE hpal) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +EngQueryPalette( + IN HPALETTE hPal, + OUT ULONG *piMode, + IN ULONG cColors, + OUT ULONG *pulColors) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +EngDitherColor( + IN HDEV hdev, + IN ULONG iMode, + IN ULONG rgb, + OUT PULONG pul) +{ + UNIMPLEMENTED; + return 0; +} + +LONG +APIENTRY +HT_ComputeRGBGammaTable( + IN USHORT GammaTableEntries, + IN USHORT GammaTableType, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma, + OUT LPBYTE pGammaTable) +{ + UNIMPLEMENTED; + return 0; +} + +LONG +APIENTRY +HT_Get8BPPFormatPalette( + OUT LPPALETTEENTRY pPaletteEntry, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return 0; +} + +LONG +APIENTRY +HT_Get8BPPMaskPalette( + IN OUT LPPALETTEENTRY pPaletteEntry, + IN BOOL Use8BPPMaskPal, + IN BYTE CMYMask, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +PALOBJ_cGetColors( + IN PALOBJ *ppalo, + IN ULONG iStart, + IN ULONG cColors, + OUT ULONG *pulColors) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engpal.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engpath.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engpath.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engpath.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,177 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engpath.c + * PURPOSE: Path Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +PATHOBJ* +APIENTRY +EngCreatePath(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngDeletePath(IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngFillPath( + IN SURFOBJ *pso, + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN MIX mix, + IN FLONG flOptions) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngStrokeAndFillPath( + IN SURFOBJ *pso, + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN XFORMOBJ *pxo, + IN BRUSHOBJ *pboStroke, + IN LINEATTRS *plineattrs, + IN BRUSHOBJ *pboFill, + IN POINTL *pptlBrushOrg, + IN MIX mixFill, + IN FLONG flOptions) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngStrokePath( + IN SURFOBJ *pso, + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN XFORMOBJ *pxo, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN LINEATTRS *plineattrs, + IN MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngLineTo( + SURFOBJ *pso, + CLIPOBJ *pco, + BRUSHOBJ *pbo, + LONG x1, + LONG y1, + LONG x2, + LONG y2, + RECTL *prclBounds, + MIX mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bCloseFigure(IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bEnum(IN PATHOBJ *ppo, + OUT PATHDATA *ppd) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bEnumClipLines(IN PATHOBJ *ppo, + IN ULONG cb, + OUT CLIPLINE *pcl) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bMoveTo(IN PATHOBJ *ppo, + IN POINTFIX ptfx) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bPolyBezierTo(IN PATHOBJ *ppo, + IN POINTFIX *pptfx, + IN ULONG cptfx) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +PATHOBJ_bPolyLineTo(IN PATHOBJ *ppo, + IN POINTFIX *pptfx, + IN ULONG cptfx) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +PATHOBJ_vEnumStart(IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +PATHOBJ_vEnumStartClipLines(IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN SURFOBJ *pso, + IN LINEATTRS *pla) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +PATHOBJ_vGetBounds(IN PATHOBJ *ppo, + OUT PRECTFX prectfx) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engpath.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engpoint.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engpoint.c + * PURPOSE: Pointer Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID +APIENTRY +EngMovePointer( + IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + UNIMPLEMENTED; +} + +ULONG +APIENTRY +EngSetPointerShape( + IN SURFOBJ *pso, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN LONG xHot, + IN LONG yHot, + IN LONG x, + IN LONG y, + IN RECTL *prcl, + IN FLONG fl) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL +APIENTRY +EngSetPointerTag( + IN HDEV hdev, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN FLONG fl) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engpoint.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engprint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engprint.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engprint.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,131 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engprint.c + * PURPOSE: Printing Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngCheckAbort(IN SURFOBJ* Surface) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngEnumForms( + IN HANDLE hPrinter, + IN DWORD Level, + OUT LPBYTE pForm, + IN DWORD cbBuf, + OUT LPDWORD pcbNeeded, + OUT LPDWORD pcReturned) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngGetForm( + IN HANDLE hPrinter, + IN LPWSTR pFormName, + IN DWORD Level, + OUT LPBYTE pForm, + IN DWORD cbBuf, + OUT LPDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngGetPrinter( + IN HANDLE hPrinter, + IN DWORD dwLevel, + OUT PBYTE pPrinter, + IN DWORD cbBuf, + OUT PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD +APIENTRY +EngGetPrinterData( + IN HANDLE hPrinter, + IN PWSTR pValueName, + OUT PDWORD pType, + OUT PBYTE pData, + IN DWORD nSize, + OUT PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +APIENTRY +EngSetPrinterData( + IN HANDLE hPrinter, + IN LPWSTR pType, + IN DWORD dwType, + IN LPBYTE lpbPrinterData, + IN DWORD cjPrinterData) +{ + UNIMPLEMENTED; + return 0; +} + +PWSTR +APIENTRY +EngGetPrinterDataFileName(IN HDEV hDev) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngGetPrinterDriver(IN HANDLE hPrinter, + IN PWSTR pEnvironment, + IN DWORD dwLevel, + OUT BYTE *lpbDrvInfo, + IN DWORD cbBuf, + OUT DWORD *pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngMarkBandingSurface(IN HSURF hSurface) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngWritePrinter(IN HANDLE hPrinter, + IN PVOID pBuf, + IN DWORD cbBuf, + OUT PDWORD pcWritten) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engprint.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engquery.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engquery.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engquery.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,45 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engquery.c + * PURPOSE: Miscellaneous Query Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID +APIENTRY +EngQueryLocalTime(OUT PENG_TIME_FIELDS ptf) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngQueryPerformanceCounter(OUT PLONGLONG PerformanceCount) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngQueryPerformanceFrequency(OUT PLONGLONG Frequency) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngQuerySystemAttribute(IN ENG_SYSTEM_ATTRIBUTE CapNum, + OUT PDWORD Capability) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engquery.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engrtl.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engrtl.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,81 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engrtl.c + * PURPOSE: Rtl Wrapper Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID +APIENTRY +EngGetCurrentCodePage(OUT PUSHORT OemCodePage, + OUT PUSHORT AnsiCodePage) +{ + /* Call Rtl */ + return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); +} + +VOID +APIENTRY +EngMultiByteToUnicodeN( + OUT LPWSTR UnicodeString, + IN ULONG MaxBytesInUnicodeString, + OUT PULONG BytesInUnicodeString, + IN PCHAR MultiByteString, + IN ULONG BytesInMultiByteString) +{ + /* Call Rtl */ + RtlMultiByteToUnicodeN(UnicodeString, + MaxBytesInUnicodeString, + BytesInUnicodeString, + MultiByteString, + BytesInMultiByteString); +} + +VOID +APIENTRY +EngUnicodeToMultiByteN(OUT PCHAR MultiByteString, + IN ULONG MaxBytesInMultiByteString, + OUT PULONG BytesInMultiByteString, + IN PWSTR UnicodeString, + IN ULONG BytesInUnicodeString) +{ + /* Call Rtl */ + RtlUnicodeToMultiByteN(MultiByteString, + MaxBytesInMultiByteString, + BytesInMultiByteString, + UnicodeString, + BytesInUnicodeString); +} + +INT +APIENTRY +EngMultiByteToWideChar(IN UINT CodePage, + OUT PWSTR WideCharString, + IN INT BytesInWideCharString, + IN PSTR MultiByteString, + IN INT BytesInMultiByteString) +{ + UNIMPLEMENTED; + return 0; +} + +INT +APIENTRY +EngWideCharToMultiByte(IN UINT CodePage, + IN PWSTR WideCharString, + IN INT BytesInWideCharString, + OUT PSTR MultiByteString, + IN INT BytesInMultiByteString) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engrtl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engsem.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engsem.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engsem.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,75 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engsem.c + * PURPOSE: Semaphore Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +HSEMAPHORE +APIENTRY +EngCreateSemaphore(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +APIENTRY +EngDeleteSemaphore(IN HSEMAPHORE hSem) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngInitializeSafeSemaphore(OUT ENGSAFESEMAPHORE* Semaphore) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +EngDeleteSafeSemaphore(IN OUT ENGSAFESEMAPHORE* Semaphore) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngAcquireSemaphore(IN HSEMAPHORE hSem) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +EngReleaseSemaphore(IN HSEMAPHORE hSem) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngIsSemaphoreOwned(IN HSEMAPHORE hSem) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngIsSemaphoreOwnedByCurrentThread(IN HSEMAPHORE hSem) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engsem.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engsurf.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,118 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engsurf.c + * PURPOSE: Surface and Bitmap Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +HBITMAP +APIENTRY +EngCreateBitmap(IN SIZEL Size, + IN LONG Width, + IN ULONG Format, + IN ULONG Flags, + IN PVOID Bits) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngCopyBits(OUT SURFOBJ* DestSurf, + IN SURFOBJ* SourceSurf, + IN CLIPOBJ* ClipRegion, + IN XLATEOBJ* ColorTranslation, + IN PRECTL prclDest, + IN PPOINTL pptlSrc) +{ + UNIMPLEMENTED; + return FALSE; +} + +HBITMAP +APIENTRY +EngCreateDeviceBitmap(IN DHSURF dhSurf, + IN SIZEL Size, + IN ULONG Format) +{ + UNIMPLEMENTED; + return NULL; +} + +HSURF +APIENTRY +EngCreateDeviceSurface(IN DHSURF dhSurf, + IN SIZEL Size, + IN ULONG Format) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngDeleteSurface(IN HSURF hSurf) +{ + UNIMPLEMENTED; + return FALSE; +} + +SURFOBJ* +APIENTRY +EngLockSurface(IN HSURF hSurf) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngUnlockSurface(IN SURFOBJ* Surface) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +EngAssociateSurface(IN HSURF hSurf, + IN HDEV hDev, + IN FLONG flHooks) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngEraseSurface(IN SURFOBJ* Surface, + IN PRECTL prcl, + IN ULONG iColor) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +EngModifySurface(IN HSURF hSurf, + IN HDEV hDev, + IN FLONG flHooks, + IN FLONG flSurface, + IN DHSURF dhSurf, + IN PVOID pvScan0, + IN LONG lDelta, + IN PVOID pvReserved) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engsurf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engtext.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engtext.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engtext.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engtext.c + * PURPOSE: Text Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngTextOut(IN SURFOBJ* Surface, + IN STROBJ* StringObj, + IN FONTOBJ* FontObj, + IN CLIPOBJ* ClipRegion, + IN PRECTL prclExtra, + IN PRECTL prclOpaque, + IN BRUSHOBJ* ForegroundBrush, + IN BRUSHOBJ* OpaqueBrush, + IN PPOINTL BrushOrigin, + IN MIX Mix) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +STROBJ_bEnum(IN STROBJ* StringObj, + OUT PULONG cGlyphpos, + OUT PGLYPHPOS* Glyphpos) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +STROBJ_bEnumPositionsOnly(IN STROBJ* StringObj, + OUT PULONG cGlyphpos, + OUT PGLYPHPOS* Glyphpos) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +STROBJ_bGetAdvanceWidths(IN STROBJ* StringObj, + IN ULONG iFirst, + IN ULONG cCharacters, + OUT POINTQF* pptqD) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD +APIENTRY +STROBJ_dwGetCodePage(IN STROBJ* StringObj) +{ + UNIMPLEMENTED; + return 0; +} + +FIX +APIENTRY +STROBJ_fxBreakExtra(IN STROBJ* StringObj) +{ + UNIMPLEMENTED; + return 0; +} + +FIX +APIENTRY +STROBJ_fxCharacterExtra(IN STROBJ* StringObj) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +APIENTRY +STROBJ_vEnumStart(IN STROBJ* StringObj) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engtext.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engwnd.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engwnd.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engwnd.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,72 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engwnd.c + * PURPOSE: WNDOBJ Manipulation Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +EngControlSprites(IN WNDOBJ* WindowObj, + IN FLONG Flags) +{ + UNIMPLEMENTED; + return FALSE; +} + +WNDOBJ* +APIENTRY +EngCreateWnd(SURFOBJ *pso, + HWND hwnd, + WNDOBJCHANGEPROC pfn, + FLONG fl, + INT iPixelFormat) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngDeleteWnd(IN WNDOBJ *pwo) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +WNDOBJ_bEnum(IN WNDOBJ* WindowObj, + IN ULONG BufferSize, + OUT PULONG Buffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +WNDOBJ_cEnumStart(IN WNDOBJ* WindowObj, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +APIENTRY +WNDOBJ_vSetConsumer(IN WNDOBJ* WindowObj, + IN PVOID pvConsumer) +{ + UNIMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engwnd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engxform.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engxform.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engxform.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,48 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engxform.c + * PURPOSE: XFORMOBJ Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +BOOL +APIENTRY +XFORMOBJ_bApplyXform( + IN XFORMOBJ *pxo, + IN ULONG iMode, + IN ULONG cPoints, + IN PVOID pvIn, + OUT PVOID pvOut) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG +APIENTRY +XFORMOBJ_iGetFloatObjXform( + IN XFORMOBJ *pxo, + OUT FLOATOBJ_XFORM *pxfo) +{ + UNIMPLEMENTED; + return 0; +} + +ULONG +APIENTRY +XFORMOBJ_iGetXform( + IN XFORMOBJ *pxo, + OUT XFORML *pxform) +{ + UNIMPLEMENTED; + return 0; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engxform.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/eng/engxlate.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engxlate.c (added) +++ branches/nwin32/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,54 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/engxlate.c + * PURPOSE: XLATEOBJ Support Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +ULONG +APIENTRY +XLATEOBJ_cGetPalette( + IN XLATEOBJ *pxlo, + IN ULONG iPal, + IN ULONG cPal, + OUT ULONG *pPal) +{ + UNIMPLEMENTED; + return 0; +} + +HANDLE +APIENTRY +XLATEOBJ_hGetColorTransform( + IN XLATEOBJ *pxlo) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +APIENTRY +XLATEOBJ_iXlate( + IN XLATEOBJ *pxlo, + IN ULONG iColor) +{ + UNIMPLEMENTED; + return 0; +} + +PULONG +APIENTRY +XLATEOBJ_piVector(IN XLATEOBJ* XlateObj) +{ + UNIMPLEMENTED; + return NULL; +} Propchange: branches/nwin32/subsystems/win32/win32k/eng/engxlate.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nwin32/subsystems/win32/win32k/gre/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 21 16:00:16 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nwin32/subsystems/win32/win32k/gre/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nwin32/subsystems/win32/win32k/gre/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nwin32/subsystems/win32/win32k/gre/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nwin32/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/gre/init.c (added) +++ branches/nwin32/subsystems/win32/win32k/gre/init.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/gre/init.c + * PURPOSE: Driver Initialization + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* DRIVER ENTRYPOINT *********************************************************/ + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/nwin32/subsystems/win32/win32k/gre/init.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/nwin32/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,112 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32K + * FILE: subsystems/win32/win32k/include/win32k.h + * PURPOSE: Main Win32K Header + * PROGRAMMER: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +/* Version Data */ +#undef __MSVCRT__ +#include <psdk/ntverp.h> +#define _WIN32_WINNT _WIN32_WINNT_WS03 +#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> + +/* 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 <stdlib.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 <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 Propchange: branches/nwin32/subsystems/win32/win32k/include/win32k.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 21 16:00:16 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,79 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/ddeng.c + * PURPOSE: Support Routines for DirectDraw + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +FLATPTR +APIENTRY +HeapVidMemAllocAligned(LPVIDMEM lpVidMem, + DWORD dwWidth, + DWORD dwHeight, + LPSURFACEALIGNMENT lpAlignment, + LPLONG lpNewPitch) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +APIENTRY +VidMemFree(LPVMEMHEAP pvmh, + FLATPTR ptr) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngAllocPrivateUserMem(PDD_SURFACE_LOCAL psl, + SIZE_T cj, + ULONG tag) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, + PVOID pv) +{ + UNIMPLEMENTED; +} + +DWORD +APIENTRY +EngDxIoctl(ULONG ulIoctl, + PVOID pBuffer, + ULONG ulBufferSize) +{ + UNIMPLEMENTED; + return 0; +} + +PDD_SURFACE_LOCAL +APIENTRY +EngLockDirectDrawSurface(HANDLE hSurface) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nwin32/subsystems/win32/win32k/ntgdi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 21 16:00:16 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nwin32/subsystems/win32/win32k/ntgdi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nwin32/subsystems/win32/win32k/ntgdi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nwin32/subsystems/win32/win32k/ntgdi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/nwin32/subsystems/win32/win32k/ntuser/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 21 16:00:16 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nwin32/subsystems/win32/win32k/ntuser/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nwin32/subsystems/win32/win32k/ntuser/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nwin32/subsystems/win32/win32k/ntuser/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nwin32/subsystems/win32/win32k/todo.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/todo.c (added) +++ branches/nwin32/subsystems/win32/win32k/todo.c [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,0 +1,34 @@ +Initialization -- Needs a total review for NT compatibility + -DriverEntry + - We are loaded once per session by smss. + - What functions does smss use to load us? When is DriverEntry actually called? + -What should DriverEntry do, and what should NtGdiInit and NtUserInitialize do? + -NtGdiInit + - When are we called and what should we do? + -NtUserInitialize + - Find out parameters and what we should do here. + +System calls: + -NtGdi compatible with 2003. Missing parameters only for NtGdiGetSpoolMessage. + - Add stubs in /ntgdi/ + -NtUser: Functions need to be researched for parameters. + We miss quite a few and I guess the functions which are compatible in name/parameter numbers may have ros-specific params. + In short, a lot of research and review is needed. + + +gdi32 and user32 + - Need to be fixed not to use ros-specific system calls. + - gdi32 is the easiest. Much is done but #if 0-ed due to remaining problems. + - user32 needs a big overview (*cough*, rewrite, *cough*) and fixup. *Requires more NtUser syscall documentation.* + + +Interaction with display drivers + - Videoprt needs cleanup (rewriteeeeeeeee) and review. I have begun some major cleanup, but not done yet (mostly code style and unfscking). + +Interaction with csrss and friends + - ... + + + +NOTE + The module is named "nwin32k" as to not conflict with win32k during build. Propchange: branches/nwin32/subsystems/win32/win32k/todo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,7 +1,3 @@ -# NAME ARG_COUNT -# -# Funcs order should match Windows XP 5.1.2600 SP2 -# NtGdiAbortDoc 1 NtGdiAbortPath 1 NtGdiAddFontResourceW 6 @@ -152,7 +148,6 @@ NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -NtGdiFlushUserBatch 0 NtGdiFlush 0 NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 @@ -671,35 +666,5 @@ NtGdiBRUSHOBJ_DeleteRbrush 2 NtGdiUMPDEngFreeUserMem 1 NtGdiDrawStream 3 -# -# -#ReactOS specific syscalls -NtGdiSetDIBits 7 -NtGdiSetViewportExtEx 4 -NtGdiSetViewportOrgEx 4 -NtGdiSetWindowExtEx 4 -NtGdiSetWindowOrgEx 4 -NtGdiGetFontFamilyInfo 4 -NtGdiOffsetViewportOrgEx 4 -NtGdiOffsetWindowOrgEx 4 -# -NtUserBuildMenuItemList 4 -NtUserCreateCursorIconHandle 2 -NtUserGetClassLong 3 -NtUserGetMenuDefaultItem 3 -NtUserGetLastInputInfo 1 -NtUserGetMinMaxInfo 3 -NtUserGetMonitorInfo 2 -NtUserGetScrollInfo 3 -NtUserGetWindow 2 -NtUserGetWindowLong 3 -NtUserMenuInfo 3 -NtUserMenuItemInfo 5 -NtUserMonitorFromPoint 3 -NtUserMonitorFromRect 2 -NtUserRegisterClassEx 6 -NtUserMonitorFromWindow 2 -NtUserSendMessage 5 -NtUserSendMessageTimeout 8 -NtUserSendNotifyMessage 4 -NtUserSetScrollBarInfo 3 +NtGdiMakeObjectXferable 2 +NtGdiMakeObjectUnXferable 1 Modified: branches/nwin32/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/win32k.def [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/win32k.def [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,5 +1,4 @@ -; ReactOS win32k.sys exports -; Currently all exports from Windows XP/2003 are listed, sorted by ordinal. +; Win32 Kernel Driver Exports LIBRARY win32k EXPORTS FLOATOBJ_AddFloatObj@8 @@ -104,10 +103,11 @@ EngModifySurface@32 EngMovePointer@16 EngMulDiv@12 -EngMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN +EngMultiByteToUnicodeN@20 EngMultiByteToWideChar@20 EngNineGrid@36 EngPaint@20 +EngPlgBlt@44 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite EngQueryDeviceAttribute@24 @@ -133,7 +133,7 @@ EngStrokePath@32 EngTextOut@40 EngTransparentBlt@32 -EngUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN +EngUnicodeToMultiByteN@20 EngUnloadImage@4 EngUnlockDirectDrawSurface@4 EngUnlockDriverObj@4 @@ -225,4 +225,3 @@ _itoa(a)12=NTOSKRNL._itoa _itow(a)12=NTOSKRNL._itow _local_unwind2=NTOSKRNL._local_unwind2 -;EOF Modified: branches/nwin32/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,192 +1,54 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="win32k_base" type="objectlibrary"> - <include base="win32k_base">.</include> - <include base="win32k_base">include</include> - <include base="win32k_base" root="intermediate">.</include> - <include base="ntoskrnl">include</include> - <include base="freetype">include</include> +<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys"> + <importlibrary definition="win32k.def" /> + <define name="_WIN32K_" /> + <include base="win32k">include</include> + <include base="win32k" root="intermediate"></include> + <include base="win32k" root="intermediate">include</include> <include base="ReactOS">include/reactos/subsys</include> - <include base="ReactOS">include/reactos/drivers</include> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x600</define> - <define name="LANGPACK" /> - <define name="_WIN32K_" /> - <pch>w32k.h</pch> - - <directory name="dib" root="intermediate"> - <file>dib8gen.c</file> - <file>dib16gen.c</file> - <file>dib32gen.c</file> - </directory> - - <directory name="dib"> - <file>dib1bpp.c</file> - <file>dib4bpp.c</file> - <file>dib8bpp.c</file> - <file>dib16bpp.c</file> - <file>dib24bpp.c</file> - <file>dib32bpp.c</file> - <file>dib.c</file> - - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>dib24bpp_hline.s</file> - <file>dib32bpp_hline.s</file> - <file>dib32bpp_colorfill.s</file> - </directory> - </if> - <ifnot property="ARCH" value="i386"> - <file>dib24bppc.c</file> - <file>dib32bppc.c</file> - </ifnot> + <library>ntoskrnl</library> + <library>hal</library> + <library>freetype</library> + <library>libcntpr</library> + <library>pseh</library> + <directory name="include"> + <pch>win32k.h</pch> </directory> <directory name="eng"> - <file>bitblt.c</file> + <file>engblt.c</file> <file>engbrush.c</file> - <file>clip.c</file> - <file>copybits.c</file> - <file>debug.c</file> - <file>device.c</file> - <file>driverobj.c</file> - <file>error.c</file> - <file>event.c</file> - <file>float.c</file> - <file>gradient.c</file> - <file>lineto.c</file> - <file>mem.c</file> + <file>engclip.c</file> + <file>engdev.c</file> + <file>engdrv.c</file> + <file>engevent.c</file> + <file>engerror.c</file> + <file>engfile.c</file> + <file>engfloat.c</file> + <file>engfont.c</file> + <file>engmem.c</file> <file>engmisc.c</file> - <file>mouse.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>perfcnt.c</file> - <file>semaphor.c</file> - <file>sort.c</file> - <file>string.c</file> - <file>surface.c</file> - <file>transblt.c</file> - <file>engwindow.c</file> - <file>xlate.c</file> + <file>engpaint.c</file> + <file>engpal.c</file> + <file>engpath.c</file> + <file>engpoint.c</file> + <file>engprint.c</file> + <file>engquery.c</file> + <file>engrtl.c</file> + <file>engsem.c</file> + <file>engsurf.c</file> + <file>engtext.c</file> + <file>engwnd.c</file> + <file>engxform.c</file> + <file>engxlate.c</file> </directory> - <directory name="ldr"> - <file>loader.c</file> - </directory> - <directory name="main"> - <file>dllmain.c</file> - </directory> - <directory name="misc"> - <file>driver.c</file> - <file>err.c</file> - <file>math.c</file> - <file>copy.c</file> - <file>usrheap.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>cos_asm.s</file> - <file>sin_asm.s</file> - <file>atan2_asm.s</file> - <file>floor_asm.s</file> - <file>ceil_asm.s</file> - </directory> - </if> + <directory name="gre"> + <file>init.c</file> </directory> <directory name="ntddraw"> - <file>ddraw.c</file> - <file>dd.c</file> - <file>ddsurf.c</file> - <file>d3d.c</file> - <file>dvp.c</file> - <file>mocomp.c</file> - <file>eng.c</file> - <file>dxeng.c</file> + <file>ddeng.c</file> </directory> - <directory name="ntuser"> - <file>accelerator.c</file> - <file>callback.c</file> - <file>callproc.c</file> - <file>caret.c</file> - <file>class.c</file> - <file>clipboard.c</file> - <file>csr.c</file> - <file>cursoricon.c</file> - <file>defwnd.c</file> - <file>desktop.c</file> - <file>display.c</file> - <file>event.c</file> - <file>focus.c</file> - <file>guicheck.c</file> - <file>hook.c</file> - <file>hotkey.c</file> - <file>input.c</file> - <file>keyboard.c</file> - <file>kbdlayout.c</file> - <file>menu.c</file> - <file>message.c</file> - <file>metric.c</file> - <file>misc.c</file> - <file>monitor.c</file> - <file>msgqueue.c</file> - <file>ntstubs.c</file> - <file>ntuser.c</file> - <file>painting.c</file> - <file>prop.c</file> - <file>scrollbar.c</file> - <file>session.c</file> - <file>simplecall.c</file> - <file>sysparams.c</file> - <file>timer.c</file> - <file>useratom.c</file> - <file>vis.c</file> - <file>windc.c</file> - <file>window.c</file> - <file>winpos.c</file> - <file>winsta.c</file> - <file>object.c</file> - </directory> - <directory name="objects"> - <file>arc.c</file> - <file>bezier.c</file> - <file>bitblt.c</file> - <file>bitmaps.c</file> - <file>brush.c</file> - <file>cliprgn.c</file> - <file>color.c</file> - <file>coord.c</file> - <file>dc.c</file> - <file>dcutil.c</file> - <file>dibobj.c</file> - <file>drawing.c</file> - <file>fillshap.c</file> - <file>gdibatch.c</file> - <file>gdiobj.c</file> - <file>icm.c</file> - <file>line.c</file> - <file>metafile.c</file> - <file>palobj.c</file> - <file>path.c</file> - <file>pen.c</file> - <file>polyfill.c</file> - <file>print.c</file> - <file>rect.c</file> - <file>region.c</file> - <file>stockobj.c</file> - <file>text.c</file> - <file>wingl.c</file> - </directory> - <directory name="stubs"> - <file>stubs.c</file> - </directory> -</module> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> - <importlibrary definition="win32k.def" /> - <library>win32k_base</library> - <library>pseh</library> - <library>ntoskrnl</library> - <library>libcntpr</library> - <library>hal</library> - <library>freetype</library> - <library>dxguid</library> <file>win32k.rc</file> </module> -</group> +</group> Modified: branches/nwin32/subsystems/win32/win32k/win32k.rc URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/win32k.rc [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/win32k.rc [iso-8859-1] Mon Jul 21 16:00:16 2008 @@ -1,7 +1,13 @@ -/* $Id$ */ - +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/win32k.rc + * PURPOSE: Win32K Resource File + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ +/* FIXME: Make "correct" like ntoskrnl.rc? */ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "W32 GDI KM subsystem\0" +#define REACTOS_STR_FILE_DESCRIPTION "Win32 Kernel Driver\0" #define REACTOS_STR_INTERNAL_NAME "win32k\0" #define REACTOS_STR_ORIGINAL_FILENAME "win32k.sys\0" #include <reactos/version.rc>

1 0

[fireball] 34645: - Clean unneeded files from win32k module.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: fireball Date: Mon Jul 21 15:56:30 2008 New Revision: 34645 URL: http://svn.reactos.org/svn/reactos?rev=34645&view=rev Log: - Clean unneeded files from win32k module. Removed: branches/nwin32/subsystems/win32/win32k/Doxyfile branches/nwin32/subsystems/win32/win32k/dib/ branches/nwin32/subsystems/win32/win32k/eng/ branches/nwin32/subsystems/win32/win32k/include/accelerator.h branches/nwin32/subsystems/win32/win32k/include/bitmaps.h branches/nwin32/subsystems/win32/win32k/include/brush.h branches/nwin32/subsystems/win32/win32k/include/callback.h branches/nwin32/subsystems/win32/win32k/include/caret.h branches/nwin32/subsystems/win32/win32k/include/class.h branches/nwin32/subsystems/win32/win32k/include/cleanup.h branches/nwin32/subsystems/win32/win32k/include/clipboard.h branches/nwin32/subsystems/win32/win32k/include/cliprgn.h branches/nwin32/subsystems/win32/win32k/include/color.h branches/nwin32/subsystems/win32/win32k/include/coord.h branches/nwin32/subsystems/win32/win32k/include/csr.h branches/nwin32/subsystems/win32/win32k/include/cursoricon.h branches/nwin32/subsystems/win32/win32k/include/dc.h branches/nwin32/subsystems/win32/win32k/include/dce.h branches/nwin32/subsystems/win32/win32k/include/desktop.h branches/nwin32/subsystems/win32/win32k/include/dib.h branches/nwin32/subsystems/win32/win32k/include/driver.h branches/nwin32/subsystems/win32/win32k/include/eng.h branches/nwin32/subsystems/win32/win32k/include/error.h branches/nwin32/subsystems/win32/win32k/include/focus.h branches/nwin32/subsystems/win32/win32k/include/gdifloat.h branches/nwin32/subsystems/win32/win32k/include/gdiobj.h branches/nwin32/subsystems/win32/win32k/include/guicheck.h branches/nwin32/subsystems/win32/win32k/include/hook.h branches/nwin32/subsystems/win32/win32k/include/hotkey.h branches/nwin32/subsystems/win32/win32k/include/input.h branches/nwin32/subsystems/win32/win32k/include/intddraw.h branches/nwin32/subsystems/win32/win32k/include/inteng.h branches/nwin32/subsystems/win32/win32k/include/intgdi.h branches/nwin32/subsystems/win32/win32k/include/menu.h branches/nwin32/subsystems/win32/win32k/include/misc.h branches/nwin32/subsystems/win32/win32k/include/mmcopy.h branches/nwin32/subsystems/win32/win32k/include/monitor.h branches/nwin32/subsystems/win32/win32k/include/mouse.h branches/nwin32/subsystems/win32/win32k/include/msgqueue.h branches/nwin32/subsystems/win32/win32k/include/ntuser.h branches/nwin32/subsystems/win32/win32k/include/object.h branches/nwin32/subsystems/win32/win32k/include/paint.h branches/nwin32/subsystems/win32/win32k/include/painting.h branches/nwin32/subsystems/win32/win32k/include/palette.h branches/nwin32/subsystems/win32/win32k/include/path.h branches/nwin32/subsystems/win32/win32k/include/pen.h branches/nwin32/subsystems/win32/win32k/include/prop.h branches/nwin32/subsystems/win32/win32k/include/rect.h branches/nwin32/subsystems/win32/win32k/include/region.h branches/nwin32/subsystems/win32/win32k/include/scroll.h branches/nwin32/subsystems/win32/win32k/include/surface.h branches/nwin32/subsystems/win32/win32k/include/tags.h branches/nwin32/subsystems/win32/win32k/include/text.h branches/nwin32/subsystems/win32/win32k/include/timer.h branches/nwin32/subsystems/win32/win32k/include/useratom.h branches/nwin32/subsystems/win32/win32k/include/userfuncs.h branches/nwin32/subsystems/win32/win32k/include/vis.h branches/nwin32/subsystems/win32/win32k/include/win32.h branches/nwin32/subsystems/win32/win32k/include/win32k.h branches/nwin32/subsystems/win32/win32k/include/window.h branches/nwin32/subsystems/win32/win32k/include/winpos.h branches/nwin32/subsystems/win32/win32k/include/winsta.h branches/nwin32/subsystems/win32/win32k/ldr/ branches/nwin32/subsystems/win32/win32k/main/ branches/nwin32/subsystems/win32/win32k/misc/ branches/nwin32/subsystems/win32/win32k/ntddraw/ branches/nwin32/subsystems/win32/win32k/ntuser/ branches/nwin32/subsystems/win32/win32k/objects/ branches/nwin32/subsystems/win32/win32k/stubs/ branches/nwin32/subsystems/win32/win32k/w32k.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/nwin32/subsystems/win32/win32k/Doxyfile URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/cleanup.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/color.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/csr.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/error.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/focus.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/guicheck.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/mmcopy.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/mouse.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/paint.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/prop.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/useratom.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/vis.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/w32k.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…

1 0

[gedmurphy] 34644: - Fix NeedCurrentDirectoryForExePath. Based on Wine code - Passes all kernel32:path winetests
by gedmurphy＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: gedmurphy Date: Mon Jul 21 14:54:50 2008 New Revision: 34644 URL: http://svn.reactos.org/svn/reactos?rev=34644&view=rev Log: - Fix NeedCurrentDirectoryForExePath. Based on Wine code - Passes all kernel32:path winetests Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Mon Jul 21 14:54:50 2008 @@ -1268,8 +1268,23 @@ BOOL STDCALL NeedCurrentDirectoryForExePathW(LPCWSTR ExeName) { - return (wcschr(ExeName, - L'\\') != NULL); + static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t', + 'C','u','r','r','e','n','t', + 'D','i','r','e','c','t','o','r','y', + 'I','n','E','x','e','P','a','t','h',0}; + WCHAR env_val; + + /* MSDN mentions some 'registry location'. We do not use registry. */ + FIXME("(%s): partial stub\n", debugstr_w(ExeName)); + + if (wcschr(ExeName, L'\\')) + return TRUE; + + /* Check the existence of the variable, not value */ + if (!GetEnvironmentVariableW( env_name, &env_val, 1 )) + return TRUE; + + return FALSE; } @@ -1279,8 +1294,12 @@ BOOL STDCALL NeedCurrentDirectoryForExePathA(LPCSTR ExeName) { - return (strchr(ExeName, - '\\') != NULL); + WCHAR *ExeNameW; + + if (!(ExeNameW = FilenameA2W(ExeName, FALSE))) + return TRUE; + + return NeedCurrentDirectoryForExePathW(ExeNameW); }

1 0

[fireball] 34643: - Cleanup the branch from unneeded components.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: fireball Date: Mon Jul 21 14:45:05 2008 New Revision: 34643 URL: http://svn.reactos.org/svn/reactos?rev=34643&view=rev Log: - Cleanup the branch from unneeded components. Added: branches/nwin32/subsystems/win32/csrss/win32csr/console.h (with props) Removed: branches/nwin32/base/applications/ branches/nwin32/base/services/ branches/nwin32/base/setup/ branches/nwin32/base/shell/ branches/nwin32/base/system/autochk/ branches/nwin32/base/system/expand/ branches/nwin32/base/system/format/ branches/nwin32/base/system/lsass/ branches/nwin32/base/system/msiexec/ branches/nwin32/base/system/regsvr32/ branches/nwin32/base/system/rundll32/ branches/nwin32/base/system/services/ branches/nwin32/base/system/userinit/ branches/nwin32/base/system/winlogon/ branches/nwin32/boot/ branches/nwin32/dll/3rdparty/dxtn/ branches/nwin32/dll/3rdparty/mesa32/ branches/nwin32/dll/cpl/ branches/nwin32/dll/directx/ branches/nwin32/dll/keyboard/ branches/nwin32/dll/nls/ branches/nwin32/dll/shellext/ branches/nwin32/dll/win32/acledit/ branches/nwin32/dll/win32/aclui/ branches/nwin32/dll/win32/advpack/ branches/nwin32/dll/win32/atl/ branches/nwin32/dll/win32/authz/ branches/nwin32/dll/win32/avifil32/ branches/nwin32/dll/win32/beepmidi/ branches/nwin32/dll/win32/browseui/ branches/nwin32/dll/win32/cabinet/ branches/nwin32/dll/win32/cards/ branches/nwin32/dll/win32/cfgmgr32/ branches/nwin32/dll/win32/clusapi/ branches/nwin32/dll/win32/comcat/ branches/nwin32/dll/win32/comctl32/ branches/nwin32/dll/win32/comdlg32/ branches/nwin32/dll/win32/compstui/ branches/nwin32/dll/win32/crtdll/ branches/nwin32/dll/win32/crypt32/ branches/nwin32/dll/win32/cryptdll/ branches/nwin32/dll/win32/cryptnet/ branches/nwin32/dll/win32/cryptui/ branches/nwin32/dll/win32/dbghelp/ branches/nwin32/dll/win32/dciman32/ branches/nwin32/dll/win32/devmgr/ branches/nwin32/dll/win32/dhcpcsvc/ branches/nwin32/dll/win32/dnsapi/ branches/nwin32/dll/win32/fmifs/ branches/nwin32/dll/win32/gdiplus/ branches/nwin32/dll/win32/glu32/ branches/nwin32/dll/win32/hhctrl.ocx/ branches/nwin32/dll/win32/hid/ branches/nwin32/dll/win32/hlink/ branches/nwin32/dll/win32/icmp/ branches/nwin32/dll/win32/imagehlp/ branches/nwin32/dll/win32/inetcomm/ branches/nwin32/dll/win32/inetmib1/ branches/nwin32/dll/win32/iphlpapi/ branches/nwin32/dll/win32/iprtprio/ branches/nwin32/dll/win32/lpk/ branches/nwin32/dll/win32/lsasrv/ branches/nwin32/dll/win32/lz32/ branches/nwin32/dll/win32/mapi32/ branches/nwin32/dll/win32/mlang/ branches/nwin32/dll/win32/mmdrv/ branches/nwin32/dll/win32/modemui/ branches/nwin32/dll/win32/mpr/ branches/nwin32/dll/win32/msacm32/ branches/nwin32/dll/win32/msafd/ branches/nwin32/dll/win32/msgina/ branches/nwin32/dll/win32/mshtml/ branches/nwin32/dll/win32/msi/ branches/nwin32/dll/win32/msimg32/ branches/nwin32/dll/win32/msvcrt20/ branches/nwin32/dll/win32/msvcrt40/ branches/nwin32/dll/win32/msvfw32/ branches/nwin32/dll/win32/mswsock/ branches/nwin32/dll/win32/msxml3/ branches/nwin32/dll/win32/nddeapi/ branches/nwin32/dll/win32/netapi32/ branches/nwin32/dll/win32/netcfgx/ branches/nwin32/dll/win32/netid/ branches/nwin32/dll/win32/newdev/ branches/nwin32/dll/win32/ntdsapi/ branches/nwin32/dll/win32/ntmarta/ branches/nwin32/dll/win32/objsel/ branches/nwin32/dll/win32/odbc32/ branches/nwin32/dll/win32/odbccp32/ branches/nwin32/dll/win32/ole32/ branches/nwin32/dll/win32/oleacc/ branches/nwin32/dll/win32/oleaut32/ branches/nwin32/dll/win32/oledlg/ branches/nwin32/dll/win32/olepro32/ branches/nwin32/dll/win32/opengl32/ branches/nwin32/dll/win32/packet/ branches/nwin32/dll/win32/pdh/ branches/nwin32/dll/win32/powrprof/ branches/nwin32/dll/win32/printui/ branches/nwin32/dll/win32/rasapi32/ branches/nwin32/dll/win32/rasdlg/ branches/nwin32/dll/win32/rasman/ branches/nwin32/dll/win32/riched20/ branches/nwin32/dll/win32/riched32/ branches/nwin32/dll/win32/rsabase/ branches/nwin32/dll/win32/rsaenh/ branches/nwin32/dll/win32/schannel/ branches/nwin32/dll/win32/security/ branches/nwin32/dll/win32/sensapi/ branches/nwin32/dll/win32/serialui/ branches/nwin32/dll/win32/setupapi/ branches/nwin32/dll/win32/shdocvw/ branches/nwin32/dll/win32/shell32/ branches/nwin32/dll/win32/shfolder/ branches/nwin32/dll/win32/shimgvw/ branches/nwin32/dll/win32/shlwapi/ branches/nwin32/dll/win32/snmpapi/ branches/nwin32/dll/win32/stdole2.tlb/ branches/nwin32/dll/win32/syssetup/ branches/nwin32/dll/win32/tapi32/ branches/nwin32/dll/win32/tapiui/ branches/nwin32/dll/win32/twain_32/ branches/nwin32/dll/win32/uext2/ branches/nwin32/dll/win32/ufat/ branches/nwin32/dll/win32/ufatx/ branches/nwin32/dll/win32/untfs/ branches/nwin32/dll/win32/urlmon/ branches/nwin32/dll/win32/userenv/ branches/nwin32/dll/win32/usp10/ branches/nwin32/dll/win32/uxtheme/ branches/nwin32/dll/win32/vdmdbg/ branches/nwin32/dll/win32/version/ branches/nwin32/dll/win32/wdmaud.drv/ branches/nwin32/dll/win32/winfax/ branches/nwin32/dll/win32/winhttp/ branches/nwin32/dll/win32/wininet/ branches/nwin32/dll/win32/winmm/ branches/nwin32/dll/win32/winscard/ branches/nwin32/dll/win32/winspool/ branches/nwin32/dll/win32/winsta/ branches/nwin32/dll/win32/wintrust/ branches/nwin32/dll/win32/wldap32/ branches/nwin32/dll/win32/ws2_32/ branches/nwin32/dll/win32/ws2help/ branches/nwin32/dll/win32/wshirda/ branches/nwin32/dll/win32/wshtcpip/ branches/nwin32/dll/win32/wsock32/ branches/nwin32/dll/win32/wtsapi32/ branches/nwin32/drivers/Doxyfile branches/nwin32/drivers/base/beep/ branches/nwin32/drivers/base/null/ branches/nwin32/drivers/bus/ branches/nwin32/drivers/directx/ branches/nwin32/drivers/filesystems/ branches/nwin32/drivers/input/ branches/nwin32/drivers/ksfilter/ branches/nwin32/drivers/multimedia/ branches/nwin32/drivers/network/ branches/nwin32/drivers/parallel/ branches/nwin32/drivers/serial/ branches/nwin32/drivers/setup/ branches/nwin32/drivers/storage/ branches/nwin32/drivers/usb/ branches/nwin32/drivers/video/ branches/nwin32/drivers/wdm/ branches/nwin32/drivers/wmi/ branches/nwin32/lib/3rdparty/adns/ branches/nwin32/lib/3rdparty/icu4ros/ branches/nwin32/lib/drivers/chew/ branches/nwin32/lib/drivers/ip/ branches/nwin32/lib/drivers/oskittcp/ branches/nwin32/lib/nls/ branches/nwin32/lib/ppcdevtree/ branches/nwin32/lib/ppcmmu/ branches/nwin32/lib/recyclebin/ branches/nwin32/subsystems/ntvdm/ Modified: branches/nwin32/ReactOS-generic.rbuild branches/nwin32/base/base.rbuild branches/nwin32/base/system/system.rbuild branches/nwin32/dll/3rdparty/3rdparty.rbuild branches/nwin32/dll/dll.rbuild branches/nwin32/dll/win32/gdi32/gdi32.rbuild branches/nwin32/dll/win32/rpcrt4/rpc_transport.c branches/nwin32/dll/win32/rpcrt4/rpcrt4.rbuild branches/nwin32/dll/win32/rpcrt4/rpcrt4_main.c branches/nwin32/dll/win32/rpcrt4/unix_func.c branches/nwin32/dll/win32/win32.rbuild branches/nwin32/drivers/base/directory.rbuild branches/nwin32/drivers/drivers.rbuild branches/nwin32/lib/3rdparty/3rdparty.rbuild branches/nwin32/lib/drivers/directory.rbuild branches/nwin32/lib/lib.mak branches/nwin32/lib/lib.rbuild branches/nwin32/subsystems/subsystems.rbuild branches/nwin32/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: branches/nwin32/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/ReactOS-generic.rbuild?r… ============================================================================== --- branches/nwin32/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/nwin32/ReactOS-generic.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -34,9 +34,6 @@ <directory name="base"> <xi:include href="base/base.rbuild" /> </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> <directory name="dll"> <xi:include href="dll/dll.rbuild" /> </directory> Modified: branches/nwin32/base/base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/base/base.rbuild?rev=346… ============================================================================== --- branches/nwin32/base/base.rbuild [iso-8859-1] (original) +++ branches/nwin32/base/base.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,18 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="applications"> - <xi:include href="applications/applications.rbuild" /> - </directory> - <directory name="services"> - <xi:include href="services/services.rbuild" /> - </directory> - <directory name="setup"> - <xi:include href="setup/setup.rbuild" /> - </directory> - <directory name="shell"> - <xi:include href="shell/shell.rbuild" /> - </directory> <directory name="system"> <xi:include href="system/system.rbuild" /> </directory> Modified: branches/nwin32/base/system/system.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/base/system/system.rbuil… ============================================================================== --- branches/nwin32/base/system/system.rbuild [iso-8859-1] (original) +++ branches/nwin32/base/system/system.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,37 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="autochk"> - <xi:include href="autochk/autochk.rbuild" /> - </directory> - <directory name="expand"> - <xi:include href="expand/expand.rbuild" /> - </directory> - <directory name="format"> - <xi:include href="format/format.rbuild" /> - </directory> - <directory name="lsass"> - <xi:include href="lsass/lsass.rbuild" /> - </directory> - <directory name="msiexec"> - <xi:include href="msiexec/msiexec.rbuild" /> - </directory> - <directory name="regsvr32"> - <xi:include href="regsvr32/regsvr32.rbuild" /> - </directory> - <directory name="rundll32"> - <xi:include href="rundll32/rundll32.rbuild" /> - </directory> - <directory name="services"> - <xi:include href="services/services.rbuild" /> - </directory> <directory name="smss"> <xi:include href="smss/smss.rbuild" /> </directory> - <directory name="userinit"> - <xi:include href="userinit/userinit.rbuild" /> - </directory> - <directory name="winlogon"> - <xi:include href="winlogon/winlogon.rbuild" /> - </directory> </group> Modified: branches/nwin32/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/3rdparty/3rdparty.rb… ============================================================================== --- branches/nwin32/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/nwin32/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -4,13 +4,5 @@ <directory name="freetype"> <xi:include href="freetype/freetype.rbuild" /> </directory> - <directory name="mesa32"> - <xi:include href="mesa32/mesa32.rbuild" /> - </directory> - <if property="NSWPAT" value="1"> - <directory name="dxtn"> - <xi:include href="dxtn/dxtn.rbuild" /> - </directory> - </if> </group> Modified: branches/nwin32/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/dll.rbuild?rev=34643… ============================================================================== --- branches/nwin32/dll/dll.rbuild [iso-8859-1] (original) +++ branches/nwin32/dll/dll.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -4,23 +4,8 @@ <directory name="3rdparty"> <xi:include href="3rdparty/3rdparty.rbuild" /> </directory> -<directory name="cpl"> - <xi:include href="cpl/cpl.rbuild" /> -</directory> -<directory name="directx"> - <xi:include href="directx/directx.rbuild" /> -</directory> -<directory name="keyboard"> - <xi:include href="keyboard/keyboard.rbuild" /> -</directory> -<directory name="nls"> - <xi:include href="nls/nls.rbuild" /> -</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> -</directory> -<directory name="shellext"> - <xi:include href="shellext/shellext.rbuild" /> </directory> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> Modified: branches/nwin32/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/gdi32.rb… ============================================================================== --- branches/nwin32/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -8,7 +8,7 @@ <library>ntdll</library> <library>user32</library> <library>kernel32</library> - <library>advapi32</library> +  <library>win32ksys</library> <library>pseh</library> <library>dxguid</library> Modified: branches/nwin32/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/rpcrt4/rpc_tra… ============================================================================== --- branches/nwin32/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -736,7 +736,7 @@ } /**** ncacn_ip_tcp support ****/ - +#if 0 typedef struct _RpcConnection_tcp { RpcConnection common; @@ -1382,7 +1382,7 @@ return 1; } - +#endif static const struct connection_ops conn_protseq_list[] = { { "ncacn_np", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB }, @@ -1409,7 +1409,9 @@ rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, - }, + } +#if 0 +, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, rpcrt4_conn_tcp_alloc, @@ -1423,6 +1425,7 @@ rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, } +#endif }; @@ -1445,7 +1448,9 @@ rpcrt4_protseq_np_free_wait_array, rpcrt4_protseq_np_wait_for_new_connection, rpcrt4_protseq_ncalrpc_open_endpoint, - }, + } +#if 0 +, { "ncacn_ip_tcp", rpcrt4_protseq_sock_alloc, @@ -1455,6 +1460,7 @@ rpcrt4_protseq_sock_wait_for_new_connection, rpcrt4_protseq_ncacn_ip_tcp_open_endpoint, }, +#endif }; #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) Modified: branches/nwin32/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/rpcrt4/rpcrt4.… ============================================================================== --- branches/nwin32/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ branches/nwin32/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -18,8 +18,8 @@ <library>user32</library> <library>advapi32</library> <library>secur32</library> - <library>iphlpapi</library> - <library>ws2_32</library> +  +  <file>cproxy.c</file> <file>cpsf.c</file> <file>cstub.c</file> Modified: branches/nwin32/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/rpcrt4/rpcrt4_… ============================================================================== --- branches/nwin32/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -322,6 +322,7 @@ ULONG buflen = sizeof(IP_ADAPTER_INFO); PIP_ADAPTER_INFO adapter = HeapAlloc(GetProcessHeap(), 0, buflen); +#if 0 if (GetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { HeapFree(GetProcessHeap(), 0, adapter); adapter = HeapAlloc(GetProcessHeap(), 0, buflen); @@ -334,7 +335,9 @@ } /* We can't get a hardware address, just use random numbers. Set the multicast bit to prevent conflicts with real cards. */ - else { + else +#endif + { for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { address[i] = rand() & 0xff; } Modified: branches/nwin32/dll/win32/rpcrt4/unix_func.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/rpcrt4/unix_fu… ============================================================================== --- branches/nwin32/dll/win32/rpcrt4/unix_func.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/rpcrt4/unix_func.c [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -4,6 +4,7 @@ #include <io.h> #include "unix_func.h" +#if 0 int poll(struct pollfd *fds, @@ -167,3 +168,4 @@ return 0; } +#endif Modified: branches/nwin32/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/win32.rbuild?r… ============================================================================== --- branches/nwin32/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/nwin32/dll/win32/win32.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,269 +1,26 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="acledit"> - <xi:include href="acledit/acledit.rbuild" /> -</directory> -<directory name="aclui"> - <xi:include href="aclui/aclui.rbuild" /> -</directory> <directory name="advapi32"> <xi:include href="advapi32/advapi32.rbuild" /> </directory> -<directory name="advpack"> - <xi:include href="advpack/advpack.rbuild" /> -</directory> -<directory name="atl"> - <xi:include href="atl/atl.rbuild" /> -</directory> -<directory name="authz"> - <xi:include href="authz/authz.rbuild" /> -</directory> -<directory name="avifil32"> - <xi:include href="avifil32/avifil32.rbuild" /> -</directory> -<directory name="beepmidi"> - <xi:include href="beepmidi/beepmidi.rbuild" /> -</directory> -<directory name="browseui"> - <xi:include href="browseui/browseui.rbuild" /> -</directory> -<directory name="cabinet"> - <xi:include href="cabinet/cabinet.rbuild" /> -</directory> -<directory name="cards"> - <xi:include href="cards/cards.rbuild" /> -</directory> -<directory name="cfgmgr32"> - <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> -</directory> -<directory name="clusapi"> - <xi:include href="clusapi/clusapi.rbuild" /> -</directory> -<directory name="comcat"> - <xi:include href="comcat/comcat.rbuild" /> -</directory> -<directory name="comctl32"> - <xi:include href="comctl32/comctl32.rbuild" /> -</directory> -<directory name="comdlg32"> - <xi:include href="comdlg32/comdlg32.rbuild" /> -</directory> -<directory name="compstui"> - <xi:include href="compstui/compstui.rbuild" /> -</directory> -<directory name="crtdll"> - <xi:include href="crtdll/crtdll.rbuild" /> -</directory> -<directory name="crypt32"> - <xi:include href="crypt32/crypt32.rbuild" /> -</directory> -<directory name="cryptdll"> - <xi:include href="cryptdll/cryptdll.rbuild" /> -</directory> -<directory name="cryptnet"> - <xi:include href="cryptnet/cryptnet.rbuild" /> -</directory> -<directory name="cryptui"> - <xi:include href="cryptui/cryptui.rbuild" /> -</directory> -<directory name="dbghelp"> - <xi:include href="dbghelp/dbghelp.rbuild" /> -</directory> -<directory name="dciman32"> - <xi:include href="dciman32/dciman32.rbuild" /> -</directory> -<directory name="devmgr"> - <xi:include href="devmgr/devmgr.rbuild" /> -</directory> -<directory name="dhcpcsvc"> - <xi:include href="dhcpcsvc/dhcpcsvc.rbuild" /> -</directory> -<directory name="dnsapi"> - <xi:include href="dnsapi/dnsapi.rbuild" /> -</directory> -<directory name="fmifs"> - <xi:include href="fmifs/fmifs.rbuild" /> +<directory name="imm32"> + <xi:include href="imm32/imm32.rbuild" /> </directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32.rbuild" /> </directory> -<directory name="gdiplus"> - <xi:include href="gdiplus/gdiplus.rbuild" /> -</directory> -<directory name="glu32"> - <xi:include href="glu32/glu32.rbuild" /> -</directory> -<directory name="hhctrl.ocx"> - <xi:include href="hhctrl.ocx/hhctrl.ocx.rbuild" /> -</directory> -<directory name="hid"> - <xi:include href="hid/hid.rbuild" /> -</directory> -<directory name="hlink"> - <xi:include href="hlink/hlink.rbuild" /> -</directory> -<directory name="icmp"> - <xi:include href="icmp/icmp.rbuild" /> -</directory> -<directory name="imagehlp"> - <xi:include href="imagehlp/imagehlp.rbuild" /> -</directory> -<directory name="imm32"> - <xi:include href="imm32/imm32.rbuild" /> -</directory> -<directory name="inetcomm"> - <xi:include href="inetcomm/inetcomm.rbuild" /> -</directory> -<directory name="inetmib1"> - <xi:include href="inetmib1/inetmib1.rbuild" /> -</directory> -<directory name="iphlpapi"> - <xi:include href="iphlpapi/iphlpapi.rbuild" /> -</directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> -</directory> -<directory name="lpk"> - <xi:include href="lpk/lpk.rbuild" /> -</directory> -<directory name="lsasrv"> - <xi:include href="lsasrv/lsasrv.rbuild" /> -</directory> -<directory name="lz32"> - <xi:include href="lz32/lz32.rbuild" /> -</directory> -<directory name="mapi32"> - <xi:include href="mapi32/mapi32.rbuild" /> -</directory> -<directory name="modemui"> - <xi:include href="modemui/modemui.rbuild" /> -</directory> -<directory name="mlang"> - <xi:include href="mlang/mlang.rbuild" /> -</directory> -<directory name="mmdrv"> - <xi:include href="mmdrv/mmdrv.rbuild" /> -</directory> -<directory name="mpr"> - <xi:include href="mpr/mpr.rbuild" /> -</directory> -<directory name="msacm32"> - <xi:include href="msacm32/msacm32.rbuild" /> -</directory> -<directory name="msafd"> - <xi:include href="msafd/msafd.rbuild" /> -</directory> -<directory name="msgina"> - <xi:include href="msgina/msgina.rbuild" /> -</directory> -<directory name="mshtml"> - <xi:include href="mshtml/mshtml.rbuild" /> -</directory> -<directory name="msi"> - <xi:include href="msi/msi.rbuild" /> -</directory> -<directory name="msimg32"> - <xi:include href="msimg32/msimg32.rbuild" /> </directory> <directory name="msvcrt"> <xi:include href="msvcrt/msvcrt.rbuild" /> </directory> -<directory name="msvcrt20"> - <xi:include href="msvcrt20/msvcrt20.rbuild" /> -</directory> -<directory name="msvcrt40"> - <xi:include href="msvcrt40/msvcrt40.rbuild" /> -</directory> -<directory name="msvfw32"> - <xi:include href="msvfw32/msvfw32.rbuild" /> -</directory> -<directory name="mswsock"> - <xi:include href="mswsock/mswsock.rbuild" /> -</directory> -<directory name="msxml3"> - <xi:include href="msxml3/msxml3.rbuild" /> -</directory> -<directory name="nddeapi"> - <xi:include href="nddeapi/nddeapi.rbuild" /> -</directory> -<directory name="netapi32"> - <xi:include href="netapi32/netapi32.rbuild" /> -</directory> -<directory name="netcfgx"> - <xi:include href="netcfgx/netcfgx.rbuild" /> -</directory> -<directory name="netid"> - <xi:include href="netid/netid.rbuild" /> -</directory> -<directory name="newdev"> - <xi:include href="newdev/newdev.rbuild" /> -</directory> -<directory name="ntdsapi"> - <xi:include href="ntdsapi/ntdsapi.rbuild" /> -</directory> -<directory name="ntmarta"> - <xi:include href="ntmarta/ntmarta.rbuild" /> -</directory> -<directory name="objsel"> - <xi:include href="objsel/objsel.rbuild" /> -</directory> -<directory name="odbccp32"> - <xi:include href="odbccp32/odbccp32.rbuild" /> -</directory> -<directory name="ole32"> - <xi:include href="ole32/ole32.rbuild" /> -</directory> -<directory name="oleacc"> - <xi:include href="oleacc/oleacc.rbuild" /> -</directory> -<directory name="oleaut32"> - <xi:include href="oleaut32/oleaut32.rbuild" /> -</directory> -<directory name="oledlg"> - <xi:include href="oledlg/oledlg.rbuild" /> -</directory> -<directory name="olepro32"> - <xi:include href="olepro32/olepro32.rbuild" /> -</directory> -<directory name="opengl32"> - <xi:include href="opengl32/opengl32.rbuild" /> -</directory> -<directory name="pdh"> - <xi:include href="pdh/pdh.rbuild" /> -</directory> -<directory name="powrprof"> - <xi:include href="powrprof/powrprof.rbuild" /> -</directory> -<directory name="printui"> - <xi:include href="printui/printui.rbuild" /> -</directory> <directory name="psapi"> <xi:include href="psapi/psapi.rbuild" /> </directory> -<directory name="rasapi32"> - <xi:include href="rasapi32/rasapi32.rbuild" /> -</directory> -<directory name="rasdlg"> - <xi:include href="rasdlg/rasdlg.rbuild" /> -</directory> -<directory name="rasman"> - <xi:include href="rasman/rasman.rbuild" /> -</directory> -<directory name="riched20"> - <xi:include href="riched20/riched20.rbuild" /> -</directory> -<directory name="riched32"> - <xi:include href="riched32/riched32.rbuild" /> -</directory> <directory name="rpcrt4"> <xi:include href="rpcrt4/rpcrt4.rbuild" /> -</directory> -<directory name="rsabase"> - <xi:include href="rsabase/rsabase.rbuild" /> -</directory> -<directory name="rsaenh"> - <xi:include href="rsaenh/rsaenh.rbuild" /> </directory> <directory name="samlib"> <xi:include href="samlib/samlib.rbuild" /> @@ -271,136 +28,13 @@ <directory name="samsrv"> <xi:include href="samsrv/samsrv.rbuild" /> </directory> -<directory name="schannel"> - <xi:include href="schannel/schannel.rbuild" /> -</directory> <directory name="secur32"> <xi:include href="secur32/secur32.rbuild" /> -</directory> -<directory name="security"> - <xi:include href="security/security.rbuild" /> -</directory> -<directory name="sensapi"> - <xi:include href="sensapi/sensapi.rbuild" /> -</directory> -<directory name="serialui"> - <xi:include href="serialui/serialui.rbuild" /> -</directory> -<directory name="setupapi"> - <xi:include href="setupapi/setupapi.rbuild" /> -</directory> -<directory name="shdocvw"> - <xi:include href="shdocvw/shdocvw.rbuild" /> -</directory> -<directory name="shell32"> - <xi:include href="shell32/shell32.rbuild" /> -</directory> -<directory name="shfolder"> - <xi:include href="shfolder/shfolder.rbuild" /> -</directory> -<directory name="shimgvw"> - <xi:include href="shimgvw/shimgvw.rbuild" /> -</directory> -<directory name="shlwapi"> - <xi:include href="shlwapi/shlwapi.rbuild" /> </directory> <directory name="smdll"> <xi:include href="smdll/smdll.rbuild" /> </directory> -<directory name="snmpapi"> - <xi:include href="snmpapi/snmpapi.rbuild" /> -</directory> -<directory name="stdole2.tlb"> - <xi:include href="stdole2.tlb/stdole2.rbuild" /> -</directory> -<directory name="syssetup"> - <xi:include href="syssetup/syssetup.rbuild" /> -</directory> -<directory name="tapi32"> - <xi:include href="tapi32/tapi32.rbuild" /> -</directory> -<directory name="tapiui"> - <xi:include href="tapiui/tapiui.rbuild" /> -</directory> -<directory name="twain_32"> - <xi:include href="twain_32/twain_32.rbuild" /> -</directory> -<directory name="uext2"> - <xi:include href="uext2/uext2.rbuild" /> -</directory> -<directory name="ufat"> - <xi:include href="ufat/ufat.rbuild" /> -</directory> -<directory name="ufatx"> - <xi:include href="ufatx/ufatx.rbuild" /> -</directory> -<directory name="untfs"> - <xi:include href="untfs/untfs.rbuild" /> -</directory> -<directory name="urlmon"> - <xi:include href="urlmon/urlmon.rbuild" /> -</directory> <directory name="user32"> <xi:include href="user32/user32.rbuild" /> </directory> -<directory name="userenv"> - <xi:include href="userenv/userenv.rbuild" /> -</directory> -<directory name="usp10"> - <xi:include href="usp10/usp10.rbuild" /> -</directory> -<directory name="uxtheme"> - <xi:include href="uxtheme/uxtheme.rbuild" /> -</directory> -<directory name="vdmdbg"> - <xi:include href="vdmdbg/vdmdbg.rbuild" /> -</directory> -<directory name="version"> - <xi:include href="version/version.rbuild" /> -</directory> -<directory name="wdmaud.drv"> - <xi:include href="wdmaud.drv/wdmaud.rbuild" /> -</directory> -<directory name="winfax"> - <xi:include href="winfax/winfax.rbuild" /> -</directory> -<directory name="winhttp"> - <xi:include href="winhttp/winhttp.rbuild" /> -</directory> -<directory name="wininet"> - <xi:include href="wininet/wininet.rbuild" /> -</directory> -<directory name="winmm"> - <xi:include href="winmm/winmm.rbuild" /> -</directory> -<directory name="winspool"> - <xi:include href="winspool/winspool.rbuild" /> -</directory> -<directory name="winsta"> - <xi:include href="winsta/winsta.rbuild" /> -</directory> -<directory name="wintrust"> - <xi:include href="wintrust/wintrust.rbuild" /> -</directory> -<directory name="wldap32"> - <xi:include href="wldap32/wldap32.rbuild" /> -</directory> -<directory name="ws2_32"> - <xi:include href="ws2_32/ws2_32.rbuild" /> -</directory> -<directory name="ws2help"> - <xi:include href="ws2help/ws2help.rbuild" /> -</directory> -<directory name="wshirda"> - <xi:include href="wshirda/wshirda.rbuild" /> -</directory> -<directory name="wshtcpip"> - <xi:include href="wshtcpip/wshtcpip.rbuild" /> -</directory> -<directory name="wsock32"> - <xi:include href="wsock32/wsock32.rbuild" /> -</directory> -<directory name="wtsapi32"> - <xi:include href="wtsapi32/wtsapi32.rbuild" /> -</directory> </group> Removed: branches/nwin32/drivers/Doxyfile URL: http://svn.reactos.org/svn/reactos/branches/nwin32/drivers/Doxyfile?rev=346… ============================================================================== --- branches/nwin32/drivers/Doxyfile [iso-8859-1] (original) +++ branches/nwin32/drivers/Doxyfile (removed) @@ -1,206 +1,0 @@ -# Doxyfile 1.3.5 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "ReactOS drivers" -PROJECT_NUMBER = -OUTPUT_DIRECTORY = doxy-doc -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = YES -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = .. -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = NO -WARN_IF_UNDOCUMENTED = NO -WARN_IF_DOC_ERROR = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.c \ - *.h -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = YES -IMAGE_PATH = -INPUT_FILTER = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -VERBATIM_HEADERS = NO -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 200 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = YES -RTF_HYPERLINKS = YES -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = NO -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = ../include -INCLUDE_FILE_PATTERNS = *.h -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES Modified: branches/nwin32/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/drivers/base/directory.r… ============================================================================== --- branches/nwin32/drivers/base/directory.rbuild [iso-8859-1] (original) +++ branches/nwin32/drivers/base/directory.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,16 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="beep"> - <xi:include href="beep/beep.rbuild" /> -</directory> <directory name="bootvid"> <xi:include href="bootvid/bootvid.rbuild" /> </directory> <directory name="kdcom"> <xi:include href="kdcom/kdcom.rbuild" /> </directory> -<directory name="null"> - <xi:include href="null/null.rbuild" /> -</directory> </group> Modified: branches/nwin32/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/drivers/drivers.rbuild?r… ============================================================================== --- branches/nwin32/drivers/drivers.rbuild [iso-8859-1] (original) +++ branches/nwin32/drivers/drivers.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -4,49 +4,4 @@ <directory name="base"> <xi:include href="base/directory.rbuild" /> </directory> -<directory name="bus"> - <xi:include href="bus/directory.rbuild" /> -</directory> -<directory name="directx"> - <xi:include href="directx/directory.rbuild" /> -</directory> -<directory name="filesystems"> - <xi:include href="filesystems/directory.rbuild" /> -</directory> -<directory name="input"> - <xi:include href="input/directory.rbuild" /> -</directory> -<directory name="ksfilter"> - <xi:include href="ksfilter/directory.rbuild" /> -</directory> -<directory name="multimedia"> - <xi:include href="multimedia/directory.rbuild" /> -</directory> -<directory name="network"> - <xi:include href="network/directory.rbuild" /> -</directory> -<directory name="parallel"> - <xi:include href="parallel/directory.rbuild" /> -</directory> -<directory name="serial"> - <xi:include href="serial/directory.rbuild" /> -</directory> -<directory name="setup"> - <xi:include href="setup/directory.rbuild" /> -</directory> -<directory name="storage"> - <xi:include href="storage/directory.rbuild" /> -</directory> -<directory name="usb"> - <xi:include href="usb/directory.rbuild" /> -</directory> -<directory name="video"> - <xi:include href="video/directory.rbuild" /> -</directory> -<directory name="wdm"> - <xi:include href="wdm/wdm.rbuild" /> -</directory> -<directory name="wmi"> - <xi:include href="wmi/wmilib.rbuild" /> -</directory> </group> Modified: branches/nwin32/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/lib/3rdparty/3rdparty.rb… ============================================================================== --- branches/nwin32/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/nwin32/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,17 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="adns"> - <xi:include href="adns/adns.rbuild" /> - </directory> <directory name="bzip2"> <xi:include href="bzip2/bzip2.rbuild" /> </directory> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> - </directory> - <directory name="icu4ros"> - <xi:include href="icu4ros/icu4ros.rbuild" /> </directory> <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> Modified: branches/nwin32/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/lib/drivers/directory.rb… ============================================================================== --- branches/nwin32/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/nwin32/lib/drivers/directory.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -4,13 +4,4 @@ <directory name="csq"> <xi:include href="csq/csq.rbuild" /> </directory> - <directory name="ip"> - <xi:include href="ip/ip.rbuild" /> - </directory> - <directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.rbuild" /> - </directory> - <directory name="chew"> - <xi:include href="chew/chew.rbuild" /> - </directory> </group> Modified: branches/nwin32/lib/lib.mak URL: http://svn.reactos.org/svn/reactos/branches/nwin32/lib/lib.mak?rev=34643&r1… ============================================================================== --- branches/nwin32/lib/lib.mak [iso-8859-1] (original) +++ branches/nwin32/lib/lib.mak [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -2,6 +2,3 @@ LIB_BASE_ = $(LIB_BASE)$(SEP) include lib/inflib/inflib.mak -ifeq ($(ARCH),powerpc) -include lib/ppcmmu/ppcmmu.mak -endif Modified: branches/nwin32/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/lib/lib.rbuild?rev=34643… ============================================================================== --- branches/nwin32/lib/lib.rbuild [iso-8859-1] (original) +++ branches/nwin32/lib/lib.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -28,20 +28,11 @@ <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> </directory> - <directory name="nls"> - <xi:include href="nls/nls.rbuild" /> - </directory> <directory name="ntdllsys"> <xi:include href="ntdllsys/ntdllsys.rbuild" /> </directory> - <directory name="ppcmmu"> - <xi:include href="ppcmmu/ppcmmu.rbuild" /> - </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> - </directory> - <directory name="recyclebin"> - <xi:include href="recyclebin/recyclebin.rbuild" /> </directory> <directory name="rossym"> <xi:include href="rossym/rossym.rbuild" /> Modified: branches/nwin32/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/subsystems.rb… ============================================================================== --- branches/nwin32/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/nwin32/subsystems/subsystems.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> -</directory> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory> Added: branches/nwin32/subsystems/win32/csrss/win32csr/console.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/csrss/w… ============================================================================== --- branches/nwin32/subsystems/win32/csrss/win32csr/console.h (added) +++ branches/nwin32/subsystems/win32/csrss/win32csr/console.h [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -1,0 +1,59 @@ +#ifndef CONSOLE_H__ +#define CONSOLE_H__ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <tchar.h> +#include <stdio.h> +#include <limits.h> +#include "resource.h" + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +typedef struct TAGConsoleInfo +{ + HWND hConsoleWindow; + WCHAR szProcessName[MAX_PATH]; + BOOLEAN AppliedConfig; + DWORD UseRasterFonts; + DWORD FontSize; + DWORD FontWeight; + FONTSIGNATURE FontSignature; + DWORD CursorSize; + DWORD NumberOfHistoryBuffers; + DWORD HistoryBufferSize; + DWORD HistoryNoDup; + DWORD FullScreen; + DWORD QuickEdit; + DWORD InsertMode; + DWORD ScreenBuffer; + DWORD WindowSize; + DWORD WindowPosition; + DWORD ActiveStaticControl; + COLORREF ScreenText; + COLORREF ScreenBackground; + COLORREF PopupText; + COLORREF PopupBackground; + COLORREF Colors[16]; +} ConsoleInfo, *PConsoleInfo; + +void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo); +void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); +void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); + +#define PM_APPLY_CONSOLE_INFO (WM_APP + 100) + + +//globals +extern HINSTANCE hApplet; + +#endif /* CONSOLE_H__ */ Propchange: branches/nwin32/subsystems/win32/csrss/win32csr/console.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nwin32/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/csrss/w… ============================================================================== --- branches/nwin32/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Mon Jul 21 14:45:05 2008 @@ -6,7 +6,7 @@ <include base="csrss">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> - <include base="console">.</include> +  <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library>

1 0

[mkupfer] 34642: - Add selectable spanish and italian keyboard layout to default language. - This fix is temporarily until GUI 1st stage setup replaces usetup. - See issue #3313 for more details.
by mkupfer＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: mkupfer Date: Mon Jul 21 14:17:45 2008 New Revision: 34642 URL: http://svn.reactos.org/svn/reactos?rev=34642&view=rev Log: - Add selectable spanish and italian keyboard layout to default language. - This fix is temporarily until GUI 1st stage setup replaces usetup. - See issue #3313 for more details. Modified: trunk/reactos/base/setup/usetup/lang/en-US.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon Jul 21 14:17:45 2008 @@ -4,6 +4,8 @@ MUI_LAYOUTS enUSLayouts[] = { { L"0409", L"00000409" }, + { L"0410", L"00000410" }, + { L"040A", L"0000040A" }, { NULL, NULL } };

1 0

[gedmurphy] 34641: Fix Rva handling code
by gedmurphy＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: gedmurphy Date: Mon Jul 21 12:50:27 2008 New Revision: 34641 URL: http://svn.reactos.org/svn/reactos?rev=34641&view=rev Log: Fix Rva handling code Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=34641&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Mon Jul 21 12:50:27 2008 @@ -112,13 +112,13 @@ ULONG Count; Count = SWAPW(NtHeader->FileHeader.NumberOfSections); - Section = (PIMAGE_SECTION_HEADER)((ULONG)&NtHeader->OptionalHeader + - SWAPW(NtHeader->FileHeader.SizeOfOptionalHeader)); - while (Count) + Section = IMAGE_FIRST_SECTION(NtHeader); + + while (Count--) { Va = SWAPD(Section->VirtualAddress); if ((Va <= Rva) && - (Rva < Va + SWAPD(Section->SizeOfRawData))) + (Rva < Va + SWAPD(Section->Misc.VirtualSize))) return Section; Section++; } @@ -145,7 +145,7 @@ if (Section == NULL || Rva < SWAPD(Section->VirtualAddress) || - Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData)) + Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize)) { Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); if (Section == NULL)

1 0

[ros-arm-bringup] 34640: - Improve system call handler by adding more debugging checks to be used later. - Optimize and simplify trap handling by using a common exit just like on x86's Kei386EoiHelper - KiExceptionExit. This way the code isn't duplicated 6 times. - Do the same for system calls (KiServiceExit). - Save the previous trap frame and restore it during each system call.
by ros-arm-bringup＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: ros-arm-bringup Date: Mon Jul 21 10:55:58 2008 New Revision: 34640 URL: http://svn.reactos.org/svn/reactos?rev=34640&view=rev Log: - Improve system call handler by adding more debugging checks to be used later. - Optimize and simplify trap handling by using a common exit just like on x86's Kei386EoiHelper - KiExceptionExit. This way the code isn't duplicated 6 times. - Do the same for system calls (KiServiceExit). - Save the previous trap frame and restore it during each system call. Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ke/arm/usercall.c Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Mon Jul 21 10:55:58 2008 @@ -62,7 +62,7 @@ .equ TrSvcLr, 0x44 .equ TrPc, 0x48 .equ TrSpsr, 0x4C -.equ TrapFrameLength, (22 * 0x04) +.equ TrapFrameLength, (23 * 0x04) /* * Exception Frame offsets Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Mon Jul 21 10:55:58 2008 @@ -31,7 +31,6 @@ TEXTAREA NESTED_ENTRY KiUndefinedInstructionException PROLOG_END KiUndefinedInstructionException - // // Handle trap entry // @@ -40,21 +39,14 @@ // // Call the C handler // - adr lr, 1f + ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiUndefinedExceptionHandler + ENTRY_END KiUndefinedInstructionException -1: - // - // Handle trap exit - // - TRAP_EPILOG 0 // NotFromSystemCall - - ENTRY_END KiUndefinedInstructionException NESTED_ENTRY KiSoftwareInterruptException PROLOG_END KiSoftwareInterruptException - // // Handle trap entry // @@ -63,21 +55,14 @@ // // Call the C handler // - adr lr, 1f + ldr lr, =KiServiceExit mov r0, sp ldr pc, =KiSoftwareInterruptHandler - -1: - // - // Handle trap exit - // - TRAP_EPILOG 1 // FromSystemCall - ENTRY_END KiSoftwareInterruptException + NESTED_ENTRY KiPrefetchAbortException PROLOG_END KiPrefetchAbortException - // // Handle trap entry // @@ -86,21 +71,14 @@ // // Call the C handler // - adr lr, 1f + ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiPrefetchAbortHandler - -1: - // - // Handle trap exit - // - TRAP_EPILOG 0 // NotFromSystemCall - ENTRY_END KiPrefetchAbortException + NESTED_ENTRY KiDataAbortException PROLOG_END KiDataAbortException - // // Handle trap entry // @@ -109,21 +87,14 @@ // // Call the C handler // - adr lr, 1f + ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiDataAbortHandler + ENTRY_END KiDataAbortException -1: - // - // Handle trap exit - // - TRAP_EPILOG 0 // NotFromSystemCall - - ENTRY_END KiDataAbortException NESTED_ENTRY KiInterruptException PROLOG_END KiInterruptException - // // Handle trap entry // @@ -132,25 +103,35 @@ // // Call the C handler // - adr lr, 1f + ldr lr, =KiExceptionExit mov r0, sp mov r1, #0 ldr pc, =KiInterruptHandler + ENTRY_END KiInterruptException + + + NESTED_ENTRY KiFastInterruptException + PROLOG_END KiFastInterruptException + // + // FIXME-PERF: Implement FIQ exception + // + b . + ENTRY_END KiFastInterruptException -1: + + NESTED_ENTRY KiExceptionExit + PROLOG_END KiExceptionExit // // Handle trap exit // TRAP_EPILOG 0 // NotFromSystemCall - - ENTRY_END KiInterruptException + ENTRY_END KiExceptionExit - NESTED_ENTRY KiFastInterruptException - PROLOG_END KiFastInterruptException - + + NESTED_ENTRY KiServiceExit + PROLOG_END KiServiceExit // - // FIXME-PERF: Implement FIQ exception - // - b . - - ENTRY_END KiFastInterruptException + // Handle trap exit + // + TRAP_EPILOG 1 // FromSystemCall + ENTRY_END KiServiceExit Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Mon Jul 21 10:55:58 2008 @@ -457,7 +457,6 @@ // // Unhandled // - while (TRUE); DPRINT1("[PREFETCH ABORT] (%x) @ %p/%p/%p\n", KeArmInstructionFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); UNIMPLEMENTED; @@ -516,6 +515,7 @@ // Save old previous mode // TrapFrame->PreviousMode = PreviousMode; + TrapFrame->PreviousTrapFrame = (ULONG_PTR)Thread->TrapFrame; // // Save previous mode and trap frame Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Mon Jul 21 10:55:58 2008 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> +#include <internal/arm/ksarm.h> #define NDEBUG #include <debug.h> @@ -90,6 +91,7 @@ PVOID SystemCall; PVOID* Argument; PVOID Arguments[0x11]; // Maximum 17 arguments + KIRQL OldIrql; ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); // @@ -209,4 +211,53 @@ // TrapFrame->R0 = KiSyscallHandlers[ArgumentCount]((PVOID)SystemCall, (PVOID)Arguments); + + // + // Check if this was a user call + // + if (KiGetPreviousMode(TrapFrame) == UserMode) + { + // + // Make sure we didn't return at elevated IRQL + // + OldIrql = KeGetCurrentIrql(); + if (OldIrql != PASSIVE_LEVEL) + { + // + // Forcibly put us in a sane state + // + KeGetPcr()->CurrentIrql = 0; + _disable(); + + // + // Fail + // + KeBugCheckEx(IRQL_GT_ZERO_AT_SYSTEM_SERVICE, + (ULONG_PTR)SystemCall, + OldIrql, + 0, + 0); + } + + // + // Make sure we're not attached and that APCs are not disabled + // + if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || + (KeGetCurrentThread()->CombinedApcDisable != 0)) + { + // + // Fail + // + KeBugCheckEx(APC_INDEX_MISMATCH, + (ULONG_PTR)SystemCall, + KeGetCurrentThread()->ApcStateIndex, + KeGetCurrentThread()->CombinedApcDisable, + 0); + } + } + + // + // Restore the old trap frame + // + Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->PreviousTrapFrame; }

1 0

[fireball] 34639: - Create a place for some additional research work on Win32-subsystem.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: fireball Date: Mon Jul 21 10:54:57 2008 New Revision: 34639 URL: http://svn.reactos.org/svn/reactos?rev=34639&view=rev Log: - Create a place for some additional research work on Win32-subsystem. Added: branches/nwin32/ - copied from r34638, trunk/reactos/

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008