Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[hpoussin] 22343: - Add a MSVCConfiguration class, to keep trace of parameters instead of parsing each time the configuration name - When building with MSVC headers, win32api and Wine directories are omitted and some defines are added
by hpoussin＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: hpoussin Date: Wed Jun 14 01:23:25 2006 New Revision: 22343 URL: http://svn.reactos.ru/svn/reactos?rev=22343&view=rev Log: - Add a MSVCConfiguration class, to keep trace of parameters instead of parsing each time the configuration name - When building with MSVC headers, win32api and Wine directories are omitted and some defines are added Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Wed Jun 14 01:23:25 2006 @@ -30,6 +30,31 @@ public: std::string filename; std::string folder; +}; + +enum OptimizationType +{ + Debug, + Release, + Speed +}; + +enum HeadersType +{ + MSVCHeaders, + WineHeaders +}; + +class MSVCConfiguration +{ + public: + MSVCConfiguration(const OptimizationType optimization, + const HeadersType headers = MSVCHeaders, + const std::string &name = ""); + virtual ~MSVCConfiguration() {} + std::string name; + OptimizationType optimization; + HeadersType headers; }; class MSVCBackend : public Backend Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Jun 14 01:23:25 2006 @@ -1,6 +1,7 @@ /* * Copyright (C) 2002 Patrik Stridvall * Copyright (C) 2005 Royce Mitchell III + * Copyright (C) 2006 Hervé Poussineau * * 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 @@ -39,12 +40,34 @@ #undef OUT #endif//OUT +MSVCConfiguration::MSVCConfiguration ( const OptimizationType optimization, const HeadersType headers, const std::string &name ) +{ + this->optimization = optimization; + this->headers = headers; + if ( name != "" ) + this->name = name; + else + { + std::string headers_name; + if ( headers == MSVCHeaders ) + headers_name = ""; + else + headers_name = " - Wine headers"; + if ( optimization == Debug ) + this->name = "Debug" + headers_name; + else if ( optimization == Release ) + this->name = "Release" + headers_name; + else if ( optimization == Speed ) + this->name = "Speed" + headers_name; + else + this->name = "Unknown" + headers_name; + } +} + void MSVCBackend::_generate_vcproj ( const Module& module ) { size_t i; - // TODO FIXME wine hack? - //const bool wine = false; string vcproj_file = VcprojFileName(module); printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() ); @@ -95,18 +118,12 @@ //$output->progress("$dsp_file (file $progress_current of $progress_max)"); string vcproj_path = module.GetBasePath(); - vector<string> source_files, resource_files, includes, libraries; + vector<string> source_files, resource_files, includes, includes_wine, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - // MinGW doesn't have a safe-string library yet - common_defines.insert ( "_CRT_SECURE_NO_DEPRECATE" ); - common_defines.insert ( "_CRT_NON_CONFORMING_SWPRINTFS" ); - // this is a define in MinGW w32api, but not Microsoft's headers - common_defines.insert ( "STDCALL=__stdcall" ); - string baseaddr; while ( ifs_list.size() ) @@ -136,24 +153,22 @@ const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) { - // explicitly omit win32api directories - if ( !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) ) - continue; - - if ( !strncmp(incs[i]->directory.c_str(), "include\\crt", 11 ) ) - continue; - - if ( !strncmp(incs[i]->directory.c_str(), "include\\GL", 10 ) ) - continue; - - // explicitly omit include/wine directories - if ( !strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) ) - continue; - string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); - includes.push_back ( path ); + + // add to another list win32api and include/wine directories + if ( !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) || + !strncmp(incs[i]->directory.c_str(), "include\\crt", 11 ) || + !strncmp(incs[i]->directory.c_str(), "include\\GL", 10 ) || + !strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) ) + { + includes_wine.push_back ( path ); + } + else + { + includes.push_back ( path ); + } } const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) @@ -179,40 +194,22 @@ vector<string> header_files; - bool no_cpp = true; + // TODO FIXME wine hack? bool no_msvc_headers = true; - std::vector<std::string> cfgs; - - cfgs.push_back ( "Debug" ); - cfgs.push_back ( "Release" ); - cfgs.push_back ( "Speed" ); - - if (!no_cpp) - { - std::vector<std::string> _cfgs; - for ( i = 0; i < cfgs.size(); i++ ) - { - _cfgs.push_back ( cfgs[i] + " C" ); - _cfgs.push_back ( cfgs[i] + " C++" ); - } - cfgs.resize(0); - cfgs = _cfgs; - } + std::vector<MSVCConfiguration*> cfgs; + + cfgs.push_back ( new MSVCConfiguration( Debug )); + cfgs.push_back ( new MSVCConfiguration( Release )); + cfgs.push_back ( new MSVCConfiguration( Speed )); if (!no_msvc_headers) { - std::vector<std::string> _cfgs; - for ( i = 0; i < cfgs.size(); i++ ) - { - _cfgs.push_back ( cfgs[i] + " MSVC Headers" ); - _cfgs.push_back ( cfgs[i] + " Wine Headers" ); - } - cfgs.resize(0); - cfgs = _cfgs; - } - - string default_cfg = cfgs.back(); + cfgs.push_back ( new MSVCConfiguration( Debug, WineHeaders )); + cfgs.push_back ( new MSVCConfiguration( Release, WineHeaders )); + cfgs.push_back ( new MSVCConfiguration( Speed, WineHeaders )); + } + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); @@ -248,18 +245,16 @@ fprintf ( OUT, "\t<Configurations>\r\n" ); for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) { - std::string& cfg = cfgs[icfg]; - - bool debug = strstr ( cfg.c_str(), "Debug" ) != NULL; - bool speed = strstr ( cfg.c_str(), "Speed" ) != NULL; - bool release = (!debug && !speed ); - - //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); + const MSVCConfiguration& cfg = *cfgs[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.c_str() ); - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.c_str() ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), _get_vc_dir().c_str (), cfg.name.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" ); @@ -272,7 +267,7 @@ fprintf ( OUT, "./;" ); for ( i = 0; i < includes.size(); i++ ) { - const string& include = includes[i]; + const std::string& include = includes[i]; if ( strcmp ( include.c_str(), "." ) ) { if ( multiple_includes ) @@ -283,6 +278,18 @@ multiple_includes = true; } } + if ( cfg.headers == WineHeaders ) + { + for ( i = 0; i < includes_wine.size(); i++ ) + { + const std::string& include = includes_wine[i]; + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + //include_string += " /I " + include; + multiple_includes = true; + } + } fprintf ( OUT, "\"\r\n" ); StringSet defines = common_defines; @@ -294,6 +301,15 @@ else { defines.insert ( "NDEBUG" ); + } + + if ( cfg.headers == MSVCHeaders ) + { + // this is a define in MinGW w32api, but not Microsoft's headers + defines.insert ( "STDCALL=__stdcall" ); + // MinGW doesn't have a safe-string library yet + defines.insert ( "_CRT_SECURE_NO_DEPRECATE" ); + defines.insert ( "_CRT_NON_CONFORMING_SWPRINTFS" ); } if ( lib || exe ) @@ -390,9 +406,7 @@ fprintf ( OUT, ";" ); string libpath = libraries[i].c_str(); - libpath.replace (libpath.find("---"), - 3, - cfg); + libpath.replace (libpath.find("---"), 3, cfg.name); libpath = libpath.substr (0, libpath.find_last_of ("\\") ); fprintf ( OUT, "%s", libpath.c_str() ); } @@ -457,9 +471,20 @@ fprintf ( OUT, "./;" ); for ( i = 0; i < includes.size(); i++ ) { - const string& include = includes[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 == WineHeaders ) + { + for ( i = 0; i < includes_wine.size(); i++ ) + { + const std::string& include = includes_wine[i]; if ( multiple_includes ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() ); @@ -500,14 +525,14 @@ for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) { - std::string& config = cfgs[iconfig]; + const MSVCConfiguration& config = *cfgs[iconfig]; if (( isrcfile == 0 ) && ( module.pch != NULL )) { /* little hack to speed up PCH */ fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); fprintf ( OUT, "\t\t\t\t\tName=\"" ); - fprintf ( OUT, config.c_str() ); + fprintf ( OUT, config.name.c_str() ); fprintf ( OUT, "|Win32\">\r\n" ); fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); @@ -520,7 +545,7 @@ { fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); fprintf ( OUT, "\t\t\t\t\tName=\"" ); - fprintf ( OUT, config.c_str() ); + fprintf ( OUT, config.name.c_str() ); fprintf ( OUT, "|Win32\">\r\n" ); fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); if (source_file.find(".idl") != string::npos)

1 0

[hpoussin] 22342: Add files to project only if the "If" condition is true.
by hpoussin＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: hpoussin Date: Tue Jun 13 21:39:17 2006 New Revision: 22342 URL: http://svn.reactos.ru/svn/reactos?rev=22342&view=rev Log: Add files to project only if the "If" condition is true. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Tue Jun 13 21:39:17 2006 @@ -116,6 +116,7 @@ void _get_object_files ( const Module& module, std::vector<std::string>& out ) const; void _install_files ( const std::string& vcdir, const std::string& config ); bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; + const Property* _lookup_property ( const Module& module, const std::string& name ) const; }; #endif // __MSVC_H__ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue Jun 13 21:39:17 2006 @@ -113,9 +113,15 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); - // TODO FIXME - refactor needed - we're discarding if conditions for ( i = 0; i < data.ifs.size(); i++ ) - ifs_list.push_back ( &data.ifs[i]->data ); + { + const Property* property = _lookup_property( module, data.ifs[i]->property ); + if ( property != NULL ) + { + if ( data.ifs[i]->value == property->value || data.ifs[i]->negated ) + ifs_list.push_back ( &data.ifs[i]->data ); + } + } const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { @@ -732,3 +738,23 @@ _generate_sln_footer ( OUT ); } +const Property* +MSVCBackend::_lookup_property ( const Module& module, const std::string& name ) const +{ + /* Check local values */ + for ( size_t i = 0; i < module.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check local if-ed properties? + for ( size_t i = 0; i < module.project.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.project.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check global if-ed properties? + return NULL; +}

1 0

[hpoussin] 22341: Fix formatting. No code change
by hpoussin＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: hpoussin Date: Tue Jun 13 21:37:27 2006 New Revision: 22341 URL: http://svn.reactos.ru/svn/reactos?rev=22341&view=rev Log: Fix formatting. No code change Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Tue Jun 13 21:37:27 2006 @@ -49,7 +49,7 @@ MSVCBackend::MSVCBackend(Project &project, - Configuration& configuration) : Backend(project, configuration) + Configuration& configuration) : Backend(project, configuration) { m_unitCount = 0; } @@ -379,25 +379,25 @@ bool MSVCBackend::_copy_file ( const std::string& inputname, const std::string& targetname ) const { - FILE * input = fopen ( inputname.c_str (), "rb" ); + FILE * input = fopen ( inputname.c_str (), "rb" ); if ( !input ) return false; - FILE * output = fopen ( targetname.c_str (), "wb+" ); - if ( !output ) - { + FILE * output = fopen ( targetname.c_str (), "wb+" ); + if ( !output ) + { + fclose ( input ); + return false; + } + + char buffer[256]; + int num_read; + while ( (num_read = fread( buffer, sizeof(char), 256, input) ) || !feof( input ) ) + fwrite( buffer, sizeof(char), num_read, output ); + fclose ( input ); - return false; - } - - char buffer[256]; - int num_read; - while ( (num_read = fread( buffer, sizeof(char), 256, input) ) || !feof( input ) ) - fwrite( buffer, sizeof(char), num_read, output ); - - fclose ( input ); - fclose ( output ); - return true; + fclose ( output ); + return true; } void Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue Jun 13 21:37:27 2006 @@ -124,7 +124,7 @@ if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); - else + else source_files.push_back ( file ); } const vector<Include*>& incs = data.includes; @@ -180,7 +180,7 @@ cfgs.push_back ( "Debug" ); cfgs.push_back ( "Release" ); - cfgs.push_back ( "Speed" ); + cfgs.push_back ( "Speed" ); if (!no_cpp) { @@ -277,7 +277,7 @@ multiple_includes = true; } } - fprintf ( OUT, "\"\r\n " ); + fprintf ( OUT, "\"\r\n" ); StringSet defines = common_defines; @@ -316,9 +316,9 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug? 1: 5 ); // 1=/MTd 5=/MT - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); if ( module.pch != NULL ) @@ -349,7 +349,7 @@ fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 0); // 2=__stdcall 0=__cdecl + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 0); // 2=__stdcall 0=__cdecl 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" ); @@ -382,7 +382,7 @@ { if ( i > 0 ) fprintf ( OUT, ";" ); - + string libpath = libraries[i].c_str(); libpath.replace (libpath.find("---"), 3, @@ -572,32 +572,33 @@ std::string MSVCBackend::_replace_str(std::string string1, const std::string &find_str, const std::string &replace_str) { - std::string::size_type pos = string1.find(find_str, 0); - int intLen = find_str.length(); - - while(std::string::npos != pos) - { - string1.replace(pos, intLen, replace_str); - pos = string1.find(find_str, intLen + pos); - } - - return string1; -} + std::string::size_type pos = string1.find(find_str, 0); + int intLen = find_str.length(); + + while(std::string::npos != pos) + { + string1.replace(pos, intLen, replace_str); + pos = string1.find(find_str, intLen + pos); + } + + return string1; +} std::string -MSVCBackend::_get_solution_verion ( void ) { - string version; - - if (configuration.VSProjectVersion.empty()) - configuration.VSProjectVersion = MS_VS_DEF_VERSION; - - if (configuration.VSProjectVersion == "7.00") +MSVCBackend::_get_solution_verion ( void ) +{ + string version; + + if (configuration.VSProjectVersion.empty()) + configuration.VSProjectVersion = MS_VS_DEF_VERSION; + + if (configuration.VSProjectVersion == "7.00") version = "7.00"; - if (configuration.VSProjectVersion == "7.10") + if (configuration.VSProjectVersion == "7.10") version = "8.00"; - if (configuration.VSProjectVersion == "8.00") + if (configuration.VSProjectVersion == "8.00") version = "9.00"; return version; @@ -631,9 +632,9 @@ void MSVCBackend::_generate_sln_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); - fprintf ( OUT, "# Visual Studio 2005\r\n" ); - fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); + fprintf ( OUT, "# Visual Studio 2005\r\n" ); + fprintf ( OUT, "\r\n" ); } @@ -648,7 +649,7 @@ { vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); - fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"{%s}\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); + fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); //FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies //NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead @@ -657,7 +658,7 @@ for ( size_t i = 0; i < libraries.size(); i++ ) { const Module& module = *libraries[i]->importedModule; - fprintf ( OUT, "\t\t{%s} = {%s}\r\n", module.guid.c_str(), module.guid.c_str() ); + fprintf ( OUT, "\t\t%s = %s\r\n", module.guid.c_str(), module.guid.c_str() ); } fprintf ( OUT, "\tEndProjectSection\r\n" ); } @@ -695,7 +696,7 @@ if (configuration.VSProjectVersion == "8.00") { fprintf ( OUT, "\tGlobalSection(SolutionProperties) = preSolution\r\n" ); - fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" ); + fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); } @@ -707,10 +708,10 @@ void MSVCBackend::_generate_sln_configurations ( FILE* OUT, std::string vcproj_guid ) { - fprintf ( OUT, "\t\t%s.Debug.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Debug.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Debug.Release.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Debug.Release.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Debug|Win32.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Debug|Win32.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Release|Win32.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Release|Win32.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() ); } void

1 0

[jimtabor] 22340: Adding future DefWnd calls to win32k.
by jimtabor＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: jimtabor Date: Tue Jun 13 19:13:02 2006 New Revision: 22340 URL: http://svn.reactos.ru/svn/reactos?rev=22340&view=rev Log: Adding future DefWnd calls to win32k. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/ntus… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Jun 13 19:13:02 2006 @@ -485,6 +485,8 @@ #define TWOPARAM_ROUTINE_GETSYSCOLORS 0x65 #define TWOPARAM_ROUTINE_SETSYSCOLORS 0x66 #define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 +#define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 +#define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 DWORD NTAPI NtUserCallTwoParam(

1 0

[ion] 22339: - Enable ROS_LEAN_AND_MEAN if you want 50% smaller binaries and a 20MB reduction in memory usage. - Create a new module type: exportdriver for drivers which also export files. Not supremely useful right now, but it helps us decrease compilation time of normal drivers by not running useless commands on them. Later we'll also strip out their export table. We can also make exportdrivers automatically read their .def file instead of specfiygone one.
by ion＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: ion Date: Tue Jun 13 08:50:14 2006 New Revision: 22339 URL: http://svn.reactos.ru/svn/reactos?rev=22339&view=rev Log: - Enable ROS_LEAN_AND_MEAN if you want 50% smaller binaries and a 20MB reduction in memory usage. - Create a new module type: exportdriver for drivers which also export files. Not supremely useful right now, but it helps us decrease compilation time of normal drivers by not running useless commands on them. Later we'll also strip out their export table. We can also make exportdrivers automatically read their .def file instead of specfiygone one. Modified: trunk/reactos/Makefile trunk/reactos/drivers/multimedia/ks/ks.rbuild trunk/reactos/drivers/multimedia/portcls/portcls.rbuild trunk/reactos/drivers/network/ndis/ndis.rbuild trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tdi/tdi.rbuild trunk/reactos/drivers/storage/class2/class2.rbuild trunk/reactos/drivers/storage/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/pciidex/pciidex.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/drivers/usb/usbd/usbd.rbuild trunk/reactos/drivers/usb/usbport/usbport.rbuild trunk/reactos/drivers/usb/usbstor/usbstor.rbuild trunk/reactos/drivers/video/videoprt/videoprt.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild 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 Modified: trunk/reactos/Makefile URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/Makefile?rev=22339&r1=22338… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Jun 13 08:50:14 2006 @@ -96,6 +96,12 @@ # can be either yes (to build non-symbol-stripped versions of executable # output files) or no (to not build non-symbol-stripped versions of # executable output files). The variable defaults to no. +# +# ROS_LEAN_AND_MEAN +# This variable controls if all binaries should be stripped out of useless +# data added by GCC/LD as well as of RSYM symbol data. Output binary size +# will go from 80 to 40MB, memory usage from 58 to 38MB and the install CD +# from 18 to 13MB. The variable defaults to no. # # ROS_RBUILDFLAGS # Pass parameters to rbuild. @@ -203,6 +209,7 @@ ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE) ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) ECHO_GENDIB =@echo $(QUOTE)[GENDIB] $@$(QUOTE) + ECHO_STRIP =@echo $(QUOTE)[STRIP] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR = @@ -231,6 +238,7 @@ ECHO_REGTESTS= ECHO_TEST = ECHO_GENDIB = + ECHO_STRIP = endif @@ -256,6 +264,7 @@ ar = $(Q)$(PREFIX)-ar objcopy = $(Q)$(PREFIX)-objcopy dlltool = $(Q)$(PREFIX)-dlltool + strip = $(Q)$(PREFIX)-strip windres = $(Q)$(PREFIX)-windres rm = $(Q)rm -f cp = $(Q)cp @@ -275,6 +284,7 @@ ar = $(Q)ar objcopy = $(Q)objcopy dlltool = $(Q)dlltool + strip = $(Q)strip windres = $(Q)windres rm = $(Q)rm -f cp = $(Q)cp @@ -293,6 +303,7 @@ ar = $(Q)ar objcopy = $(Q)objcopy dlltool = $(Q)dlltool + strip = $(Q)strip windres = $(Q)windres rm = $(Q)del /f /q cp = $(Q)copy /y Modified: trunk/reactos/drivers/multimedia/ks/ks.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/multimedia/ks/ks.rb… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/ks.rbuild (original) +++ trunk/reactos/drivers/multimedia/ks/ks.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" warnings="true"> +<module name="ks" type="exportdriver" installbase="system32/drivers" installname="ks.sys" warnings="true"> <include base="ks">.</include> <include base="ks">..</include> <importlibrary definition="ks.def" /> Modified: trunk/reactos/drivers/multimedia/portcls/portcls.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/multimedia/portcls/… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys"> +<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys"> <importlibrary definition="portcls.def" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/network/ndis/ndis.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.r… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.rbuild (original) +++ trunk/reactos/drivers/network/ndis/ndis.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys"> +<module name="ndis" type="exportdriver" installbase="system32/drivers" installname="ndis.sys"> <importlibrary definition="ndis.def"></importlibrary> <include base="ndis">include</include> <define name="NDIS_WRAPPER" /> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys"> +<module name="tcpip" type="exportdriver" installbase="system32/drivers" installname="tcpip.sys"> <importlibrary definition="tcpip.def"></importlibrary> <include base="tcpip">include</include> <include base="oskittcp">include</include> Modified: trunk/reactos/drivers/network/tdi/tdi.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tdi/tdi.rbu… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi.rbuild (original) +++ trunk/reactos/drivers/network/tdi/tdi.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="tdi" type="kernelmodedriver" installbase="system32/drivers" installname="tdi.sys"> +<module name="tdi" type="exportdriver" installbase="system32/drivers" installname="tdi.sys"> <importlibrary definition="misc/tdi.def"></importlibrary> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class2/class2.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/class2/clas… ============================================================================== --- trunk/reactos/drivers/storage/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class2/class2.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> +<module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap base="reactos" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> Modified: trunk/reactos/drivers/storage/diskdump/diskdump.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/diskdump/di… ============================================================================== --- trunk/reactos/drivers/storage/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/diskdump/diskdump.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> +<module name="diskdump" type="exportdriver" installbase="system32/drivers" installname="diskdump.sys"> <bootstrap base="reactos" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> Modified: trunk/reactos/drivers/storage/pciidex/pciidex.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/pciidex/pci… ============================================================================== --- trunk/reactos/drivers/storage/pciidex/pciidex.rbuild (original) +++ trunk/reactos/drivers/storage/pciidex/pciidex.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys"> +<module name="pciidex" type="exportdriver" installbase="system32/drivers" installname="pciidex.sys"> <importlibrary definition="pciidex.def" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/scsiport/sc… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> +<module name="scsiport" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap base="reactos" /> <define name="__USE_W32API" /> <define name="_SCSIPORT_" /> Modified: trunk/reactos/drivers/usb/usbd/usbd.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.rbuil… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.rbuild (original) +++ trunk/reactos/drivers/usb/usbd/usbd.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> +<module name="usbd" type="exportdriver" installbase="system32/drivers" installname="usbd.sys"> <importlibrary definition="usbd.def" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/usb/usbport/usbport.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbport/usbport… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.rbuild (original) +++ trunk/reactos/drivers/usb/usbport/usbport.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" installname="usbport.sys"> +<module name="usbport" type="exportdriver" installbase="system32/drivers" installname="usbport.sys"> <importlibrary definition="usbport.def" /> <define name="__USE_W32API" /> <library>sys_base</library> Modified: trunk/reactos/drivers/usb/usbstor/usbstor.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbstor… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.rbuild (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys" allowwarnings="true"> +<module name="usbstor" type="exportdriver" installbase="system32/drivers" installname="usbstor.sys" allowwarnings="true"> <define name="__USE_W32API" /> <define name="DEBUG_MODE" /> <include base="ntoskrnl">include</include> Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/videoprt/vide… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild Tue Jun 13 08:50:14 2006 @@ -1,4 +1,4 @@ -<module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys"> +<module name="videoprt" type="exportdriver" installbase="system32/drivers" installname="videoprt.sys"> <importlibrary definition="videoprt.def" /> <include base="videoprt">.</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/win… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Tue Jun 13 08:50:14 2006 @@ -154,7 +154,7 @@ </compilationunit> </directory> </module> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> +<module name="win32k" type="exportdriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> <importlibrary definition="win32k.def" /> <library>win32k_base</library> <library>pseh</library> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.ru/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 Tue Jun 13 08:50:14 2006 @@ -223,6 +223,7 @@ handler = new MingwWin32DLLModuleHandler ( module ); break; case KernelModeDriver: + case ExportDriver: // maybe change this later handler = new MingwKernelModeDriverModuleHandler ( module ); break; case BootLoader: @@ -1450,6 +1451,19 @@ } void +MingwModuleHandler::GenerateRunStripCode () const +{ + fprintf ( fMakefile, + "ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" ); + fprintf ( fMakefile, + "\t$(ECHO_STRIP)\n" ); + fprintf ( fMakefile, + "\t${strip} -sx $@\n\n" ); + fprintf ( fMakefile, + "endif\n" ); +} + +void MingwModuleHandler::GenerateLinkerCommand ( const string& dependencies, const string& linker, @@ -1521,19 +1535,18 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - - if ( pefixupParameters.length() != 0 ) - { - fprintf ( fMakefile, - "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", - target.c_str (), - pefixupParameters.c_str() ); - } + +#if 0 // causes crashes sometimes + fprintf ( fMakefile, + "\t${objcopy} -R .edata %s\n", + target.c_str () ); +#endif } GenerateBuildMapCode (); GenerateBuildNonSymbolStrippedCode (); GenerateRunRsymCode (); + GenerateRunStripCode (); GenerateCleanObjectsAsYouGoCode (); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.ru/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 Tue Jun 13 08:50:14 2006 @@ -112,6 +112,7 @@ std::string GetLinkerMacro () const; void GenerateCleanObjectsAsYouGoCode () const; void GenerateRunRsymCode () const; + void GenerateRunStripCode () const; void GenerateLinkerCommand ( const std::string& dependencies, const std::string& linker, const std::string& linkerParameters, Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Tue Jun 13 08:50:14 2006 @@ -43,6 +43,7 @@ { case Kernel: case KernelModeDLL: + case ExportDriver: case NativeDLL: case NativeCUI: case Win32DLL: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Jun 13 08:50:14 2006 @@ -731,6 +731,8 @@ return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; + if ( attribute.value == "exportdriver" ) + return ExportDriver; if ( attribute.value == "kernelmodedriver" ) return KernelModeDriver; if ( attribute.value == "nativedll" ) @@ -793,6 +795,7 @@ return ".dll"; case KernelModeDriver: case BootLoader: + case ExportDriver: return ".sys"; case BootSector: return ".o"; @@ -822,6 +825,8 @@ case Kernel: return "_NtProcessStartup"; case KernelModeDLL: + case KernelModeDriver: + case ExportDriver: return "_DriverEntry@8"; case NativeDLL: return "_DllMainCRTStartup@12"; @@ -841,8 +846,6 @@ return "_wWinMainCRTStartup"; else return "_WinMainCRTStartup"; - case KernelModeDriver: - return "_DriverEntry@8"; case BuildTool: case StaticLibrary: case ObjectLibrary: @@ -879,6 +882,7 @@ return "0x00400000"; case KernelModeDLL: case KernelModeDriver: + case ExportDriver: return "0x00010000"; case BuildTool: case StaticLibrary: @@ -910,10 +914,11 @@ { case Kernel: case KernelModeDLL: + case ExportDriver: case NativeDLL: case Win32DLL: + return true; case KernelModeDriver: - return true; case NativeCUI: case Win32CUI: case Test: @@ -943,6 +948,7 @@ { case Kernel: case KernelModeDLL: + case ExportDriver: case NativeDLL: case Win32DLL: case KernelModeDriver: @@ -1397,6 +1403,7 @@ return true; case Kernel: case KernelModeDLL: + case ExportDriver: case NativeDLL: case NativeCUI: case Win32CUI: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Jun 13 08:50:14 2006 @@ -264,7 +264,8 @@ RpcClient = 17, Alias = 18, BootProgram = 19, - Win32SCR = 20 + Win32SCR = 20, + ExportDriver = 21 }; enum HostType

1 0

[amunger] 22338: Remove packet size assert. Recent qemu slirp changes cause us to hit this assert. I could not find any evidence of the qemu changes causing linux or windows problems, so I removed the assert. Testing has yielded no issues with the assert removed. I'm leaving it in trunk for now, until it can be looked at closer.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:46:22 2006 New Revision: 22338 URL: http://svn.reactos.ru/svn/reactos?rev=22338&view=rev Log: Remove packet size assert. Recent qemu slirp changes cause us to hit this assert. I could not find any evidence of the qemu changes causing linux or windows problems, so I removed the assert. Testing has yielded no issues with the assert removed. I'm leaving it in trunk for now, until it can be looked at closer. Modified: branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c Modified: branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/drivers… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/tcpip/datalink/lan.c Tue Jun 13 07:46:22 2006 @@ -487,8 +487,6 @@ { if (NdisStatus == NDIS_STATUS_SUCCESS) { - ASSERT(PacketSize <= Adapter->MTU); - NdisTransferData(&NdisStatus, Adapter->NdisHandle, MacReceiveContext, 0, PacketSize, NdisPacket, &BytesTransferred);

1 0

[amunger] 22337: Merge 21896, per hpoussin.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:42:03 2006 New Revision: 22337 URL: http://svn.reactos.ru/svn/reactos?rev=22337&view=rev Log: Merge 21896, per hpoussin. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Tue Jun 13 07:42:03 2006 @@ -36,6 +36,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" +; The following line is only here to prevent the "New hardware wizard" to display a window for "Unknown device". +; This device comes from Root plug and play bus (ntoskrnl/io/pnproot.c) and this one should never appear +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\LEGACY_UNKNOWN\0000","ConfigFlags",0x00010001,0x00000040 ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" @@ -352,6 +355,7 @@ ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "Boot Bus Extender", \ + "System Bus Extender", \ "SCSI Port", \ "SCSI Miniport", \ "Primary Disk", \ @@ -379,6 +383,7 @@ ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Boot Bus Extender", 0x00000001, \ + 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x00000001, \ @@ -468,6 +473,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Tag",0x00010001,0x00000001 ; Beep device driver HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 @@ -554,13 +560,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; IDE driver (deprecated) -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Group",0x00000000,"Primary Disk" -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","ImagePath",0x00020000,"system32\drivers\ide.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Start",0x00010001,0x00000004 -;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x00000001 ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 @@ -642,6 +641,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Tag",0x00010001,0x00000002 ; ACPI bus HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x00010000,"*PNP0C08"

1 0

[amunger] 22336: Remove 21861, it causes a weird crash under qemu.
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:40:47 2006 New Revision: 22336 URL: http://svn.reactos.ru/svn/reactos?rev=22336&view=rev Log: Remove 21861, it causes a weird crash under qemu. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/shell32/shellpath.c Tue Jun 13 07:40:47 2006 @@ -804,7 +804,6 @@ static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -static const WCHAR szSHSetupFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'}; /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're * acting more Windows 9x-like for now. */ @@ -1769,8 +1768,6 @@ path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path); - else if (CSIDL_Data[folders[i]].type == CSIDL_Type_CurrVer) - _SHGetDefaultValue(folders[i], path); else hr = E_FAIL; if (*path) @@ -1881,21 +1878,6 @@ return hr; } -static HRESULT _SHRegisterSetupShellFolders(void) -{ - static const UINT folders[] = { - CSIDL_PROGRAM_FILES_COMMON, - CSIDL_PROGRAM_FILES, - }; - HRESULT hr; - - TRACE("\n"); - hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHSetupFolders, - szSHSetupFolders, folders, sizeof(folders) / sizeof(folders[0])); - TRACE("returning 0x%08lx\n", hr); - return hr; -} - /* Register the default values in the registry, as some apps seem to depend * on their presence. The set registered was taken from Windows XP. */ @@ -1907,8 +1889,6 @@ hr = _SHRegisterUserShellFolders(FALSE); if (SUCCEEDED(hr)) hr = _SHRegisterCommonShellFolders(); - if (SUCCEEDED(hr)) - hr = _SHRegisterSetupShellFolders(); return hr; }

1 0

[amunger] 22335: Merge 22283 to 0.3.0
by amunger＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: amunger Date: Tue Jun 13 07:35:48 2006 New Revision: 22335 URL: http://svn.reactos.ru/svn/reactos?rev=22335&view=rev Log: Merge 22283 to 0.3.0 Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/csrss/win32csr/conio.c Tue Jun 13 07:35:48 2006 @@ -613,13 +613,14 @@ i -= 2; /* if we already have something to return, just back it up by 2 */ } else - { /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */ + { + /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); - Request->Data.ReadConsoleRequest.NrCharactersRead = 0; - Request->Status = STATUS_NOTIFY_CLEANUP; - return STATUS_NOTIFY_CLEANUP; + Request->Data.ReadConsoleRequest.NrCharactersRead++; + Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; + return Request->Status; } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */

1 0

[turner] 22334: * When comparing two strings, you do not need to check what comes after them. * You do not need to look for the next space in the "command" to run on if success, that will be handled later on, and causes it to skip over to much if it done in both spots
by turner＠svn.reactos.org 13 Jun '06

13 Jun '06

Author: turner Date: Tue Jun 13 04:26:08 2006 New Revision: 22334 URL: http://svn.reactos.ru/svn/reactos?rev=22334&view=rev Log: * When comparing two strings, you do not need to check what comes after them. * You do not need to look for the next space in the "command" to run on if success, that will be handled later on, and causes it to skip over to much if it done in both spots Modified: trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=223… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Tue Jun 13 04:26:08 2006 @@ -177,15 +177,13 @@ while (_istspace (*pp)) /* Skip subsequent spaces */ pp++; - /* are the two sides equal, and does the second end in the same place? */ - if ( !_tcsncmp(param,pp,p1len) && _tcschr(_T(" ("),pp[p1len]) ) + /* are the two sides equal*/ + if ( !_tcsncmp(param,pp,p1len)) x_flag ^= X_EXEC; pp += p1len; if ( x_flag ) { - while (*pp && !_istspace (*pp)) /* Find first space, */ - pp++; x_flag |= X_EMPTY; } }

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
60
Older →

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 June 2006