Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[gschneider] 44347: [inf] Fix fdc driver version entry (highlighted by bug #4917)
by gschneider＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gschneider Date: Tue Dec 1 20:51:51 2009 New Revision: 44347 URL: http://svn.reactos.org/svn/reactos?rev=44347&view=rev Log: [inf] Fix fdc driver version entry (highlighted by bug #4917) Modified: trunk/reactos/media/inf/fdc.inf Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=4434… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 44346: Add the msvc10 makefile changes
by gedmurphy＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gedmurphy Date: Tue Dec 1 19:56:05 2009 New Revision: 44346 URL: http://svn.reactos.org/svn/reactos?rev=44346&view=rev Log: Add the msvc10 makefile changes Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=44346&r1=4434… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Dec 1 19:56:05 2009 @@ -529,6 +529,11 @@ $(ECHO_RBUILD) $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc +.PHONY: msvc10 +msvc10: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs10.00 -voversionconfiguration msvc + .PHONY: msvc6_clean msvc6_clean: $(ROS_BUILDENGINE) $(ECHO_RBUILD) @@ -553,6 +558,11 @@ msvc9_clean: $(ROS_BUILDENGINE) $(ECHO_RBUILD) $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc + +.PHONY: msvc10_clean +msvc10_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs10.00 -voversionconfiguration msvc .PHONY: msvc_clean msvc_clean: $(ROS_BUILDENGINE)

1 0

[gschneider] 44345: [kernel] - Fail in DosDateTimeToFileTime if prior time conversion was unsuccessful - Should fix the NetStats installation, bug #4917, part 2
by gschneider＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gschneider Date: Tue Dec 1 19:53:01 2009 New Revision: 44345 URL: http://svn.reactos.org/svn/reactos?rev=44345&view=rev Log: [kernel] - Fail in DosDateTimeToFileTime if prior time conversion was unsuccessful - Should fix the NetStats installation, bug #4917, part 2 Modified: trunk/reactos/dll/win32/kernel32/misc/time.c Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Tue Dec 1 19:53:01 2009 @@ -318,7 +318,10 @@ SystemTime.wMonth = pddate->Month; SystemTime.wYear = 1980 + pddate->Year; - SystemTimeToFileTime(&SystemTime,lpFileTime); + if (SystemTimeToFileTime(&SystemTime, lpFileTime) == FALSE) + { + return FALSE; + } return TRUE; }

1 0

[gschneider] 44344: [ntdll] - Logic change of r37554 is correct, RtlTimeFieldsToTime doesn't normalize invalid input values - remove these codes - Related to bug #4917, part 1
by gschneider＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gschneider Date: Tue Dec 1 19:46:13 2009 New Revision: 44344 URL: http://svn.reactos.org/svn/reactos?rev=44344&view=rev Log: [ntdll] - Logic change of r37554 is correct, RtlTimeFieldsToTime doesn't normalize invalid input values - remove these codes - Related to bug #4917, part 1 Modified: trunk/reactos/lib/rtl/time.c Modified: trunk/reactos/lib/rtl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/time.c?rev=44344&r… ============================================================================== --- trunk/reactos/lib/rtl/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/time.c [iso-8859-1] Tue Dec 1 19:46:13 2009 @@ -61,14 +61,6 @@ return Days; } -static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, - CSHORT *CarryField, - int Modulus) -{ - *FieldToNormalize = (CSHORT) (*FieldToNormalize - Modulus); - *CarryField = (CSHORT) (*CarryField + 1); -} - /* FUNCTIONS *****************************************************************/ /* @@ -199,39 +191,6 @@ return FALSE; } - /* Normalize the TIME_FIELDS structure here */ - while (IntTimeFields.Second >= SECSPERMIN) - { - NormalizeTimeFields(&IntTimeFields.Second, - &IntTimeFields.Minute, - SECSPERMIN); - } - while (IntTimeFields.Minute >= MINSPERHOUR) - { - NormalizeTimeFields(&IntTimeFields.Minute, - &IntTimeFields.Hour, - MINSPERHOUR); - } - while (IntTimeFields.Hour >= HOURSPERDAY) - { - NormalizeTimeFields(&IntTimeFields.Hour, - &IntTimeFields.Day, - HOURSPERDAY); - } - while (IntTimeFields.Day > - MonthLengths[IsLeapYear(IntTimeFields.Year)][IntTimeFields.Month - 1]) - { - NormalizeTimeFields(&IntTimeFields.Day, - &IntTimeFields.Month, - SECSPERMIN); - } - while (IntTimeFields.Month > MONSPERYEAR) - { - NormalizeTimeFields(&IntTimeFields.Month, - &IntTimeFields.Year, - MONSPERYEAR); - } - /* Compute the time */ Time->QuadPart = DaysSinceEpoch(IntTimeFields.Year); for (CurMonth = 1; CurMonth < IntTimeFields.Month; CurMonth++)

1 0

[gedmurphy] 44343: - Include support for makefile configurations. - Add a new makefile config to the global configuration called RosBuild - Use the new makefile config to process and external batch file which make use of rbuild. - Split and partially rewrite _generate_vcproj. Configurations are now written in support functions. - Remove the creation of .vcproj.user files. They're rather pointless for our needs - Start to add support for VS2010 (make msvc10), it's very incomplete at the moment so
by gedmurphy＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gedmurphy Date: Tue Dec 1 19:44:16 2009 New Revision: 44343 URL: http://svn.reactos.org/svn/reactos?rev=44343&view=rev Log: - Include support for makefile configurations. - Add a new makefile config to the global configuration called RosBuild - Use the new makefile config to process and external batch file which make use of rbuild. - Split and partially rewrite _generate_vcproj. Configurations are now written in support functions. - Remove the creation of .vcproj.user files. They're rather pointless for our needs - Start to add support for VS2010 (make msvc10), it's very incomplete at the moment so don't bother trying it. After this commit, you can now use Visual Studio to build individual reactos components. Run 'make msvc9', open up any vcproj file, select the RosBuild config and hit the build/rebuild button. Working build features are 'build', 'rebuild' and 'clean' Added: trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp (with props) Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -70,6 +70,7 @@ m_configurations.push_back ( new MSVCConfiguration( Debug )); m_configurations.push_back ( new MSVCConfiguration( Release )); m_configurations.push_back ( new MSVCConfiguration( Speed )); + m_configurations.push_back ( new MSVCConfiguration( RosBuild )); if (!only_msvc_headers) { @@ -123,6 +124,8 @@ if (configuration.VSProjectVersion == "6.00") _generate_dsp ( module ); + else if (configuration.VSProjectVersion == "10.00") + _generate_vcxproj ( module ); else _generate_vcproj ( module ); } @@ -285,10 +288,12 @@ return "vc70"; else if ( configuration.VSProjectVersion == "7.10" ) return "vc71"; - else if ( configuration.VSProjectVersion == "9.00" ) + else if ( configuration.VSProjectVersion == "8.00" ) + return "vc8"; + else if ( configuration.VSProjectVersion == "10.00" ) + return "vc10"; + else /* default to VS2008 */ return "vc9"; - else /* must be VS2005 */ - return "vc8"; } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -25,6 +25,7 @@ #include "../backend.h" + class FileUnit { public: @@ -34,9 +35,28 @@ enum OptimizationType { + RosBuild, Debug, Release, - Speed + Speed, +}; + +enum ConfigurationType +{ + ConfigUnknown, + ConfigApp, + ConfigDll, + ConfigEmpty, + ConfigLib +}; + +enum BinaryType +{ + BinUnknown, + Lib, + Dll, + Exe, + Sys }; enum HeadersType @@ -123,7 +143,23 @@ std::string _get_vc_dir ( void ) const; + // These are used in both _generate_vcproj and _generate_standard_configuration + std::vector<std::string> header_files; + std::vector<std::string> includes; + std::vector<std::string> includes_ros; + std::vector<std::string> libraries; + std::set<std::string> common_defines; + std::string baseaddr; + + void _generate_standard_configuration( + FILE* OUT, + const Module& module, + const MSVCConfiguration& cfg, + BinaryType binaryType ); + void _generate_makefile_configuration( FILE* OUT, const Module& module, const MSVCConfiguration& cfg ); + void _generate_vcproj ( const Module& module ); + void _generate_vcxproj ( const Module& module ); void _generate_sln_header ( FILE* OUT ); void _generate_sln_footer ( FILE* OUT ); Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -3,6 +3,7 @@ * Copyright (C) 2005 Royce Mitchell III * Copyright (C) 2006 Hervé Poussineau * Copyright (C) 2006 Christoph von Wittich + * Copyright (C) 2009 Ged Murphy * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,6 +72,8 @@ this->name = "Release" + headers_name; else if ( optimization == Speed ) this->name = "Speed" + headers_name; + else if ( optimization == RosBuild ) + this->name = "RosBuild"; else this->name = "Unknown" + headers_name; } @@ -84,7 +87,13 @@ string vcproj_file = VcprojFileName(module); string computername; string username; - string intermediatedir = ""; + + // make sure the containers are empty + header_files.clear(); + includes.clear(); + includes_ros.clear(); + libraries.clear(); + common_defines.clear(); if (getenv ( "USERNAME" ) != NULL) username = getenv ( "USERNAME" ); @@ -101,13 +110,6 @@ printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() ); FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); - vector<string> imports; - string module_type = GetExtension(*module.output); - bool lib = (module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a"); - bool dll = (module_type == ".dll") || (module_type == ".cpl"); - bool exe = (module_type == ".exe") || (module_type == ".scr"); - bool sys = (module_type == ".sys"); - string path_basedir = module.GetPathToBaseDir (); string intenv = Environment::GetIntermediatePath (); string outenv = Environment::GetOutputPath (); @@ -115,7 +117,6 @@ string intdir; string vcdir; - if ( intenv == "obj-i386" ) intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ else @@ -130,18 +131,13 @@ { vcdir = DEF_SSEP + _get_vc_dir(); } - // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? - - bool console = exe && (module.type == Win32CUI); + bool include_idl = false; - vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries; - StringSet common_defines; + vector<string> source_files, resource_files; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - - string baseaddr; while ( ifs_list.size() ) { @@ -245,417 +241,38 @@ fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); fprintf ( OUT, "\t</Platforms>\r\n" ); - //fprintf ( OUT, "\t<ToolFiles>\r\n" ); - //fprintf ( OUT, "\t\t<ToolFile\r\n" ); - - //string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() ); - //path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1); - - //fprintf ( OUT, "\t\t\tRelativePath=\"%sgccasm.rules\"/>\r\n", path.c_str() ); - //fprintf ( OUT, "\t</ToolFiles>\r\n" ); - - int n = 0; - - std::string output_dir; - string importLib; - - // don't do the work m_configurations.size() times - if (module.importLibrary != NULL) - { - intermediatedir = module.output->relative_path + vcdir; - importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir); - importLib = Path::RelativeFromDirectory ( - importLib, - module.output->relative_path ); - } - + // Set the binary type + string module_type = GetExtension(*module.output); + BinaryType binaryType; + if ((module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a")) + binaryType = Lib; + else if ((module_type == ".dll") || (module_type == ".cpl")) + binaryType = Dll; + else if ((module_type == ".exe") || (module_type == ".scr")) + binaryType = Exe; + else if (module_type == ".sys") + binaryType = Sys; + else + binaryType = BinUnknown; + + // Write out all the configurations fprintf ( OUT, "\t<Configurations>\r\n" ); for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const MSVCConfiguration& cfg = *m_configurations[icfg]; - bool debug = ( cfg.optimization == Debug ); - bool release = ( cfg.optimization == Release ); - bool speed = ( cfg.optimization == Speed ); - - fprintf ( OUT, "\t\t<Configuration\r\n" ); - fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); - - if ( configuration.UseConfigurationInPath ) - { - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); + if ( cfg.optimization == RosBuild ) + { + _generate_makefile_configuration( OUT, module, cfg ); } else { - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); - } - - fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); - fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); - - fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); - bool multiple_includes = false; - fprintf ( OUT, "./;" ); - for ( i = 0; i < includes.size(); i++ ) - { - const std::string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - include_string += " /I " + include; - multiple_includes = true; - } - } - if ( include_idl ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - - if ( configuration.UseConfigurationInPath ) - { - fprintf ( OUT, "%s\\include\\reactos\\idl%s\\%s\r\n", intdir.c_str (), vcdir.c_str (), cfg.name.c_str() ); - } - else - { - fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () ); - } - } - if ( cfg.headers == ReactOSHeaders ) - { - for ( i = 0; i < includes_ros.size(); i++ ) - { - const std::string& include = includes_ros[i]; - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - //include_string += " /I " + include; - multiple_includes = true; - } - } - else - { - // Add WDK or PSDK paths, if user provides them - if (getenv ( "BASEDIR" ) != NULL && - (module.type == Kernel || - module.type == KernelModeDLL || - module.type == KernelModeDriver || - module.type == KeyboardLayout)) - { - string WdkBase, SdkPath, CrtPath, DdkPath; - WdkBase = getenv ( "BASEDIR" ); - SdkPath = WdkBase + "\\inc\\api"; - CrtPath = WdkBase + "\\inc\\crt"; - DdkPath = WdkBase + "\\inc\\ddk"; - - if ( multiple_includes ) - fprintf ( OUT, ";" ); - - fprintf ( OUT, "%s;", SdkPath.c_str() ); - fprintf ( OUT, "%s;", CrtPath.c_str() ); - fprintf ( OUT, "%s", DdkPath.c_str() ); - multiple_includes = true; - } - } - fprintf ( OUT, "\"\r\n" ); - - StringSet defines = common_defines; - - // Always add _CRT_SECURE_NO_WARNINGS to disable warnings about not - // using the safe functions introduced in MSVC8. - defines.insert ( "_CRT_SECURE_NO_WARNINGS" ); - - if ( debug ) - { - defines.insert ( "_DEBUG" ); - } - - if ( cfg.headers == MSVCHeaders ) - { - // this is a define in MinGW w32api, but not Microsoft's headers - defines.insert ( "STDCALL=__stdcall" ); - } - - if ( lib || exe ) - { - defines.insert ( "_LIB" ); - } - else - { - defines.insert ( "_WINDOWS" ); - defines.insert ( "_USRDLL" ); - } - - fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); - for ( StringSet::iterator it1=defines.begin(); it1!=defines.end(); it1++ ) - { - if ( i > 0 ) - fprintf ( OUT, ";" ); - - string unescaped = *it1; - fprintf ( OUT, "%s", _replace_str(unescaped, "\"","").c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 3 : 2 ); // 3=/MDd 2=/MD - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"FALSE\"\r\n" ); - - if ( module.pch != NULL ) - { - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" ); - string pch_path = Path::RelativeFromDirectory ( - module.pch->file->name, - module.output->relative_path ); - string::size_type pos = pch_path.find_last_of ("/"); - if ( pos != string::npos ) - pch_path.erase(0, pos+1); - fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); - - // Only include from the same module - pos = pch_path.find("../"); - if (pos == string::npos && std::find(header_files.begin(), header_files.end(), pch_path) == header_files.end()) - header_files.push_back(pch_path); - } - else - { - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); - } - - fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "FALSE" : "FALSE"); - if ( release ) - { - fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); - } - - fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "3" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", "FALSE"); - if ( !module.cplusplus ) - fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); - - if ( module.type == Win32CUI || module.type == Win32GUI ) - { - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 0 ); // 0=__cdecl - } - else - { - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); // 2=__stdcall - } - - fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : release ? "3": "4"); // 3=/Zi 4=ZI - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); - - if ( lib ) - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.lib\"/>\r\n", module.name.c_str() ); - } - else - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - if (module.GetEntryPoint() == "0" && sys == false) - fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); - - if (configuration.VSProjectVersion == "9.00") - { - fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); - } - - if (module.importLibrary != NULL) - fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", importLib.c_str()); - - fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); - bool use_msvcrt_lib = false; - for ( i = 0; i < libraries.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, " " ); - string libpath = libraries[i].c_str(); - libpath = libpath.erase (0, libpath.find_last_of ("\\") + 1 ); - if ( libpath == "msvcrt.lib" ) - { - use_msvcrt_lib = true; - } - fprintf ( OUT, "%s", libpath.c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tAdditionalLibraryDirectories=\"" ); - - // Add WDK libs paths, if needed - if (getenv ( "BASEDIR" ) != NULL && - (module.type == Kernel || - module.type == KernelModeDLL || - module.type == KernelModeDriver || - module.type == KeyboardLayout)) - { - string WdkBase, CrtPath, DdkPath; - WdkBase = getenv ( "BASEDIR" ); - CrtPath = WdkBase + "\\lib\\crt\\i386"; - DdkPath = WdkBase + "\\lib\\wnet\\i386"; - - fprintf ( OUT, "%s;", CrtPath.c_str() ); - fprintf ( OUT, "%s", DdkPath.c_str() ); - - if (libraries.size () > 0) - fprintf ( OUT, ";" ); - } - - // Add conventional libraries dirs - for (i = 0; i < libraries.size (); i++) - { - if ( i > 0 ) - fprintf ( OUT, ";" ); - - string libpath = libraries[i].c_str(); - libpath.replace (libpath.find("---"), 3, cfg.name); - libpath = libpath.substr (0, libpath.find_last_of ("\\") ); - fprintf ( OUT, "%s", libpath.c_str() ); - } - - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); - fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); - fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tLinkTimeCodeGeneration=\"%d\"\r\n", release? 0 : 0); // whole program optimization - - if ( debug ) - fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); - - if ( sys ) - { - if (module.GetEntryPoint() == "0") - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /noentry /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); - else - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); - fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint() == "" ? "DriverEntry" : module.GetEntryPoint().c_str ()); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); - } - else if ( exe ) - { - if ( module.type == Kernel ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); - fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); - } - else if ( module.type == NativeCUI ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); - } - else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) - { - if ( use_msvcrt_lib ) - { - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - } - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - } - } - else if ( dll ) - { - if (module.GetEntryPoint() == "0") - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); - else - { - // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 - // when using CRT - if (module.GetEntryPoint() == "DllMain@12") - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); - else - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint().c_str ()); - } - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); - if ( use_msvcrt_lib ) - { - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - } - } - fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); - } - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); - multiple_includes = false; - fprintf ( OUT, "./;" ); - for ( i = 0; i < includes.size(); i++ ) - { - const std::string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - multiple_includes = true; - } - } - if ( cfg.headers == ReactOSHeaders ) - { - for ( i = 0; i < includes_ros.size(); i++ ) - { - const std::string& include = includes_ros[i]; - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - multiple_includes = true; - } - } - fprintf ( OUT, "\"/>\r\n " ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); - if (configuration.VSProjectVersion == "8.00") - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); - } - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); - fprintf ( OUT, "\t\t</Configuration>\r\n" ); - - n++; + _generate_standard_configuration( OUT, module, cfg, binaryType ); + } } fprintf ( OUT, "\t</Configurations>\r\n" ); + // Write out the project files fprintf ( OUT, "\t<Files>\r\n" ); // Source files @@ -825,6 +442,7 @@ fprintf ( OUT, "</VisualStudioProject>\r\n" ); fclose ( OUT ); +#if 0 /* User configuration file */ if (vcproj_file_user != "") { @@ -881,8 +499,510 @@ fprintf ( OUT, "</VisualStudioUserFile>\r\n" ); fclose ( OUT ); } - -} +#endif +} + +void MSVCBackend::_generate_standard_configuration( FILE* OUT, + const Module& module, + const MSVCConfiguration& cfg, + BinaryType binaryType ) +{ + string path_basedir = module.GetPathToBaseDir (); + string intenv = Environment::GetIntermediatePath (); + string outenv = Environment::GetOutputPath (); + string outdir; + string intdir; + string vcdir; + + bool debug = ( cfg.optimization == Debug ); + bool release = ( cfg.optimization == Release ); + bool speed = ( cfg.optimization == Speed ); + + bool include_idl = false; + string include_string; + + size_t i; + string intermediatedir = ""; + string importLib; + // don't do the work m_configurations.size() times + if (module.importLibrary != NULL) + { + intermediatedir = module.output->relative_path + vcdir; + importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir); + importLib = Path::RelativeFromDirectory ( + importLib, + module.output->relative_path ); + } + + string module_type = GetExtension(*module.output); + + // Set the configuration type for this config + ConfigurationType CfgType; + if ( binaryType == Exe ) + CfgType = ConfigApp; + else if ( binaryType == Lib ) + CfgType = ConfigLib; + else if ( binaryType == Dll || binaryType == Sys ) + CfgType = ConfigDll; + else + CfgType = ConfigUnknown; + + + if ( intenv == "obj-i386" ) + intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ + else + intdir = intenv; + + if ( outenv == "output-i386" ) + outdir = path_basedir + "output-i386"; + else + outdir = outenv; + + if ( configuration.UseVSVersionInPath ) + { + vcdir = DEF_SSEP + _get_vc_dir(); + } + + fprintf ( OUT, "\t\t<Configuration\r\n" ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); + + if ( configuration.UseConfigurationInPath ) + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), vcdir.c_str () ); + } + + fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", CfgType ); + fprintf ( OUT, "\t\t\tCharacterSet=\"2\"\r\n" ); + fprintf ( OUT, "\t\t\t>\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", release ? 2 : 0 ); + + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + bool multiple_includes = false; + fprintf ( OUT, "./;" ); + for ( i = 0; i < includes.size(); i++ ) + { + const std::string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + include_string += " /I " + include; + multiple_includes = true; + } + } + if ( include_idl ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + if ( configuration.UseConfigurationInPath ) + { + fprintf ( OUT, "%s\\include\\reactos\\idl%s\\%s\r\n", intdir.c_str (), vcdir.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () ); + } + } + if ( cfg.headers == ReactOSHeaders ) + { + for ( i = 0; i < includes_ros.size(); i++ ) + { + const std::string& include = includes_ros[i]; + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + //include_string += " /I " + include; + multiple_includes = true; + } + } + else + { + // Add WDK or PSDK paths, if user provides them + if (getenv ( "BASEDIR" ) != NULL && + (module.type == Kernel || + module.type == KernelModeDLL || + module.type == KernelModeDriver || + module.type == KeyboardLayout)) + { + string WdkBase, SdkPath, CrtPath, DdkPath; + WdkBase = getenv ( "BASEDIR" ); + SdkPath = WdkBase + "\\inc\\api"; + CrtPath = WdkBase + "\\inc\\crt"; + DdkPath = WdkBase + "\\inc\\ddk"; + + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + fprintf ( OUT, "%s;", SdkPath.c_str() ); + fprintf ( OUT, "%s;", CrtPath.c_str() ); + fprintf ( OUT, "%s", DdkPath.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"\r\n" ); + + StringSet defines = common_defines; + + // Always add _CRT_SECURE_NO_WARNINGS to disable warnings about not + // using the safe functions introduced in MSVC8. + defines.insert ( "_CRT_SECURE_NO_WARNINGS" ); + + if ( debug ) + { + defines.insert ( "_DEBUG" ); + } + + if ( cfg.headers == MSVCHeaders ) + { + // this is a define in MinGW w32api, but not Microsoft's headers + defines.insert ( "STDCALL=__stdcall" ); + } + + if ( binaryType == Lib || binaryType == Exe ) + { + defines.insert ( "_LIB" ); + } + else + { + defines.insert ( "_WINDOWS" ); + defines.insert ( "_USRDLL" ); + } + + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); + for ( StringSet::iterator it1=defines.begin(); it1!=defines.end(); it1++ ) + { + if ( i > 0 ) + fprintf ( OUT, ";" ); + + string unescaped = *it1; + fprintf ( OUT, "%s", _replace_str(unescaped, "\"","").c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 3 : 2 ); // 3=/MDd 2=/MD + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"FALSE\"\r\n" ); + + if ( module.pch != NULL ) + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"2\"\r\n" ); + string pch_path = Path::RelativeFromDirectory ( + module.pch->file->name, + module.output->relative_path ); + string::size_type pos = pch_path.find_last_of ("/"); + if ( pos != string::npos ) + pch_path.erase(0, pos+1); + fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); + + // Only include from the same module + pos = pch_path.find("../"); + if (pos == string::npos && std::find(header_files.begin(), header_files.end(), pch_path) == header_files.end()) + header_files.push_back(pch_path); + } + else + { + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); + } + + fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "FALSE" : "FALSE"); + if ( release ) + { + fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tStringPooling=\"true\"\r\n" ); + } + + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "3" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", "FALSE"); + if ( !module.cplusplus ) + fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); + + if ( module.type == Win32CUI || module.type == Win32GUI ) + { + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 0 ); // 0=__cdecl + } + else + { + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); // 2=__stdcall + } + + fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : release ? "3": "4"); // 3=/Zi 4=ZI + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); + + if ( binaryType == Lib ) + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.lib\"/>\r\n", module.name.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); + if (module.GetEntryPoint() == "0" && binaryType != Sys ) + fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); + + if (configuration.VSProjectVersion == "9.00") + { + fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); + } + + if (module.importLibrary != NULL) + fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", importLib.c_str()); + + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); + bool use_msvcrt_lib = false; + for ( i = 0; i < libraries.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, " " ); + string libpath = libraries[i].c_str(); + libpath = libpath.erase (0, libpath.find_last_of ("\\") + 1 ); + if ( libpath == "msvcrt.lib" ) + { + use_msvcrt_lib = true; + } + fprintf ( OUT, "%s", libpath.c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tAdditionalLibraryDirectories=\"" ); + + // Add WDK libs paths, if needed + if (getenv ( "BASEDIR" ) != NULL && + (module.type == Kernel || + module.type == KernelModeDLL || + module.type == KernelModeDriver || + module.type == KeyboardLayout)) + { + string WdkBase, CrtPath, DdkPath; + WdkBase = getenv ( "BASEDIR" ); + CrtPath = WdkBase + "\\lib\\crt\\i386"; + DdkPath = WdkBase + "\\lib\\wnet\\i386"; + + fprintf ( OUT, "%s;", CrtPath.c_str() ); + fprintf ( OUT, "%s", DdkPath.c_str() ); + + if (libraries.size () > 0) + fprintf ( OUT, ";" ); + } + + // Add conventional libraries dirs + for (i = 0; i < libraries.size (); i++) + { + if ( i > 0 ) + fprintf ( OUT, ";" ); + + string libpath = libraries[i].c_str(); + libpath.replace (libpath.find("---"), 3, cfg.name); + libpath = libpath.substr (0, libpath.find_last_of ("\\") ); + fprintf ( OUT, "%s", libpath.c_str() ); + } + + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); + fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); + fprintf ( OUT, "\t\t\t\tLinkTimeCodeGeneration=\"%d\"\r\n", release? 0 : 0); // whole program optimization + + if ( debug ) + fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); + + if ( binaryType == Sys ) + { + if (module.GetEntryPoint() == "0") + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /noentry /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); + fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint() == "" ? "DriverEntry" : module.GetEntryPoint().c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); + } + else if ( binaryType == Exe ) + { + if ( module.type == Kernel ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); + fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); + } + else if ( module.type == NativeCUI ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); + } + else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) + { + if ( use_msvcrt_lib ) + { + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + } + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 2 ); + } + } + else if ( binaryType == Dll ) + { + if (module.GetEntryPoint() == "0") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + { + // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 + // when using CRT + if (module.GetEntryPoint() == "DllMain@12") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint().c_str ()); + } + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); + if ( use_msvcrt_lib ) + { + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + } + } + fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); + } + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + multiple_includes = false; + fprintf ( OUT, "./;" ); + for ( i = 0; i < includes.size(); i++ ) + { + const std::string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + if ( cfg.headers == ReactOSHeaders ) + { + for ( i = 0; i < includes_ros.size(); i++ ) + { + const std::string& include = includes_ros[i]; + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"/>\r\n " ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + if (configuration.VSProjectVersion == "8.00") + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); + } + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); + fprintf ( OUT, "\t\t</Configuration>\r\n" ); +} + + +void +MSVCBackend::_generate_makefile_configuration( FILE* OUT, const Module& module, const MSVCConfiguration& cfg ) +{ + string path_basedir = module.GetPathToBaseDir (); + string intenv = Environment::GetIntermediatePath (); + string outenv = Environment::GetOutputPath (); + + string outdir; + string intdir; + string vcdir; + + + if ( intenv == "obj-i386" ) + intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ + else + intdir = intenv; + + if ( outenv == "output-i386" ) + outdir = path_basedir + "output-i386"; + else + outdir = outenv; + + if ( configuration.UseVSVersionInPath ) + { + vcdir = DEF_SSEP + _get_vc_dir(); + } + + fprintf ( OUT, "\t\t<Configuration\r\n" ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); + + if ( configuration.UseConfigurationInPath ) + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str () ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str () ); + } + + fprintf ( OUT, "\t\t\tConfigurationType=\"0\"\r\n"); + fprintf ( OUT, "\t\t\t>\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + + fprintf ( OUT, "\t\t\t\tName=\"VCNMakeTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBuildCommandLine=\"%srosbuild.bat build %s\"\r\n", path_basedir.c_str (), module.name.c_str ()); + fprintf ( OUT, "\t\t\t\tReBuildCommandLine=\"%srosbuild.bat rebuild %s\"\r\n", path_basedir.c_str (), module.name.c_str ()); + fprintf ( OUT, "\t\t\t\tCleanCommandLine=\"%srosbuild.bat clean %s\"\r\n", path_basedir.c_str (), module.name.c_str ()); + fprintf ( OUT, "\t\t\t\tOutput=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tIncludeSearchPath=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tForcedIncludes=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tAssemblySearchPath=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tForcedUsingAssemblies=\"\"\r\n"); + fprintf ( OUT, "\t\t\t\tCompileAsManaged=\"\"\r\n"); + + fprintf ( OUT, "\t\t\t/>\r\n" ); + fprintf ( OUT, "\t\t</Configuration>\r\n" ); +} + std::string MSVCBackend::_strip_gcc_deffile(std::string Filename, std::string sourcedir, std::string objdir) @@ -969,6 +1089,9 @@ else if (configuration.VSProjectVersion == "9.00") version = "10.00"; + else if (configuration.VSProjectVersion == "10.00") + version = "11.00"; + return version; } @@ -991,6 +1114,9 @@ else if (configuration.VSProjectVersion == "9.00") version = "2008"; + + else if (configuration.VSProjectVersion == "10.00") + version = "2010"; return version; } @@ -1037,11 +1163,12 @@ MSVCBackend::_generate_sln_footer ( FILE* OUT ) { fprintf ( OUT, "Global\r\n" ); - fprintf ( OUT, "\tGlobalSection(SolutionConfiguration) = preSolution\r\n" ); + fprintf ( OUT, "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n" ); for ( size_t i = 0; i < m_configurations.size(); i++ ) fprintf ( OUT, "\t\t%s = %s\r\n", m_configurations[i]->name.c_str(), m_configurations[i]->name.c_str() ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); - fprintf ( OUT, "\tGlobalSection(ProjectConfiguration) = postSolution\r\n" ); + + fprintf ( OUT, "\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\r\n" ); for( std::map<std::string, Module*>::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p ) { Module& module = *p->second; @@ -1049,18 +1176,18 @@ _generate_sln_configurations ( OUT, guid.c_str() ); } fprintf ( OUT, "\tEndGlobalSection\r\n" ); +/* fprintf ( OUT, "\tGlobalSection(ExtensibilityGlobals) = postSolution\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); - +*/ if (configuration.VSProjectVersion == "7.00") { fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" ); //FIXME: Add dependencies for VS 2002 fprintf ( OUT, "\tEndGlobalSection\r\n" ); } - - if (configuration.VSProjectVersion == "8.00") { + else { fprintf ( OUT, "\tGlobalSection(SolutionProperties) = preSolution\r\n" ); fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); Added: trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp (added) +++ trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -1,0 +1,177 @@ +/* + * Copyright (C) 2009 Ged Murphy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <string> +#include <vector> +#include <set> +#include <algorithm> +#include <fstream> +#include <iostream> + +#include <stdio.h> + +#include "msvc.h" + +using std::string; +using std::vector; +using std::set; + +typedef set<string> StringSet; + +#ifdef OUT +#undef OUT +#endif//OUT + +void +MSVCBackend::_generate_vcxproj ( const Module& module ) +{ + size_t i; + + string vcproj_file = VcprojFileName(module); + string computername; + string username; + string intermediatedir = ""; + + if (getenv ( "USERNAME" ) != NULL) + username = getenv ( "USERNAME" ); + if (getenv ( "COMPUTERNAME" ) != NULL) + computername = getenv ( "COMPUTERNAME" ); + else if (getenv ( "HOSTNAME" ) != NULL) + computername = getenv ( "HOSTNAME" ); + + printf ( "Creating MSVC project: '%s'\n", vcproj_file.c_str() ); + FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); + + string path_basedir = module.GetPathToBaseDir (); + string intenv = Environment::GetIntermediatePath (); + string outenv = Environment::GetOutputPath (); + string outdir; + string intdir; + string vcdir; + + if ( intenv == "obj-i386" ) + intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ + else + intdir = intenv; + + if ( outenv == "output-i386" ) + outdir = path_basedir + "output-i386"; + else + outdir = outenv; + + if ( configuration.UseVSVersionInPath ) + { + vcdir = DEF_SSEP + _get_vc_dir(); + } + + + + bool include_idl = false; + + vector<string> source_files, resource_files; + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<File*>& files = data.files; + for ( i = 0; i < files.size(); i++ ) + { + if (files[i]->file.directory != SourceDirectory) + continue; + + // We want the full path here for directory support later on + string path = Path::RelativeFromDirectory ( + files[i]->file.relative_path, + module.output->relative_path ); + string file = path + std::string("\\") + files[i]->file.name; + + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + resource_files.push_back ( file ); + else if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) + header_files.push_back ( file ); + else + source_files.push_back ( file ); + } + const vector<Include*>& incs = data.includes; + for ( i = 0; i < incs.size(); i++ ) + { + string path = Path::RelativeFromDirectory ( + incs[i]->directory->relative_path, + module.output->relative_path ); + if ( module.type != RpcServer && module.type != RpcClient ) + { + if ( path.find ("/include/reactos/idl") != string::npos) + { + include_idl = true; + continue; + } + } + // switch between general headers and ros headers + if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\GL", 10 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\reactos\\wine", 20 ) ) + { + if (strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 )) + // not crt include + includes_ros.push_back ( path ); + } + else + { + includes.push_back ( path ); + } + } + const vector<Library*>& libs = data.libraries; + for ( i = 0; i < libs.size(); i++ ) + { + string libpath = outdir + "\\" + libs[i]->importedModule->output->relative_path + "\\" + _get_vc_dir() + "\\---\\" + libs[i]->name + ".lib"; + libraries.push_back ( libpath ); + } + const vector<Define*>& defs = data.defines; + for ( i = 0; i < defs.size(); i++ ) + { + if ( defs[i]->backend != "" && defs[i]->backend != "msvc" ) + continue; + + if ( defs[i]->value[0] ) + common_defines.insert( defs[i]->name + "=" + defs[i]->value ); + else + common_defines.insert( defs[i]->name ); + } + for ( std::map<std::string, Property*>::const_iterator p = data.properties.begin(); p != data.properties.end(); ++ p ) + { + Property& prop = *p->second; + if ( strstr ( module.baseaddress.c_str(), prop.name.c_str() ) ) + baseaddr = prop.value; + } + } + /* include intermediate path for reactos.rc */ + string version = intdir + "\\include"; + includes.push_back (version); + version += "\\reactos"; + includes.push_back (version); + + string include_string; + + fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); +} Propchange: trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -229,6 +229,7 @@ msvc.cpp \ msvcmaker.cpp \ vcprojmaker.cpp \ + vcxprojmaker.cpp \ ) RBUILD_BACKEND_SOURCES = \ @@ -530,6 +531,10 @@ $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_MSVC_INT_)vcxprojmaker.o: $(RBUILD_MSVC_BASE_)vcxprojmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) + $(ECHO_HOSTCC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) $(ECHO_HOSTLD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ 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 [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.sln [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" EndProject Global 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 [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Tue Dec 1 19:44:16 2009 @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="9.00" Name="rbuild" ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" RootNamespace="rbuild" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -75,6 +76,8 @@ SuppressStartupBanner="true" ProgramDatabaseFile=".\Release/rbuild.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -94,9 +97,6 @@ /> <Tool Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" @@ -166,6 +166,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/rbuild.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -185,9 +187,6 @@ /> <Tool Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" @@ -335,6 +334,10 @@ /> </FileConfiguration> </File> + <File + RelativePath=".\backend\msvc\vcxprojmaker.cpp" + > + </File> </Filter> <Filter Name="mingw"

1 0

[gedmurphy] 44342: Add a root level batch file which allows building reactos without invoking RosBE. It won't currently work without RosBE as it relies in the gcc toolset installed along with RosBE to go about its business. It currently checks for RosBE existence with a rather hackish ^H^H^H^H ... elaborate string parser using the 'reg' command line util output. I'd be happy for anyone to improve on this.
by gedmurphy＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: gedmurphy Date: Tue Dec 1 19:39:49 2009 New Revision: 44342 URL: http://svn.reactos.org/svn/reactos?rev=44342&view=rev Log: Add a root level batch file which allows building reactos without invoking RosBE. It won't currently work without RosBE as it relies in the gcc toolset installed along with RosBE to go about its business. It currently checks for RosBE existence with a rather hackish ^H^H^H^H ... elaborate string parser using the 'reg' command line util output. I'd be happy for anyone to improve on this. Added: trunk/reactos/rosbuild.bat (with props) Added: trunk/reactos/rosbuild.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/rosbuild.bat?rev=44342&vie… ============================================================================== --- trunk/reactos/rosbuild.bat (added) +++ trunk/reactos/rosbuild.bat [iso-8859-1] Tue Dec 1 19:39:49 2009 @@ -1,0 +1,108 @@ +:: +:: Call from Makefile command line within Visual Studio with the following parameters: +:: +:: %1 - $(build) +:: %2 - $(target) +:: +:: Examples: +:: +:: Call build.bat build ntoskrnl +:: Call build.bat clean win32k +:: + +@echo off + +if "%1"=="" goto :err_params +if "%2"=="" goto :err_params + + +:: Get the RosBE path... :: + +:: Set the command we'll use to check if RosBE exists +set _IS_ROSBE_INSTALLED_COMMAND="reg query "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\ReactOS Build Environment for Windows" /v UninstallString" + +:: Check the key actually exists !!!!FIXME: Why is this returning 'The system cannot find the path specified.'!!!! +%_IS_ROSBE_INSTALLED_COMMAND% +IF NOT errorlevel 0 goto :err_no_rosbe + +:: This is a bit hackish. What we do is look for REG_SZ which is the second token on the second line and dump it into i +:: We then assign all remaining text to the next variable in the sequence, which is j. This leaves us with the path +for /F "tokens=2,* skip=1 delims=\ " %%i in ('%_IS_ROSBE_INSTALLED_COMMAND%') do ( + set _ROSBE_UNINSTALL_PATH_=%%j +) + + +:: Now strip the file name from the end of the path and we should have our RosBE install directory +set _ROSBE_PATH_DIR= +set _ROSBE_PATH_= +for %%i in ("%_ROSBE_UNINSTALL_PATH_%") do set _ROSBE_PATH_DIR=%%~di +for %%i in ("%_ROSBE_UNINSTALL_PATH_%") do set "_ROSBE_PATH_=%%~pi" +set "_ROSBE_FULL_PATH_=%_ROSBE_PATH_DIR%%_ROSBE_PATH_%" +::echo RosBE insall path = %_ROSBE_FULL_PATH_% + +:: Set the path which contains our build tools +set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%\i386\bin + +:: Set the make.exe path +set _MAKE_COMMAND=%_ROSBE_BIN_PATH%\mingw32-make.exe + +:: This file is located in the source root +set _ROS_SOURCE_ROOT=%~dp0 + +:: Add the path to the search path +path=%path%;%_ROSBE_BIN_PATH% + +:: Change the current dir to the source root +cd %_ROS_SOURCE_ROOT% + + + +:: Run the requested build task +if "%1" == "build" ( + goto :build +) +if "%1" == "rebuild" ( + goto clean +) +if "%1" == "clean" ( + goto :clean +) +goto :err_params + +:clean +echo. +echo Cleaning... +echo. +call "%_MAKE_COMMAND%" -j 1 %2%_clean + +if "%1" == "rebuild" ( + goto :build +) + +goto :exit + +:build +echo. +echo Building... +echo. +call "%_MAKE_COMMAND%" -j 1 %2% + +goto :exit + + +:err_no_rosbe +echo. +echo You need to have RosBE installed to use this configuration +echo. +exit 1 + +:err_params +echo. +echo Invalid parameters required, Check your command line. +echo. +exit 2 + +:exit +echo. +echo done +echo. Propchange: trunk/reactos/rosbuild.bat ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 44341: [kernel32] - Fix broken code inside SXS_SUPPORT_ENABLED define and add some DPRINTs. Still unused.
by mjmartin＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: mjmartin Date: Tue Dec 1 12:48:06 2009 New Revision: 44341 URL: http://svn.reactos.org/svn/reactos?rev=44341&view=rev Log: [kernel32] - Fix broken code inside SXS_SUPPORT_ENABLED define and add some DPRINTs. Still unused. Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Tue Dec 1 12:48:06 2009 @@ -160,46 +160,60 @@ #ifdef SXS_SUPPORT_ENABLED /* Are we in the same process? */ - if (Process = NtCurrentProcess()) + if (hProcess == NtCurrentProcess()) { PTEB Teb; PVOID ActivationContextStack; - PTHREAD_BASIC_INFORMATION ThreadBasicInfo; - PACTIVATION_CONTEXT_BASIC_INFORMATION ActivationCtxInfo; + THREAD_BASIC_INFORMATION ThreadBasicInfo; + ACTIVATION_CONTEXT_BASIC_INFORMATION ActivationCtxInfo; ULONG_PTR Cookie; + ULONG retLen; /* Get the TEB */ Status = NtQueryInformationThread(hThread, - ThreadBasicIformation, + ThreadBasicInformation, &ThreadBasicInfo, sizeof(ThreadBasicInfo), - NULL); - - /* Allocate the Activation Context Stack */ - Status = RtlAllocateActivationContextStack(&ActivationContextStack); - Teb = ThreadBasicInfo.TebBaseAddress; - - /* Save it */ - Teb->ActivationContextStackPointer = ActivationContextStack; - - /* Query the Context */ - Status = RtlQueryInformationActivationContext(1, - 0, - NULL, - ActivationContextBasicInformation, - &ActivationCtxInfo, - sizeof(ActivationCtxInfo), - NULL); - - /* Does it need to be activated? */ - if (!ActivationCtxInfo.hActCtx) + &retLen); + if (NT_SUCCESS(Status)) { - /* Activate it */ - Status = RtlActivateActivationContextEx(1, - Teb, - ActivationCtxInfo.hActCtx, - &Cookie); + /* Allocate the Activation Context Stack */ + Status = RtlAllocateActivationContextStack(&ActivationContextStack); } + + if (NT_SUCCESS(Status)) + { + Teb = ThreadBasicInfo.TebBaseAddress; + + /* Save it */ + Teb->ActivationContextStackPointer = ActivationContextStack; + + /* Query the Context */ + Status = RtlQueryInformationActivationContext(1, + 0, + NULL, + ActivationContextBasicInformation, + &ActivationCtxInfo, + sizeof(ActivationCtxInfo), + &retLen); + if (NT_SUCCESS(Status)) + { + /* Does it need to be activated? */ + if (!ActivationCtxInfo.hActCtx) + { + /* Activate it */ + Status = RtlActivateActivationContext(1, + ActivationCtxInfo.hActCtx, + &Cookie); + if (!NT_SUCCESS(Status)) + DPRINT1("RtlActivateActivationContext failed %x\n", Status); + } + } + else + DPRINT1("RtlQueryInformationActivationContext failed %x\n", Status); + } + else + DPRINT1("RtlAllocateActivationContextStack failed %x\n", Status); } #endif

1 0

[jimtabor] 44340: - [Win32k] Make DispatchMessage call direct to WinProc callback. Add more thread death checks.
by jimtabor＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: jimtabor Date: Tue Dec 1 06:35:05 2009 New Revision: 44340 URL: http://svn.reactos.org/svn/reactos?rev=44340&view=rev Log: - [Win32k] Make DispatchMessage call direct to WinProc callback. Add more thread death checks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Dec 1 06:35:05 2009 @@ -335,6 +335,9 @@ LARGE_INTEGER TickCount; LONG Time; LRESULT retval; + PMSGMEMORY MsgMemoryEntry; + INT lParamBufferSize; + LPARAM lParamPacked; PWINDOW_OBJECT Window = NULL; if (pMsg->hwnd) @@ -376,9 +379,37 @@ } } // Need a window! - if (!Window) return 0; - - retval = co_IntPostOrSendMessage(pMsg->hwnd, pMsg->message, pMsg->wParam, pMsg->lParam); + if ( !Window || !Window->Wnd ) return 0; + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(pMsg->message); + if ( !MsgMemoryEntry ) + { + lParamBufferSize = -1; + } + else + { + lParamBufferSize = MsgMemorySize(MsgMemoryEntry, pMsg->wParam, pMsg->lParam); + } + + if (! NT_SUCCESS(PackParam(&lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam))) + { + DPRINT1("Failed to pack message parameters\n"); + return 0; + } + + retval = co_IntCallWindowProc( Window->Wnd->lpfnWndProc, + !Window->Wnd->Unicode, + pMsg->hwnd, + pMsg->message, + pMsg->wParam, + lParamPacked, + lParamBufferSize); + + if (! NT_SUCCESS(UnpackParam(lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam))) + { + DPRINT1("Failed to unpack message parameters\n"); + } if (pMsg->message == WM_PAINT) { @@ -1324,7 +1355,7 @@ if( Status == STATUS_SUCCESS ) { pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; - if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) + if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) { ObDereferenceObject( peThread ); return FALSE; @@ -1370,7 +1401,6 @@ wParam, lParam); - pti = PsGetCurrentThreadWin32Thread(); if (Wnd == HWND_BROADCAST) { HWND *List; @@ -1392,11 +1422,19 @@ PWINDOW_OBJECT Window; Window = UserGetWindowObject(Wnd); - if (NULL == Window) + if ( !Window || !Window->Wnd ) { return FALSE; } - if(Window->Status & WINDOWSTATUS_DESTROYING) + + pti = Window->Wnd->head.pti; + if ( pti->TIF_flags & TIF_INCLEANUP ) + { + DPRINT1("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd); + return FALSE; + } + + if ( Window->Status & WINDOWSTATUS_DESTROYING ) { DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); /* FIXME - last error code? */ @@ -1760,6 +1798,9 @@ Info.Ansi = !Window->Wnd->Unicode; Info.Proc = Window->Wnd->lpfnWndProc; + + // Make the call from here if CALLWNDPROC or CALLWNDPROCRET are hooked + // or just do it in User32! IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); }

1 0

[sserapion] 44339: Hack fix ndis build.
by sserapion＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: sserapion Date: Tue Dec 1 04:36:35 2009 New Revision: 44339 URL: http://svn.reactos.org/svn/reactos?rev=44339&view=rev Log: Hack fix ndis build. Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/misc.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Tue Dec 1 04:36:35 2009 @@ -426,7 +426,7 @@ * NDIS 5.0 */ { - return ExInterlockedPopEntrySList ( ListHead, Lock ); + return (PSINGLE_LIST_ENTRY)ExInterlockedPopEntrySList ( ListHead, Lock ); } @@ -447,7 +447,7 @@ * NDIS 5.0 */ { - return ExInterlockedPushEntrySList ( ListHead, ListEntry, Lock ); + return (PSINGLE_LIST_ENTRY)ExInterlockedPushEntrySList ( ListHead, (PSLIST_ENTRY)ListEntry, Lock ); }

1 0

[sserapion] 44338: fix build.
by sserapion＠svn.reactos.org 01 Dec '09

01 Dec '09

Author: sserapion Date: Tue Dec 1 04:17:54 2009 New Revision: 44338 URL: http://svn.reactos.org/svn/reactos?rev=44338&view=rev Log: fix build. Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Tue Dec 1 04:17:54 2009 @@ -3249,7 +3249,7 @@ #define _SLIST_HEADER_ #if defined(_WIN64) -typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; +typedef struct _SLIST_ENTRY *PSLIST_ENTRY; typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY { PSLIST_ENTRY Next; } SLIST_ENTRY;

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 December 2009