Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 26541: - add support for .ocx files to rbuild - update project to VS2005
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Fri Apr 27 19:18:34 2007 New Revision: 26541 URL: http://svn.reactos.org/svn/reactos?rev=26541&view=rev Log: - add support for .ocx files to rbuild - update project to VS2005 Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Apr 27 19:18:34 2007 @@ -221,6 +221,9 @@ break; case Win32DLL: handler = new MingwWin32DLLModuleHandler ( module ); + break; + case Win32OCX: + handler = new MingwWin32OCXModuleHandler ( module ); break; case KernelModeDriver: case ExportDriver: // maybe change this later @@ -2648,6 +2651,13 @@ { } +MingwWin32OCXModuleHandler::MingwWin32OCXModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + static void MingwAddImplicitLibraries( Module &module ) { @@ -2693,6 +2703,59 @@ void MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget () +{ + string targetMacro ( GetTargetMacro (module) ); + string workingDirectory = GetWorkingDirectory ( ); + string objectsMacro = GetObjectsMacro ( module ); + string linkDepsMacro = GetLinkingDependenciesMacro (); + string libsMacro = GetLibsMacro (); + + GenerateImportLibraryTargetIfNeeded (); + + if ( module.non_if_data.compilationUnits.size () > 0 ) + { + GenerateRules (); + + string dependencies = linkDepsMacro + " " + objectsMacro; + + string linker; + if ( module.cplusplus ) + linker = "${gpp}"; + else + linker = "${gcc}"; + + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", + module.GetEntryPoint(true).c_str (), + module.baseaddress.c_str () ); + GenerateLinkerCommand ( dependencies, + linker, + linkerParameters, + objectsMacro, + libsMacro, + "" ); + } + else + { + GeneratePhonyTarget(); + } +} + + +void +MingwWin32OCXModuleHandler::AddImplicitLibraries ( Module& module ) +{ + MingwAddImplicitLibraries ( module ); + MingwAddDebugSupportLibraries ( module, DebugUserMode ); +} + +void +MingwWin32OCXModuleHandler::Process () +{ + GenerateWin32OCXModuleTarget (); +} + +void +MingwWin32OCXModuleHandler::GenerateWin32OCXModuleTarget () { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Apr 27 19:18:34 2007 @@ -338,6 +338,19 @@ }; +class MingwWin32OCXModuleHandler : public MingwModuleHandler +{ +public: + MingwWin32OCXModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); + std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + void AddImplicitLibraries ( Module& module ); +private: + void GenerateWin32OCXModuleTarget (); +}; + + class MingwWin32CUIModuleHandler : public MingwModuleHandler { public: Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Fri Apr 27 19:18:34 2007 @@ -47,6 +47,7 @@ case NativeDLL: case NativeCUI: case Win32DLL: + case Win32OCX: case Win32CUI: case Win32SCR: case Win32GUI: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Apr 27 19:18:34 2007 @@ -807,6 +807,8 @@ return NativeCUI; if ( attribute.value == "win32dll" ) return Win32DLL; + if ( attribute.value == "win32ocx" ) + return Win32OCX; if ( attribute.value == "win32cui" ) return Win32CUI; if ( attribute.value == "win32gui" ) @@ -865,6 +867,8 @@ case NativeDLL: case Win32DLL: return ".dll"; + case Win32OCX: + return ".ocx"; case KernelModeDriver: case BootLoader: case ExportDriver: @@ -907,6 +911,7 @@ case NativeCUI: return "NtProcessStartup@4"; case Win32DLL: + case Win32OCX: return "DllMain@12"; case Win32CUI: case Test: @@ -948,6 +953,7 @@ case Kernel: return "0x80000000"; case Win32DLL: + case Win32OCX: return "0x10000000"; case NativeDLL: case NativeCUI: @@ -997,6 +1003,7 @@ case ExportDriver: case NativeDLL: case Win32DLL: + case Win32OCX: return true; case KernelModeDriver: case NativeCUI: @@ -1034,6 +1041,7 @@ case ExportDriver: case NativeDLL: case Win32DLL: + case Win32OCX: case KernelModeDriver: case NativeCUI: case Win32CUI: @@ -1523,6 +1531,7 @@ switch ( type ) { case Win32DLL: + case Win32OCX: return true; case Kernel: case KernelModeDLL: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Apr 27 19:18:34 2007 @@ -257,22 +257,23 @@ NativeDLL = 6, NativeCUI = 7, Win32DLL = 8, - Win32CUI = 9, - Win32GUI = 10, - BootLoader = 11, - BootSector = 12, - Iso = 13, - LiveIso = 14, - Test = 15, - RpcServer = 16, - RpcClient = 17, - Alias = 18, - BootProgram = 19, - Win32SCR = 20, - ExportDriver = 21, - IdlHeader = 22, - IsoRegTest = 23, - LiveIsoRegTest = 24 + Win32OCX = 9, + Win32CUI = 10, + Win32GUI = 11, + BootLoader = 12, + BootSector = 13, + Iso = 14, + LiveIso = 15, + Test = 16, + RpcServer = 17, + RpcClient = 18, + Alias = 19, + BootProgram = 20, + Win32SCR = 21, + ExportDriver = 22, + IdlHeader = 23, + IsoRegTest = 24, + LiveIsoRegTest = 25 }; enum HostType Modified: trunk/reactos/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.sln?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.sln (original) +++ trunk/reactos/tools/rbuild/rbuild.sln Fri Apr 27 19:18:34 2007 @@ -1,21 +1,19 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.Build.0 = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.ActiveCfg = Release|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Fri Apr 27 19:18:34 2007 @@ -1,132 +1,195 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="rbuild" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName="" + /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - RuntimeLibrary="4" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/rbuild.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCCustomBuildTool"/> + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" OutputFile=".\Release/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ProgramDatabaseFile=".\Release/rbuild.pdb" SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/rbuild.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName="" + /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" - RuntimeLibrary="5" - UsePrecompiledHeader="2" + RuntimeLibrary="1" + UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" OutputFile=".\Debug/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" + SuppressStartupBanner="true" + GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/rbuild.pdb" SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/rbuild.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -134,872 +197,1094 @@ <Files> <Filter Name="backends" - Filter=""> + > <Filter Name="devcpp" - Filter=""> - <File - RelativePath="backend\devcpp\devcpp.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\devcpp\devcpp.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h" + > </File> </Filter> <Filter Name="msvc" - Filter=""> - <File - RelativePath="backend\msvc\genguid.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\msvc\genguid.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.h"> - </File> - <File - RelativePath="backend\msvc\msvcmaker.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h" + > + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\vcprojmaker.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="mingw" - Filter=""> - <File - RelativePath="backend\mingw\mingw.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\mingw\mingw.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\mingw.h"> - </File> - <File - RelativePath="backend\mingw\modulehandler.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h" + > + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\modulehandler.h"> - </File> - <File - RelativePath="backend\mingw\pch_detection.h"> - </File> - <File - RelativePath="backend\mingw\proxymakefile.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h" + > + </File> + <File + RelativePath="backend\mingw\pch_detection.h" + > + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="backend_sources" - Filter=""> - <File - RelativePath="backend\backend.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\backend.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="backend_headers" - Filter=""> - <File - RelativePath="backend\backend.h"> + > + <File + RelativePath="backend\backend.h" + > </File> </Filter> </Filter> <Filter Name="rbuild_sources" - Filter=""> - <File - RelativePath="automaticdependency.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="cdfile.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilationunit.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilationunitsupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilerflag.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="configuration.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="define.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="directory.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="exception.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="filesupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="global.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="include.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="installfile.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="linkerflag.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="linkerscript.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="module.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="project.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="rbuild.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="stubbedcomponent.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="syssetupgenerator.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="testsupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="wineresource.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + > + <File + RelativePath="automaticdependency.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="rbuild_headers" - Filter=""> - <File - RelativePath="exception.h"> - </File> - <File - RelativePath="pch.h"> - </File> - <File - RelativePath="rbuild.h"> - </File> - <File - RelativePath="test.h"> + > + <File + RelativePath="exception.h" + > + </File> + <File + RelativePath="pch.h" + > + </File> + <File + RelativePath="rbuild.h" + > + </File> + <File + RelativePath="test.h" + > </File> </Filter> <Filter Name="inflib" - Filter=""> - <File - RelativePath="..\..\lib\inflib\builddep.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostglue.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infput.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + > + <File + RelativePath="..\..\lib\inflib\builddep.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhost.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infhostgen.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostglue.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostput.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\inflib.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infpriv.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infput.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="tools" - Filter=""> - <File - RelativePath="..\ssprintf.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\ssprintf.h"> - </File> - <File - RelativePath="..\xml.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\xml.h"> + > + <File + RelativePath="..\ssprintf.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\ssprintf.h" + > + </File> + <File + RelativePath="..\xml.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\xml.h" + > </File> </Filter> </Files>

1 0

[ekohl] 26540: Add code that applies the currently selected cursor scheme.
by ekohl＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: ekohl Date: Fri Apr 27 17:54:19 2007 New Revision: 26540 URL: http://svn.reactos.org/svn/reactos?rev=26540&view=rev Log: Add code that applies the currently selected cursor scheme. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Fri Apr 27 17:54:19 2007 @@ -122,7 +122,7 @@ { UINT uStringId; UINT uDefaultCursorId; - LPWSTR lpValueName; + LPTSTR lpValueName; HCURSOR hCursor; TCHAR szCursorName[MAX_PATH]; TCHAR szCursorPath[MAX_PATH]; @@ -1030,7 +1030,68 @@ static BOOL ApplyCursorScheme(HWND hwndDlg) { - /* FIXME: Apply the cursor scheme */ + TCHAR szSchemeName[MAX_PATH]; + TCHAR szSystemScheme[MAX_PATH]; + LPTSTR lpSchemeData; + DWORD dwNameLength; + DWORD dwSchemeSource; + UINT index, i; + HKEY hCursorKey; + INT nSel; + + nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0); + if (nSel == CB_ERR) + return FALSE; + + lpSchemeData = (LPTSTR)SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETITEMDATA, nSel, 0); + if (lpSchemeData == NULL) + { + /* "None" cursor scheme */ + dwSchemeSource = 0; + szSchemeName[0] = 0; + dwNameLength = 0; + } + else + { + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName); + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + + if (_tcsstr(szSchemeName, szSystemScheme)) + { + /* System scheme */ + dwSchemeSource = 2; + szSchemeName[_tcslen(szSchemeName) - _tcslen(szSystemScheme) - 1] = 0; + } + else + { + /* User scheme */ + dwSchemeSource = 1; + } + + dwNameLength = (_tcslen(szSchemeName) + 1) * sizeof(TCHAR); + } + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors"), 0, + KEY_READ | KEY_SET_VALUE, &hCursorKey) != ERROR_SUCCESS) + return FALSE; + + RegSetValueEx(hCursorKey, NULL, 0, REG_SZ, + (LPBYTE)szSchemeName, dwNameLength); + + RegSetValueEx(hCursorKey, _T("Scheme Source"), 0, REG_DWORD, + (LPBYTE)&dwSchemeSource, sizeof(DWORD)); + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + RegSetValueEx(hCursorKey, g_CursorData[i].lpValueName, 0, + REG_EXPAND_SZ, (LPBYTE)g_CursorData[i].szCursorPath, + (_tcslen(g_CursorData[i].szCursorPath) + 1) * sizeof(TCHAR)); + } + + RegCloseKey(hCursorKey); + + /* Force the system to reload its cursors */ + SystemParametersInfo(SPI_SETCURSORS, 0, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); return TRUE; }

1 0

[ekohl] 26539: Define missing SPI_SETCURSORS.
by ekohl＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: ekohl Date: Fri Apr 27 16:56:29 2007 New Revision: 26539 URL: http://svn.reactos.org/svn/reactos?rev=26539&view=rev Log: Define missing SPI_SETCURSORS. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Fri Apr 27 16:56:29 2007 @@ -1225,6 +1225,7 @@ #define SPI_SETANIMATION 73 #define SPI_SETBEEP 2 #define SPI_SETBORDER 6 +#define SPI_SETCURSORS 87 #define SPI_SETDEFAULTINPUTLANG 90 #define SPI_SETDESKPATTERN 21 #define SPI_SETDESKWALLPAPER 20 @@ -3975,6 +3976,7 @@ int WINAPI SetScrollPos(HWND,int,int,BOOL); BOOL WINAPI SetScrollRange(HWND,int,int,int,BOOL); BOOL WINAPI SetSysColors(int,const INT *,const COLORREF *); +HANDLE WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, int); #define SetSysModalWindow(h) (NULL) BOOL WINAPI SetSystemCursor(HCURSOR,DWORD); BOOL WINAPI SetThreadDesktop(HDESK);

1 0

[winesync] 26538: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: winesync Date: Fri Apr 27 16:00:08 2007 New Revision: 26538 URL: http://svn.reactos.org/svn/reactos?rev=26538&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild (contents, props changed) trunk/reactos/dll/win32/cryptnet/cryptnet.spec (props changed) trunk/reactos/dll/win32/cryptnet/cryptnet_main.c (props changed) Modified: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild Fri Apr 27 16:00:08 2007 @@ -1,16 +1,17 @@ -<module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true"> - <importlibrary definition="cryptnet.spec.def" /> - <include base="cryptnet">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>kernel32</library> - <library>ntdll</library> - <file>cryptnet_main.c</file> - <file>cryptnet.spec</file> -</module> +<module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="cryptnet.spec.def" /> + <include base="cryptnet">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cryptnet_main.c</file> + <file>cryptnet.spec</file> +</module> Propchange: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/cryptnet/cryptnet.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 26537: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: winesync Date: Fri Apr 27 15:59:52 2007 New Revision: 26537 URL: http://svn.reactos.org/svn/reactos?rev=26537&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c (props changed) trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild (contents, props changed) trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec (props changed) Propchange: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild Fri Apr 27 15:59:52 2007 @@ -1,16 +1,16 @@ -<module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true"> - <importlibrary definition="wtsapi32.spec.def" /> - <include base="wtsapi32">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>kernel32</library> - <library>ntdll</library> - <file>wtsapi32.c</file> - <file>wtsapi32.spec</file> -</module> +<module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true"> + <importlibrary definition="wtsapi32.spec.def" /> + <include base="wtsapi32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>wtsapi32.c</file> + <file>wtsapi32.spec</file> +</module> Propchange: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 26536: export stubbed LsaEnumerateTrustedDomains to get dameware loading
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Fri Apr 27 15:54:12 2007 New Revision: 26536 URL: http://svn.reactos.org/svn/reactos?rev=26536&view=rev Log: export stubbed LsaEnumerateTrustedDomains to get dameware loading Modified: trunk/reactos/dll/win32/advapi32/advapi32.def Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Fri Apr 27 15:54:12 2007 @@ -360,7 +360,7 @@ LsaEnumerateAccountsWithUserRight@16 ;LsaEnumeratePrivileges@20 ;LsaEnumeratePrivilegesOfAccount@8 -;LsaEnumerateTrustedDomains@20 +LsaEnumerateTrustedDomains@20 ;LsaEnumerateTrustedDomainsEx LsaFreeMemory@4 ;LsaGetQuotasForAccount@8

1 0

[hpoussin] 26535: Add missing WINAPI in function prototypes
by hpoussin＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: hpoussin Date: Fri Apr 27 15:51:50 2007 New Revision: 26535 URL: http://svn.reactos.org/svn/reactos?rev=26535&view=rev Log: Add missing WINAPI in function prototypes Modified: trunk/reactos/include/psdk/dsgetdc.h trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsgetdc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dsgetdc.h (original) +++ trunk/reactos/include/psdk/dsgetdc.h Fri Apr 27 15:51:50 2007 @@ -65,21 +65,21 @@ GUID DomainGuid; } DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; -DWORD +DWORD WINAPI DsEnumerateDomainTrustsA( LPSTR ServerName, ULONG Flags, PDS_DOMAIN_TRUSTSA* Domains, PULONG DomainCount); -DWORD +DWORD WINAPI DsEnumerateDomainTrustsW( LPWSTR ServerName, ULONG Flags, PDS_DOMAIN_TRUSTSW* Domains, PULONG DomainCount); -DWORD +DWORD WINAPI DsGetDcNameA( LPCSTR ComputerName, LPCSTR DomainName, @@ -88,7 +88,7 @@ ULONG Flags, PDOMAIN_CONTROLLER_INFOA* DomainControllerInfo); -DWORD +DWORD WINAPI DsGetDcNameW( LPCWSTR ComputerName, LPCWSTR DomainName, Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl (original) +++ trunk/reactos/include/psdk/urlmon.idl Fri Apr 27 15:51:50 2007 @@ -1284,3 +1284,5 @@ cpp_quote("#define OInetGetSession CoInternetGetSession") cpp_quote("#define MKSYS_URLMONIKER 6") +cpp_quote("#define URL_MK_LEGACY 0") +cpp_quote("#define URL_MK_UNIFORM 1")

1 0

[gedmurphy] 26534: forgot to svn add the rbuild file
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Fri Apr 27 13:39:00 2007 New Revision: 26534 URL: http://svn.reactos.org/svn/reactos?rev=26534&view=rev Log: forgot to svn add the rbuild file Added: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild Added: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild (added) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild Fri Apr 27 13:39:00 2007 @@ -1,0 +1,16 @@ +<module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true"> + <importlibrary definition="wtsapi32.spec.def" /> + <include base="wtsapi32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>wtsapi32.c</file> + <file>wtsapi32.spec</file> +</module>

1 0

[gedmurphy] 26533: add wtsapi32.dll from Wine
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Fri Apr 27 13:32:47 2007 New Revision: 26533 URL: http://svn.reactos.org/svn/reactos?rev=26533&view=rev Log: add wtsapi32.dll from Wine Added: trunk/reactos/dll/win32/wtsapi32/ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec trunk/reactos/include/psdk/wtsapi32.h Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=265… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Fri Apr 27 13:32:47 2007 @@ -110,6 +110,7 @@ <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> + <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 27 13:32:47 2007 @@ -231,6 +231,7 @@ dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 dll\win32\wsock32\wsock32.dll 1 +dll\win32\wtsapi32\wtsapi32.dll 1 ; Drivers Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Fri Apr 27 13:32:47 2007 @@ -298,4 +298,7 @@ <directory name="wsock32"> <xi:include href="wsock32/wsock32.rbuild" /> </directory> +<directory name="wtsapi32"> + <xi:include href="wtsapi32/wtsapi32.rbuild" /> +</directory> </group> Added: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c (added) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c Fri Apr 27 13:32:47 2007 @@ -1,0 +1,206 @@ +/* Copyright 2005 Ulrich Czekalla + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" +#include "wtsapi32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); + +static HMODULE WTSAPI32_hModule; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + WTSAPI32_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} + +/************************************************************ + * WTSCloseServer (WTSAPI32.@) + */ +void WINAPI WTSCloseServer(HANDLE hServer) +{ + FIXME("Stub %p\n", hServer); +} + +/************************************************************ + * WTSDisconnectSession (WTSAPI32.@) + */ +BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) +{ + FIXME("Stub %p 0x%08x %d\n", hServer, SessionId, bWait); + return TRUE; +} + +/************************************************************ + * WTSEnumerateProcessesA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, + PWTS_PROCESS_INFOA* ppProcessInfo, DWORD* pCount) +{ + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppProcessInfo, pCount); + + if (!ppProcessInfo || !pCount) return FALSE; + + *pCount = 0; + *ppProcessInfo = NULL; + + return TRUE; +} + +/************************************************************ + * WTSEnumerateProcessesW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, + PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) +{ + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppProcessInfo, pCount); + + if (!ppProcessInfo || !pCount) return FALSE; + + *pCount = 0; + *ppProcessInfo = NULL; + + return TRUE; +} + +/************************************************************ + * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, + PWTS_SESSION_INFOA* ppSessionInfo, DWORD* pCount) +{ + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppSessionInfo, pCount); + + if (!ppSessionInfo || !pCount) return FALSE; + + *pCount = 0; + *ppSessionInfo = NULL; + + return TRUE; +} + +/************************************************************ + * WTSEnumerateEnumerateSessionsW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, + PWTS_SESSION_INFOW* ppSessionInfo, DWORD* pCount) +{ + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppSessionInfo, pCount); + + if (!ppSessionInfo || !pCount) return FALSE; + + *pCount = 0; + *ppSessionInfo = NULL; + + return TRUE; +} + +/************************************************************ + * WTSFreeMemory (WTSAPI32.@) + */ +void WINAPI WTSFreeMemory(PVOID pMemory) +{ + FIXME("Stub %p\n", pMemory); + return; +} + +/************************************************************ + * WTSOpenServerA (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerA(LPSTR pServerName) +{ + FIXME("(%s) stub\n", debugstr_a(pServerName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/************************************************************ + * WTSOpenServerW (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerW(LPWSTR pServerName) +{ + FIXME("(%s) stub\n", debugstr_w(pServerName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/************************************************************ + * WTSQuerySessionInformationA (WTSAPI32.@) + */ +BOOL WINAPI WTSQuerySessionInformationA( + HANDLE hServer, + DWORD SessionId, + WTS_INFO_CLASS WTSInfoClass, + LPSTR* Buffer, + DWORD* BytesReturned) +{ + /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ + FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, + Buffer, BytesReturned); + + return FALSE; +} + +/************************************************************ + * WTSQuerySessionInformationW (WTSAPI32.@) + */ +BOOL WINAPI WTSQuerySessionInformationW( + HANDLE hServer, + DWORD SessionId, + WTS_INFO_CLASS WTSInfoClass, + LPWSTR* Buffer, + DWORD* BytesReturned) +{ + /* FIXME: Forward request to winsta.dll::WinStationQueryInformationW */ + FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, + Buffer, BytesReturned); + + return FALSE; +} + +/************************************************************ + * WTSWaitSystemEvent (WTSAPI32.@) + */ +BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD Mask, DWORD* Flags) +{ + /* FIXME: Forward request to winsta.dll::WinStationWaitSystemEvent */ + FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); + return FALSE; +} Added: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec (added) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec Fri Apr 27 13:32:47 2007 @@ -1,0 +1,32 @@ +@ stdcall WTSCloseServer(long) +@ stdcall WTSDisconnectSession(long long long) +@ stdcall WTSEnumerateProcessesA(long long long ptr ptr) +@ stdcall WTSEnumerateProcessesW(long long long ptr ptr) +@ stub WTSEnumerateServersA +@ stub WTSEnumerateServersW +@ stdcall WTSEnumerateSessionsA(long long long ptr ptr) +@ stdcall WTSEnumerateSessionsW(long long long ptr ptr) +@ stdcall WTSFreeMemory(ptr) +@ stub WTSLogoffSession +@ stdcall WTSOpenServerA(ptr) +@ stdcall WTSOpenServerW(ptr) +@ stdcall WTSQuerySessionInformationA(long long long ptr ptr) +@ stdcall WTSQuerySessionInformationW(long long long ptr ptr) +@ stub WTSQueryUserConfigA +@ stub WTSQueryUserConfigW +@ stub WTSSendMessageA +@ stub WTSSendMessageW +@ stub WTSSetSessionInformationA +@ stub WTSSetSessionInformationW +@ stub WTSSetUserConfigA +@ stub WTSSetUserConfigW +@ stub WTSShutdownSystem +@ stub WTSTerminateProcess +@ stub WTSVirtualChannelClose +@ stub WTSVirtualChannelOpen +@ stub WTSVirtualChannelPurgeInput +@ stub WTSVirtualChannelPurgeOutput +@ stub WTSVirtualChannelQuery +@ stub WTSVirtualChannelRead +@ stub WTSVirtualChannelWrite +@ stdcall WTSWaitSystemEvent(long long ptr) Added: trunk/reactos/include/psdk/wtsapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtsapi32.h?re… ============================================================================== --- trunk/reactos/include/psdk/wtsapi32.h (added) +++ trunk/reactos/include/psdk/wtsapi32.h Fri Apr 27 13:32:47 2007 @@ -1,0 +1,163 @@ +/* + * Copyright 2005 Ulrich Czekalla (For CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WTSAPI32_H +#define __WINE_WTSAPI32_H + +#ifdef __cplusplus +extern "C" { +#endif + + +typedef enum tagWTS_INFO_CLASS +{ + WTSInitialProgram, + WTSApplicationName, + WTSWorkingDirectory, + WTSOEMId, + WTSSessionId, + WTSUserName, + WTSWinStationName, + WTSDomainName, + WTSConnectState, + WTSClientBuildNumber, + WTSClientName, + WTSClientDirectory, + WTSClientProductId, + WTSClientHardwareId, + WTSClientAddress, + WTSClientDisplay, + WTSClientProtocolType, +} WTS_INFO_CLASS; + +typedef enum _WTS_CONNECTSTATE_CLASS +{ + WTSActive, + WTSConnected, + WTSConnectQuery, + WTSShadow, + WTSDisconnected, + WTSIdle, + WTSListen, + WTSReset, + WTSDown, + WTSInit +} WTS_CONNECTSTATE_CLASS; + +typedef enum _WTS_CONFIG_CLASS +{ + WTSUserConfigInitialProgram, + WTSUserConfigWorkingDirectory, + WTSUserConfigInheritInitialProgram, + WTSUserConfigAllowLogonTerminalServer, + WTSUserConfigTimeoutSettingsConnections, + WTSUserConfigTimeoutSettingsDisconnections, + WTSUserConfigTimeoutSettingsIdle, + WTSUserConfigDeviceClientDrives, + WTSUserConfigDeviceClientPrinters, + WTSUserConfigDeviceClientDefaultPrinter, + WTSUserConfigBrokenTimeoutSettings, + WTSUserConfigModemCallbackSettings, + WTSUserConfigModemCallbackPhoneNumber, + WTSUserConfigShadowSettings, + WTSUserConfigTerminalServerProfilePath, + WTSUserConfigTerminalServerHomeDirectory, + WTSUserConfigfTerminalServerRemoteHomeDir +} WTS_CONFIG_CLASS; + +typedef struct _WTS_PROCESS_INFOA +{ + DWORD SessionId; + DWORD ProcessId; + LPSTR pProcessName; + PSID pUserSid; +} WTS_PROCESS_INFOA, *PWTS_PROCESS_INFOA; + +typedef struct _WTS_PROCESS_INFOW +{ + DWORD SessionId; + DWORD ProcessId; + LPWSTR pProcessName; + PSID pUserSid; +} WTS_PROCESS_INFOW, *PWTS_PROCESS_INFOW; + +DECL_WINELIB_TYPE_AW(WTS_PROCESS_INFO) +DECL_WINELIB_TYPE_AW(PWTS_PROCESS_INFO) + +typedef struct _WTS_SESSION_INFOA +{ + DWORD SessionId; + LPSTR pWinStationName; + WTS_CONNECTSTATE_CLASS State; +} WTS_SESSION_INFOA, *PWTS_SESSION_INFOA; + +typedef struct _WTS_SESSION_INFOW +{ + DWORD SessionId; + LPWSTR pWinStationName; + WTS_CONNECTSTATE_CLASS State; +} WTS_SESSION_INFOW, *PWTS_SESSION_INFOW; + +DECL_WINELIB_TYPE_AW(WTS_SESSION_INFO) +DECL_WINELIB_TYPE_AW(PWTS_SESSION_INFO) + +typedef struct _WTS_SERVER_INFOA +{ + LPSTR pServerName; +} WTS_SERVER_INFOA, *PWTS_SERVER_INFOA; + +typedef struct _WTS_SERVER_INFOW +{ + LPWSTR pServerName; +} WTS_SERVER_INFOW, *PWTS_SERVER_INFOW; + +DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) +DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) + +void WINAPI WTSCloseServer(HANDLE); +BOOL WINAPI WTSDisconnectSession(HANDLE, DWORD, BOOL); +BOOL WINAPI WTSEnumerateProcessesA(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOA *, DWORD *); +BOOL WINAPI WTSEnumerateProcessesW(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOW *, DWORD *); +#define WTSEnumerateProcesses WINELIB_NAME_AW(WTSEnumerateProcesses) +BOOL WINAPI WTSEnumerateServersA( LPSTR, DWORD, DWORD, PWTS_SERVER_INFOA*, DWORD*); +BOOL WINAPI WTSEnumerateServersW( LPWSTR, DWORD, DWORD, PWTS_SERVER_INFOW*, DWORD*); +#define WTSEnumerateServers WINELIB_NAME_AW(WTSEnumerateServers) +BOOL WINAPI WTSEnumerateSessionsA(HANDLE, DWORD, DWORD, PWTS_SESSION_INFOA *, DWORD *); +BOOL WINAPI WTSEnumerateSessionsW(HANDLE, DWORD, DWORD, PWTS_SESSION_INFOW *, DWORD *); +#define WTSEnumerateSessions WINELIB_NAME_AW(WTSEnumerateSessions) +void WINAPI WTSFreeMemory(PVOID); +HANDLE WINAPI WTSOpenServerA(LPSTR); +HANDLE WINAPI WTSOpenServerW(LPWSTR); +#define WTSOpenServer WINELIB_NAME_AW(WTSOpenServer) +BOOL WINAPI WTSQuerySessionInformationA(HANDLE, DWORD, WTS_INFO_CLASS, LPSTR *, DWORD *); +BOOL WINAPI WTSQuerySessionInformationW(HANDLE, DWORD, WTS_INFO_CLASS, LPWSTR *, DWORD *); +#define WTSQuerySessionInformation WINELIB_NAME_AW(WTSQuerySessionInformation) +BOOL WINAPI WTSQueryUserConfigA(LPSTR,LPSTR,WTS_CONFIG_CLASS,LPSTR*,DWORD*); +BOOL WINAPI WTSQueryUserConfigW(LPWSTR,LPWSTR,WTS_CONFIG_CLASS,LPWSTR*,DWORD*); +#define WTSQueryUserConfig WINELIB_NAME_AW(WTSQueryUserConfig) +BOOL WINAPI WTSQueryUserToken(ULONG, PHANDLE); +BOOL WINAPI WTSRegisterSessionNotification(HWND, DWORD); +BOOL WINAPI WTSTerminateProcess(HANDLE, DWORD, DWORD); +BOOL WINAPI WTSUnRegisterSessionNotification(HWND); +BOOL WINAPI WTSWaitSystemEvent(HANDLE, DWORD, DWORD*); + +#ifdef __cplusplus +} +#endif + +#endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Apr 27 13:32:47 2007 @@ -88,6 +88,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wldap32 # Autosync +reactos/dll/win32/wtsapi32 # Autosync reactos/dll/directx/dinput # Synced to Wine-0_9_5 reactos/dll/directx/dinput8 # Synced to Wine-0_9_5 reactos/dll/directx/dplay # Synced to Wine-0_9_5

1 0

[gedmurphy] 26532: - add cryptnet.dll from wine (stub) - relocate a few dlls
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Fri Apr 27 13:05:43 2007 New Revision: 26532 URL: http://svn.reactos.org/svn/reactos?rev=26532&view=rev Log: - add cryptnet.dll from wine (stub) - relocate a few dlls Added: trunk/reactos/dll/win32/cryptnet/ trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild trunk/reactos/dll/win32/cryptnet/cryptnet.spec trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=265… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Fri Apr 27 13:05:43 2007 @@ -10,6 +10,7 @@ <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> @@ -82,8 +83,7 @@ <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> - <property name="BASEADDRESS_IMM32" value="0x75e60000" /> - <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> + <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> @@ -93,6 +93,7 @@ <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> + <property name="BASEADDRESS_IMM32" value="0x76390000" /> <property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 27 13:05:43 2007 @@ -153,6 +153,7 @@ dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 dll\win32\cryptdll\cryptdll.dll 1 +dll\win32\cryptnet\cryptnet.dll 1 dll\win32\cryptui\cryptui.dll 1 dll\win32\dbghelp\dbghelp.dll 1 dll\win32\devmgr\devmgr.dll 1 Added: trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild (added) +++ trunk/reactos/dll/win32/cryptnet/cryptnet.rbuild Fri Apr 27 13:05:43 2007 @@ -1,0 +1,16 @@ +<module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true"> + <importlibrary definition="cryptnet.spec.def" /> + <include base="cryptnet">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cryptnet_main.c</file> + <file>cryptnet.spec</file> +</module> Added: trunk/reactos/dll/win32/cryptnet/cryptnet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet.spec (added) +++ trunk/reactos/dll/win32/cryptnet/cryptnet.spec Fri Apr 27 13:05:43 2007 @@ -1,0 +1,18 @@ +@ stub CertDllVerifyCTLUsage +@ stub CertDllVerifyRevocation +@ stub CryptnetWlxLogoffEvent +@ stub LdapProvOpenStore +@ stub CryptCancelAsyncRetrieval +@ stub CryptFlushTimeValidObject +@ stub CryptGetObjectUrl +@ stub CryptGetTimeValidObject +@ stub CryptInstallCancelRetrieval +@ stub CryptRetrieveObjectByUrlA +@ stub CryptRetrieveObjectByUrlW +@ stub CryptUninstallCancelRetrieval +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub I_CryptNetEnumUrlCacheEntry +@ stub I_CryptNetGetHostNameFromUrl +@ stub I_CryptNetGetUserDsStoreUrl +@ stub I_CryptNetIsConnected Added: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c (added) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Fri Apr 27 13:05:43 2007 @@ -1,0 +1,64 @@ +/* + * Copyright (C) 2006 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "windef.h" +#include "wine/debug.h" +#include "winbase.h" +#include "winnt.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + /* Do uninitialisation here */ + break; + default: break; + } + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer (CRYPTNET.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (CRYPTNET.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + + return S_OK; +} Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Fri Apr 27 13:05:43 2007 @@ -52,6 +52,9 @@ <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> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Apr 27 13:05:43 2007 @@ -45,6 +45,7 @@ reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Autosync reactos/dll/win32/cryptdll # Autosync +reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs