Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44407: fix a debugprint
by tkreuzer＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: tkreuzer Date: Fri Dec 4 22:36:43 2009 New Revision: 44407 URL: http://svn.reactos.org/svn/reactos?rev=44407&view=rev Log: fix a debugprint Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Fri Dec 4 22:36:43 2009 @@ -726,7 +726,8 @@ LoaderBlock->NtBootPathName); } -// DPRINT1("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); + DPRINT("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n", + Pcr, Pcr->GdtBase, Pcr->IdtBase, Pcr->TssBase); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);

1 0

[gedmurphy] 44406: Start implementing Visual Studio 2010 support. This is seriously boring, don't expect it anytime soon :(
by gedmurphy＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: gedmurphy Date: Fri Dec 4 17:15:08 2009 New Revision: 44406 URL: http://svn.reactos.org/svn/reactos?rev=44406&view=rev Log: Start implementing Visual Studio 2010 support. This is seriously boring, don't expect it anytime soon :( 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/backend/msvc/vcxprojmaker.cpp trunk/reactos/tools/rbuild/rbuild.h 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] Fri Dec 4 17:15:08 2009 @@ -138,12 +138,16 @@ ProjMaker *projMaker; - string vcproj_file = VcprojFileName(module); - if (configuration.VSProjectVersion == "10.00") + { + string vcproj_file = VcprojFileName(module); projMaker = new VCXProjMaker( configuration, m_configurations, vcproj_file ); + } else - projMaker = new VCProjMaker( configuration, m_configurations, vcproj_file ); + { + string vcxproj_file = VcxprojFileName(module); + projMaker = new VCProjMaker( configuration, m_configurations, vcxproj_file ); + } projMaker->_generate_proj_file ( module ); delete projMaker; @@ -272,6 +276,14 @@ { return FixSeparatorForSystemCommand( ReplaceExtension ( module.output->relative_path + "\\" + module.name, "_" + _get_vc_dir() + "_auto.vcproj" ) + ); +} + +std::string +MSVCBackend::VcxprojFileName ( const Module& module ) const +{ + return FixSeparatorForSystemCommand( + ReplaceExtension ( module.output->relative_path + "\\" + module.name, "_" + _get_vc_dir() + "_auto.vcxproj" ) ); } 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] Fri Dec 4 17:15:08 2009 @@ -103,6 +103,7 @@ void OutputFileUnits(); std::string VcprojFileName ( const Module& module ) const; + std::string VcxprojFileName ( const Module& module ) const; std::string SlnFileName ( const Module& module ) const; std::string SuoFileName ( const Module& module ) const; std::string NcbFileName ( const Module& module ) const; 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] Fri Dec 4 17:15:08 2009 @@ -107,7 +107,7 @@ if ((computername != "") && (username != "")) vcproj_file_user = vcproj_file + "." + computername + "." + username + ".user"; - printf ( "Creating MSVC.NET project: '%s'\n", vcproj_file.c_str() ); + printf ( "Creating MSVC project: '%s'\n", vcproj_file.c_str() ); string path_basedir = module.GetPathToBaseDir (); string intenv = Environment::GetIntermediatePath (); Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp [iso-8859-1] Fri Dec 4 17:15:08 2009 @@ -75,8 +75,195 @@ void VCXProjMaker::_generate_proj_file ( const Module& module ) { - // TODO: Implement me - ProjMaker::_generate_proj_file ( module ); + size_t i; + + string computername; + string username; + + // 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" ); + if (getenv ( "COMPUTERNAME" ) != NULL) + computername = getenv ( "COMPUTERNAME" ); + else if (getenv ( "HOSTNAME" ) != NULL) + computername = getenv ( "HOSTNAME" ); + + string vcproj_file_user = ""; + + if ((computername != "") && (username != "")) + vcproj_file_user = vcproj_file + "." + computername + "." + username + ".user"; + + printf ( "Creating MSVC project: '%s'\n", vcproj_file.c_str() ); + + 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); + + // 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; + + string include_string; + + fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"utf-8\"?>\r\n" ); + fprintf ( OUT, "<Project " ); + fprintf ( OUT, "DefaultTargets=\"Build\" " ); //FIXME: what's Build?? + fprintf ( OUT, "ToolsVersion=\"4.0\" " ); //FIXME: Is it always 4.0?? + fprintf ( OUT, "xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\r\n" ); + + if (configuration.VSProjectVersion.empty()) + configuration.VSProjectVersion = "10.00"; + + // Write out the configurations + fprintf ( OUT, "\t<ItemGroup Label=\"ProjectConfigurations\">\r\n" ); + for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) + { + const MSVCConfiguration& cfg = *m_configurations[icfg]; + + if ( cfg.optimization == RosBuild ) + { + _generate_makefile_configuration( module, cfg ); + } + else + { + _generate_standard_configuration( module, cfg, binaryType ); + } + } + fprintf ( OUT, "\t</ItemGroup>\r\n" ); + + // Write out the global info + fprintf ( OUT, "\t<PropertyGroup Label=\"Globals\">\r\n" ); + fprintf ( OUT, "\t\t<ProjectGuid>{%s}</ProjectGuid>\r\n", module.guid.c_str() ); + fprintf ( OUT, "\t\t<Keyword>%s</Keyword>\r\n", "Win32Proj" ); //FIXME: Win32Proj??? + fprintf ( OUT, "\t\t<RootNamespace>%s</RootNamespace>\r\n", module.name.c_str() ); //FIXME: shouldn't this be the soltion name? + fprintf ( OUT, "\t</PropertyGroup>\r\n" ); + + + } void @@ -89,8 +276,10 @@ void VCXProjMaker::_generate_standard_configuration( const Module& module, const MSVCConfiguration& cfg, BinaryType binaryType ) { - // TODO: Implement me - ProjMaker::_generate_standard_configuration ( module, cfg, binaryType ); + fprintf ( OUT, "\t\t<ProjectConfiguration Include=\"%s|Win32\">\r\n", cfg.name.c_str() ); + fprintf ( OUT, "\t\t<Configuration>%s</Configuration>\r\n", cfg.name.c_str() ); + fprintf ( OUT, "\t\t<Platform>Win32</Platform>\r\n" ); + fprintf ( OUT, "\t</ProjectConfiguration>\r\n" ); } void Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Fri Dec 4 17:15:08 2009 @@ -68,7 +68,7 @@ #define DEF_SBAD_SEP "\\" #endif -#define MS_VS_DEF_VERSION "8.00" +#define MS_VS_DEF_VERSION "9.00" class XmlNode; class Directory;

1 0

[tkreuzer] 44405: Add some msr constants
by tkreuzer＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: tkreuzer Date: Fri Dec 4 16:50:55 2009 New Revision: 44405 URL: http://svn.reactos.org/svn/reactos?rev=44405&view=rev Log: Add some msr constants Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Dec 4 16:50:55 2009 @@ -41,10 +41,18 @@ #define X86_MSR_GSBASE 0xC0000101 #define X86_MSR_KERNEL_GSBASE 0xC0000102 +#define X86_MSR_EFER 0xC0000080 #define X86_MSR_STAR 0xC0000081 #define X86_MSR_LSTAR 0xC0000082 #define X86_MSR_CSTAR 0xC0000083 #define X86_MSR_SFMASK 0xC0000084 + +#define EFER_SCE 0x01 +#define EFER_LME 0x10 +#define EFER_LMA 0x40 +#define EFER_NXE 0x80 +#define EFER_SVME 0x100 +#define EFER_FFXSR 0x400 #define AMD64_TSS 9

1 0

[gedmurphy] 44404: Remove perf test code I accidentally committed
by gedmurphy＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: gedmurphy Date: Fri Dec 4 16:22:13 2009 New Revision: 44404 URL: http://svn.reactos.org/svn/reactos?rev=44404&view=rev Log: Remove perf test code I accidentally committed Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] Fri Dec 4 16:22:13 2009 @@ -388,8 +388,6 @@ if ( RootXmlFile.length () == 0 ) throw MissingArgumentException ( "-r" ); - DWORD start = GetTickCount(); - string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); @@ -404,9 +402,6 @@ project.ExecuteInvocations (); project.GetBackend().Process(); - DWORD end = GetTickCount(); - printf("time - %lu.%d\n", (end - start) / 1000, (end - start) % 1000); - return 0; } catch ( Exception& ex )

1 0

[gedmurphy] 44403: Remove the devcpp backend.
by gedmurphy＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: gedmurphy Date: Fri Dec 4 16:09:44 2009 New Revision: 44403 URL: http://svn.reactos.org/svn/reactos?rev=44403&view=rev Log: Remove the devcpp backend. Removed: trunk/reactos/tools/rbuild/backend/devcpp/ Modified: trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] Fri Dec 4 16:09:44 2009 @@ -388,6 +388,8 @@ if ( RootXmlFile.length () == 0 ) throw MissingArgumentException ( "-r" ); + DWORD start = GetTickCount(); + string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); @@ -402,6 +404,9 @@ project.ExecuteInvocations (); project.GetBackend().Process(); + DWORD end = GetTickCount(); + printf("time - %lu.%d\n", (end - start) / 1000, (end - start) % 1000); + return 0; } catch ( Exception& ex ) 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] Fri Dec 4 16:09:44 2009 @@ -84,24 +84,6 @@ ${mkdir} $@ endif - -RBUILD_DEVCPP_BASE = $(RBUILD_BACKEND_BASE_)devcpp -RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP) -RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE) -RBUILD_DEVCPP_INT_ = $(RBUILD_DEVCPP_INT)$(SEP) -RBUILD_DEVCPP_OUT = $(OUTPUT_)$(RBUILD_DEVCPP_BASE) -RBUILD_DEVCPP_OUT_ = $(RBUILD_DEVCPP_OUT)$(SEP) - -$(RBUILD_DEVCPP_INT): | $(RBUILD_BACKEND_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_DEVCPP_OUT): | $(RBUILD_BACKEND_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - RBUILD_CODEBLOCKS_BASE = $(RBUILD_BACKEND_BASE_)codeblocks RBUILD_CODEBLOCKS_BASE_ = $(RBUILD_CODEBLOCKS_BASE)$(SEP) RBUILD_CODEBLOCKS_INT = $(INTERMEDIATE_)$(RBUILD_CODEBLOCKS_BASE) @@ -202,10 +184,6 @@ mstools_detection.cpp \ proxymakefile.cpp \ rule.cpp \ - ) - -RBUILD_BACKEND_DEVCPP_BASE_SOURCES = $(addprefix $(RBUILD_DEVCPP_BASE_), \ - devcpp.cpp \ ) RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_), \ @@ -235,7 +213,6 @@ RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ - $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ @@ -276,9 +253,6 @@ RBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RBUILD_SOURCES:.cpp=.o)) -RBUILD_BACKEND_DEVCPP_HEADERS = \ - devcpp.h - RBUILD_BACKEND_MSVCCPP_HEADERS = \ msvc.h @@ -301,7 +275,6 @@ RBUILD_BACKEND_HEADERS = \ backend.h \ - $(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ @@ -496,10 +469,6 @@ $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT) - $(ECHO_HOSTCC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - $(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ 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] Fri Dec 4 16:09:44 2009 @@ -200,38 +200,6 @@ Name="backends" > <Filter - Name="devcpp" - > - <File - RelativePath="backend\devcpp\devcpp.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h" - > - </File> - </Filter> - <Filter Name="msvc" > <File

1 0

[tkreuzer] 44402: [MM] Rewrite MmAllocateSection to use system PTEs. Store the MDL pointer in the first PFN, to avoid allocating an additional PTE. Implement MmFreeSection. Now the bootdrivers go where they should go, freeing up lower system memory, and unloaded drivers actually get their memory freed (saving us 188 KB each boot).
by tkreuzer＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: tkreuzer Date: Fri Dec 4 14:06:00 2009 New Revision: 44402 URL: http://svn.reactos.org/svn/reactos?rev=44402&view=rev Log: [MM] Rewrite MmAllocateSection to use system PTEs. Store the MDL pointer in the first PFN, to avoid allocating an additional PTE. Implement MmFreeSection. Now the bootdrivers go where they should go, freeing up lower system memory, and unloaded drivers actually get their memory freed (saving us 188 KB each boot). Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Dec 4 14:06:00 2009 @@ -233,6 +233,7 @@ (PAGE_WRITECOPY | \ PAGE_EXECUTE_WRITECOPY) +#define MI_PFN_ELEMENT(Pfn) (&MmPfnDatabase[Pfn]) #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Dec 4 14:06:00 2009 @@ -48,6 +48,7 @@ #define NDEBUG #include <debug.h> #include <reactos/exeformat.h> +#include "ARM3/miarm.h" #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmCreatePhysicalMemorySection) @@ -4501,42 +4502,117 @@ PVOID NTAPI MmAllocateSection (IN ULONG Length, PVOID BaseAddress) { - PVOID Result; - MEMORY_AREA* marea; - NTSTATUS Status; - PMMSUPPORT AddressSpace; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - DPRINT("MmAllocateSection(Length %x)\n",Length); - - BoundaryAddressMultiple.QuadPart = 0; - - AddressSpace = MmGetKernelAddressSpace(); - Result = BaseAddress; - MmLockAddressSpace(AddressSpace); - Status = MmCreateMemoryArea (AddressSpace, - MEMORY_AREA_SYSTEM, - &Result, + PHYSICAL_ADDRESS LowAddress, HighAddress, SkipBytes; + PMDL Mdl; + PFN_COUNT PageCount; + PPFN_NUMBER MdlPages; + MMPTE TempPte, *PointerPte; + PMMPFN Pfn; + + /* Allocate an MDL */ + LowAddress.QuadPart = 0; + HighAddress.QuadPart = -1; + SkipBytes.QuadPart = 0; + Mdl = MiAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, Length, - 0, - &marea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(AddressSpace); - - if (!NT_SUCCESS(Status)) - { - return (NULL); - } - DPRINT("Result %p\n",Result); - - /* Create a virtual mapping for this memory area */ - MmMapMemoryArea(Result, Length, MC_NPPOOL, PAGE_READWRITE); - - return ((PVOID)Result); -} - + MiPlatformCacheAttributes[0][MmCached], + 0); // use MM_ALLOCATE_FULLY_REQUIRED + if (!Mdl) + { + /* Fail */ + return NULL; + } + + /* Check if we got all we need */ + if (Mdl->ByteCount < Length) + { + /* We didn't get enough */ + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); + return NULL; + } + + /* Calculate how many pages we should have */ + PageCount = BYTES_TO_PAGES(Length); + + /* Reserve system PTEs */ + PointerPte = MiReserveSystemPtes(PageCount, SystemPteSpace); + if (!PointerPte) + { + /* Free the MDL and fail */ + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); + return NULL; + } + + /* Safe the base address */ + BaseAddress = MiPteToAddress(PointerPte); + + /* Get a pointer to the page array */ + MdlPages = (PPFN_NUMBER)(Mdl + 1); + + /* Get the first page's PFN entry */ + Pfn = MI_PFN_ELEMENT(*MdlPages); + + /* Save the pointer to the MDL in the PFN entry */ + *(PMDL*)&Pfn->OriginalPte = Mdl; + + /* Setup template PTE */ + TempPte = HyperTemplatePte; + + /* Map the PTEs */ + do + { + /* Sanity checks */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(PointerPte->u.Soft.Transition == 0); + + /* Get the PFN */ + TempPte.u.Hard.PageFrameNumber = *MdlPages++; + + /* Write the PTE */ + *PointerPte++ = TempPte; + } while (--PageCount); + + /* Return the base address */ + return BaseAddress; +} + +VOID +NTAPI +MmFreeSection(PVOID BaseAddress) +{ + PMMPTE PointerPte; + PFN_NUMBER *MdlPages, PageFrameNumber, PageCount; + PMMPFN Pfn; + PMDL Mdl; + + /* Get a pointer to the first PTE */ + PointerPte = MiAddressToPte(BaseAddress); + + /* Get the page frame number of the first page */ + PageFrameNumber = PFN_FROM_PTE(PointerPte); + + /* Get the first pages's PFN entry */ + Pfn = MI_PFN_ELEMENT(PageFrameNumber); + + /* Get the MDL from the PFN */ + Mdl = *(PMDL*)&Pfn->OriginalPte; + *(PMDL*)&Pfn->OriginalPte = NULL; + + /* Get the page array and count from the MDL */ + MdlPages = (PPFN_NUMBER)(Mdl + 1); + PageCount = BYTES_TO_PAGES(Mdl->ByteCount); + + /* Release the system PTEs */ + MiReleaseSystemPtes(PointerPte, PageCount, SystemPteSpace); + + /* Free the pages and the MDL */ + MmFreePagesFromMdl(Mdl); + ExFreePool(Mdl); +} /********************************************************************** * NAME EXPORTED Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Fri Dec 4 14:06:00 2009 @@ -780,8 +780,8 @@ } } - /* FIXME: Free the driver */ - //MmFreeSection(LdrEntry->DllBase); + /* Free the driver */ + MmFreeSection(LdrEntry->DllBase); /* Check if we're linked in */ if (LdrEntry->InLoadOrderLinks.Flink)

1 0

[gedmurphy] 44401: - Don't listen to me, my 99.9% assurance that the new backend architecture wouldn't work was wrong. Who'd have thunk it?? - Remove the 'test' file name bug I put in to stop people overwriting their vcproj files. - Don't forget object cleanup Ged ... this isn't .NET. - 'make msvc#' is now working again.
by gedmurphy＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: gedmurphy Date: Fri Dec 4 12:33:17 2009 New Revision: 44401 URL: http://svn.reactos.org/svn/reactos?rev=44401&view=rev Log: - Don't listen to me, my 99.9% assurance that the new backend architecture wouldn't work was wrong. Who'd have thunk it?? - Remove the 'test' file name bug I put in to stop people overwriting their vcproj files. - Don't forget object cleanup Ged ... this isn't .NET. - 'make msvc#' is now working again. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 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] Fri Dec 4 12:33:17 2009 @@ -138,12 +138,15 @@ ProjMaker *projMaker; + string vcproj_file = VcprojFileName(module); + if (configuration.VSProjectVersion == "10.00") - projMaker = new VCXProjMaker( configuration, m_configurations, "test" ); + projMaker = new VCXProjMaker( configuration, m_configurations, vcproj_file ); else - projMaker = new VCProjMaker( configuration, m_configurations, "test" ); + projMaker = new VCProjMaker( configuration, m_configurations, vcproj_file ); projMaker->_generate_proj_file ( module ); + delete projMaker; } }

1 0

[mjmartin] 44400: [ntoskrnl/config] - CmpFindSubKeyByName: Remove the check for (Found) when checking if SubKey is valid as index can be 0.
by mjmartin＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: mjmartin Date: Fri Dec 4 09:11:59 2009 New Revision: 44400 URL: http://svn.reactos.org/svn/reactos?rev=44400&view=rev Log: [ntoskrnl/config] - CmpFindSubKeyByName: Remove the check for (Found) when checking if SubKey is valid as index can be 0. Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Fri Dec 4 09:11:59 2009 @@ -752,7 +752,7 @@ return HCELL_NIL; } - if ((Found) && (SubKey != HCELL_NIL)) + if (SubKey != HCELL_NIL) { HvReleaseCell(Hive, CellToRelease); return SubKey;

1 0

[dreimer] 44399: Get the Installer in shape again. Rename mingw32-make to make Explain in a better way that Powershell is default in Win7.
by dreimer＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: dreimer Date: Fri Dec 4 09:07:34 2009 New Revision: 44399 URL: http://svn.reactos.org/svn/reactos?rev=44399&view=rev Log: Get the Installer in shape again. Rename mingw32-make to make Explain in a better way that Powershell is default in Win7. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Fri Dec 4 09:07:34 2009 @@ -156,7 +156,7 @@ ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Components\Tools\mingw32-make.exe + File /r Components\Tools\make.exe File /r Components\Tools\libintl3.dll File /r Components\Tools\libiconv2.dll File /r Components\Tools\regex2.dll @@ -304,7 +304,7 @@ ${Endif} SectionEnd -Section "PowerShell/CMD RosBE Version" SEC11 +Section "PowerShell (XP, Vista) / CMD (win7) Version" SEC11 SetShellVarContext current ${If} $R4 = '6.1' SetOutPath "$INSTDIR"

1 0

[mjmartin] 44398: [kernel32] - GetProcessVersion: Assign ProcessHandle to NULL to prevent closing an invalid handle. Patch by Alexander Yastrebov. See #4967.
by mjmartin＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: mjmartin Date: Fri Dec 4 09:03:19 2009 New Revision: 44398 URL: http://svn.reactos.org/svn/reactos?rev=44398&view=rev Log: [kernel32] - GetProcessVersion: Assign ProcessHandle to NULL to prevent closing an invalid handle. Patch by Alexander Yastrebov. See #4967. Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Fri Dec 4 09:03:19 2009 @@ -794,7 +794,7 @@ IMAGE_DOS_HEADER DosHeader; PROCESS_BASIC_INFORMATION ProcessBasicInfo; PVOID BaseAddress = NULL; - HANDLE ProcessHandle; + HANDLE ProcessHandle = NULL; NTSTATUS Status; SIZE_T Count; PEB Peb;

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