Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32532: fix some memory leaks
by cwittich＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: cwittich Date: Fri Feb 29 15:53:26 2008 New Revision: 32532 URL: http://svn.reactos.org/svn/reactos?rev=32532&view=rev Log: fix some memory leaks Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Feb 29 15:53:26 2008 @@ -486,6 +486,10 @@ delete linkerScript; if ( pch ) delete pch; + if ( install ) + delete install; + if ( output ) + delete output; } void

1 0

[hpoussin] 32531: Remove parameters from GenerateLinkerCommand() ; they can be detected there Factorize some code in GenerateCommands()
by hpoussin＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: hpoussin Date: Fri Feb 29 15:45:34 2008 New Revision: 32531 URL: http://svn.reactos.org/svn/reactos?rev=32531&view=rev Log: Remove parameters from GenerateLinkerCommand() ; they can be detected there Factorize some code in GenerateCommands() Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 29 15:45:34 2008 @@ -334,7 +334,7 @@ string dependencies = backend->GetFullName ( *header ); delete header; - return dependencies; + return " " + dependencies; } else return ""; @@ -352,7 +352,7 @@ const File& file = *compilationUnit.GetFiles ()[i]; sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } - return v2s ( sourceFiles, 10 ); + return string ( " " ) + v2s ( sourceFiles, 10 ); } /* caller needs to delete the returned object */ @@ -1285,7 +1285,6 @@ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" @@ -1297,21 +1296,18 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" @@ -1347,8 +1343,7 @@ else flags = cflagsMacro; - if ( extraDependencies != "" ) - dependencies += " " + extraDependencies; + dependencies += extraDependencies; if ( pchFilename ) { dependencies += " " + backend->GetFullName ( *pchFilename ); @@ -1475,7 +1470,10 @@ if ( customRule ) customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files ); - if ( extension == ".c" || extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) + if ( extension == ".c" || extension == ".cc" || extension == ".cpp" || extension == ".cxx" || + extension == ".spec" || + ( extension == ".idl" && + ( module.type == RpcServer ) || ( module.type == RpcClient ) || ( module.type == RpcProxy ) ) ) { const FileLocation *objectFilename = GetObjectFilename ( &sourceFile, module ); @@ -1483,18 +1481,7 @@ delete objectFilename; GenerateGccCommand ( &sourceFile, - GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies ); - } - else if ( extension == ".spec" ) - { - GenerateGccCommand ( &sourceFile, - extraDependencies ); - } - else if ( extension == ".idl" && - ( module.type == RpcServer ) || ( module.type == RpcClient ) || ( module.type == RpcProxy ) ) - { - GenerateGccCommand ( &sourceFile, - GetExtraDependencies ( &sourceFile ) ); + GetCompilationUnitDependencies ( compilationUnit ) + GetExtraDependencies ( &sourceFile ) + extraDependencies ); } else if ( !customRule ) { @@ -1644,14 +1631,14 @@ void MingwModuleHandler::GenerateLinkerCommand ( const string& dependencies, - const string& linker, const string& linkerParameters, - const string& objectsMacro, - const string& libsMacro, const string& pefixupParameters ) { const FileLocation *target_file = GetTargetFilename ( module, NULL ); const FileLocation *definitionFilename = GetDefinitionFilename (); + string linker = module.cplusplus ? "${gpp}" : "${gcc}"; + string objectsMacro = GetObjectsMacro ( module ); + string libsMacro = GetLibsMacro (); string target_macro ( GetTargetMacro ( module ) ); string target_folder ( backend->GetFullPath ( *target_file ) ); @@ -2559,9 +2546,7 @@ { string targetMacro ( GetTargetMacro ( module ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2571,16 +2556,13 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", - module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (), - module.baseaddress.c_str () ); - + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", + module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (), + module.baseaddress.c_str () ); + GenerateLinkerCommand ( dependencies, - "${gcc}", - linkerParameters + " $(NTOSKRNL_SHARED)", - objectsMacro, - libsMacro, - "-sections" ); + linkerParameters + " $(NTOSKRNL_SHARED)", + "-sections" ); } else { @@ -2667,9 +2649,7 @@ { string targetMacro ( GetTargetMacro ( module ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2683,10 +2663,7 @@ module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - "${gcc}", linkerParameters, - objectsMacro, - libsMacro, "-sections" ); } else @@ -2721,9 +2698,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory (); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2737,10 +2712,7 @@ module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - "${gcc}", linkerParameters, - objectsMacro, - libsMacro, "-sections" ); } else @@ -2774,9 +2746,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2790,10 +2760,7 @@ module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - "${gcc}", linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -2827,9 +2794,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2843,10 +2808,7 @@ module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - "${gcc}", linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -2957,9 +2919,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2968,21 +2928,12 @@ GenerateRules (); string dependencies = linkDepsMacro + " " + objectsMacro; - - string linker; - if ( module.cplusplus ) - linker = "${gpp}"; - else - linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - linker, linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -3010,9 +2961,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -3021,21 +2970,12 @@ GenerateRules (); string dependencies = linkDepsMacro + " " + objectsMacro; - - string linker; - if ( module.cplusplus ) - linker = "${gpp}"; - else - linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - linker, linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -3070,9 +3010,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -3081,21 +3019,12 @@ GenerateRules (); string dependencies = linkDepsMacro + " " + objectsMacro; - - string linker; - if ( module.cplusplus ) - linker = "${gpp}"; - else - linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - linker, linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -3130,9 +3059,7 @@ { string targetMacro ( GetTargetMacro (module) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -3141,21 +3068,12 @@ GenerateRules (); string dependencies = linkDepsMacro + " " + objectsMacro; - - string linker; - if ( module.cplusplus ) - linker = "${gpp}"; - else - linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - linker, linkerParameters, - objectsMacro, - libsMacro, "" ); } else @@ -3761,9 +3679,7 @@ { string targetMacro ( GetTargetMacro ( module ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -3772,21 +3688,12 @@ GenerateRules (); string dependencies = linkDepsMacro + " " + objectsMacro; - - string linker; - if ( module.cplusplus ) - linker = "${gpp}"; - else - linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, - linker, linkerParameters, - objectsMacro, - libsMacro, "" ); } else Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Feb 29 15:45:34 2008 @@ -111,10 +111,7 @@ void GenerateRunRsymCode () const; void GenerateRunStripCode () const; void GenerateLinkerCommand ( const std::string& dependencies, - const std::string& linker, const std::string& linkerParameters, - const std::string& objectsMacro, - const std::string& libsMacro, const std::string& pefixupParameters ); void GeneratePhonyTarget() const; void GenerateBuildMapCode ( const FileLocation *mapTarget = NULL );

1 0

[cwittich] 32530: fix msvc build
by cwittich＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: cwittich Date: Fri Feb 29 15:24:56 2008 New Revision: 32530 URL: http://svn.reactos.org/svn/reactos?rev=32530&view=rev Log: fix msvc build Modified: trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Fri Feb 29 15:24:56 2008 @@ -423,6 +423,14 @@ /> </FileConfiguration> </File> + <File + RelativePath=".\backend\mingw\rule.cpp" + > + </File> + <File + RelativePath=".\backend\mingw\rule.h" + > + </File> </Filter> <Filter Name="backend_sources"

1 0

[hpoussin] 32529: GetObjectFilename() shouldn't be able to modify the list of generated files
by hpoussin＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: hpoussin Date: Fri Feb 29 15:10:07 2008 New Revision: 32529 URL: http://svn.reactos.org/svn/reactos?rev=32529&view=rev Log: GetObjectFilename() shouldn't be able to modify the list of generated files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 29 15:10:07 2008 @@ -280,7 +280,7 @@ string extension = GetExtension ( *file ); if ( extension == ".spec" || extension == ".SPEC" ) { - const FileLocation *objectFile = GetObjectFilename ( file, module, NULL ); + const FileLocation *objectFile = GetObjectFilename ( file, module ); FileLocation *sourceFile = new FileLocation ( objectFile->directory, objectFile->relative_path, @@ -291,7 +291,7 @@ else if ( ( extension == ".idl" || extension == ".IDL" ) && ( module.type == RpcServer || module.type == RpcClient || module.type == RpcProxy ) ) { - const FileLocation *objectFile = GetObjectFilename ( file, module, NULL ); + const FileLocation *objectFile = GetObjectFilename ( file, module ); FileLocation *sourceFile = new FileLocation ( objectFile->directory, objectFile->relative_path, @@ -301,7 +301,7 @@ } else if ( extension == ".mc" || extension == ".MC" ) { - const FileLocation *objectFile = GetObjectFilename ( file, module, NULL ); + const FileLocation *objectFile = GetObjectFilename ( file, module ); FileLocation *sourceFile = new FileLocation ( objectFile->directory, objectFile->relative_path, @@ -417,7 +417,7 @@ { CompilationUnit& compilationUnit = *compilationUnits[i]; const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( &compilationName, importedModule, NULL ); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, importedModule ); if ( GetExtension ( *objectFilename ) == ".h" ) dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); else if ( GetExtension ( *objectFilename ) == ".rc" ) @@ -529,8 +529,7 @@ const FileLocation* MingwModuleHandler::GetObjectFilename ( const FileLocation* sourceFile, - const Module& module, - string_list* pclean_files ) const + const Module& module ) const { DirectoryLocation destination_directory; string newExtension; @@ -567,12 +566,8 @@ destination_directory, sourceFile->relative_path, ReplaceExtension ( sourceFile->name, newExtension ) ); - - if ( pclean_files ) - { - string_list& clean_files = *pclean_files; - CLEAN_FILE ( *obj_file ); - } + PassThruCacheDirectory ( obj_file ); + return obj_file; } @@ -676,7 +671,7 @@ if ( objectFilenames.size () > 0 ) objectFilenames += " "; const FileLocation& compilationName = compilationUnits[i]->GetFilename (); - const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module ); objectFilenames += backend->GetFullName ( *object_file ); delete object_file; } @@ -1097,7 +1092,7 @@ if ( compilationUnit.IsFirstFile () ) { const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module ); fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), @@ -1117,7 +1112,7 @@ if ( !compilationUnit.IsFirstFile () ) { const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); else if ( GetExtension ( *objectFilename ) == ".rc" ) @@ -1227,7 +1222,7 @@ for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { const FileLocation& compilationName = sourceCompilationUnits[i]->GetFilename (); - const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module ); fprintf ( fMakefile, "%s += %s\n", @@ -1290,6 +1285,7 @@ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" @@ -1301,18 +1297,21 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" @@ -1363,13 +1362,12 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, module, NULL ); + sourceFile, module ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), backend->GetFullPath ( *objectFilename ).c_str () ); - CLEAN_FILE(*objectFilename); delete objectFilename; fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); @@ -1479,6 +1477,11 @@ if ( extension == ".c" || extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) { + const FileLocation *objectFilename = GetObjectFilename ( + &sourceFile, module ); + CLEAN_FILE ( *objectFilename ); + delete objectFilename; + GenerateGccCommand ( &sourceFile, GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies ); } @@ -1589,7 +1592,7 @@ { CompilationUnit& compilationUnit = *data.compilationUnits[i]; const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module ); objectFiles.push_back ( *object_file ); delete object_file; } @@ -1771,7 +1774,7 @@ { CompilationUnit& compilationUnit = *compilationUnits[i]; const FileLocation& compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module, NULL ); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module ); if ( GetExtension ( *objectFilename ) == ".h" ) moduleDependencies += ssprintf ( " $(%s_HEADERS)", module.name.c_str () ); else if ( GetExtension ( *objectFilename ) == ".rc" ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Feb 29 15:10:07 2008 @@ -97,8 +97,7 @@ bool includeGeneratedFiles ) const; void GetSourceFilenamesWithoutGeneratedFiles ( std::vector<FileLocation>& list ) const; const FileLocation* GetObjectFilename ( const FileLocation* sourceFile, - const Module& module, - string_list* pclean_files ) const; + const Module& module ) const; std::string GetObjectFilenames ();

1 0

[hpoussin] 32528: Prevent passing of useless parameters Decide how to compile a file at last moment, in GenerateGccCommand() Fix a memory leak
by hpoussin＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: hpoussin Date: Fri Feb 29 14:33:34 2008 New Revision: 32528 URL: http://svn.reactos.org/svn/reactos?rev=32528&view=rev Log: Prevent passing of useless parameters Decide how to compile a file at last moment, in GenerateGccCommand() Fix a memory leak Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 29 14:33:34 2008 @@ -855,7 +855,7 @@ if ( generatingCompilerMacro ) { - string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags , CompilerTypeDontCare ); + string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags, CompilerTypeDontCare ); if ( compilerParameters.size () > 0 ) { fprintf ( @@ -1249,6 +1249,12 @@ ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); } +Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule arRule2 ( "\t$(ECHO_AR)\n" + "\t${ar} -rc $@ $($(module_name)_OBJS)\n", + NULL ); Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) $(module_rbuild) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(module_name)_CFLAGS)\n", @@ -1316,18 +1322,39 @@ void MingwModuleHandler::GenerateGccCommand ( const FileLocation* sourceFile, - const string& extraDependencies, - const string& cc, - const string& cflagsMacro ) + const string& extraDependencies ) { const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); string dependencies = backend->GetFullName ( *generatedSourceFileName ); + delete generatedSourceFileName; + + string cc; + CompilerType type; + string extension = GetExtension ( *sourceFile ); + if ( extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) + { + cc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + type = CompilerTypeCPP; + } + else + { + cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); + type = CompilerTypeCC; + } + string flags = GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, type ); + if ( flags != "" ) + flags = cflagsMacro + " " + flags; + else + flags = cflagsMacro; if ( extraDependencies != "" ) dependencies += " " + extraDependencies; if ( pchFilename ) + { dependencies += " " + backend->GetFullName ( *pchFilename ); + delete pchFilename; + } /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; @@ -1336,22 +1363,20 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, module, &clean_files ); + sourceFile, module, NULL ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), backend->GetFullPath ( *objectFilename ).c_str () ); + CLEAN_FILE(*objectFilename); + delete objectFilename; + fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, "\t%s -c $< -o $@ %s\n", cc.c_str (), - cflagsMacro.c_str () ); - - delete objectFilename; - delete generatedSourceFileName; - if ( pchFilename ) - delete pchFilename; + flags.c_str () ); } string @@ -1409,13 +1434,7 @@ void MingwModuleHandler::GenerateCommands ( const CompilationUnit& compilationUnit, - const string& extraDependencies, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) + const string& extraDependencies ) { const FileLocation& sourceFile = compilationUnit.GetFilename (); string extension = GetExtension ( sourceFile ); @@ -1458,40 +1477,21 @@ if ( customRule ) customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files ); - string flags = cflagsMacro; - flags += " "; - if ( extension == ".c" ) - { - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCC ); + if ( extension == ".c" || extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) + { GenerateGccCommand ( &sourceFile, - GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, - cc, - flags ); - } - else if ( extension == ".cc" || - extension == ".cpp" || - extension == ".cxx" ) - { - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCPP ); + GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies ); + } + else if ( extension == ".spec" ) + { GenerateGccCommand ( &sourceFile, - GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, - cppc, - flags ); - } - else if ( extension == ".spec" ) + extraDependencies ); + } + else if ( extension == ".idl" && + ( module.type == RpcServer ) || ( module.type == RpcClient ) || ( module.type == RpcProxy ) ) { GenerateGccCommand ( &sourceFile, - extraDependencies, - cc, - cflagsMacro ); - } - else if ( extension == ".idl" && - (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) - { - GenerateGccCommand ( &sourceFile, - GetExtraDependencies ( &sourceFile ), - cc, - cflagsMacro ); + GetExtraDependencies ( &sourceFile ) ); } else if ( !customRule ) { @@ -1761,14 +1761,7 @@ } void -MingwModuleHandler::GenerateObjectFileTargets ( - const IfableData& data, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) +MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data ) { size_t i; string moduleDependencies; @@ -1789,13 +1782,7 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { GenerateCommands ( *compilationUnits[i], - moduleDependencies, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + moduleDependencies ); fprintf ( fMakefile, "\n" ); } @@ -1803,13 +1790,7 @@ const vector<If*>& ifs = data.ifs; for ( i = 0; i < ifs.size(); i++ ) { - GenerateObjectFileTargets ( ifs[i]->data, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets ( ifs[i]->data ); } vector<CompilationUnit*> sourceCompilationUnits; @@ -1817,37 +1798,24 @@ for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { GenerateCommands ( *sourceCompilationUnits[i], - moduleDependencies, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + moduleDependencies ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } void -MingwModuleHandler::GenerateObjectFileTargets ( - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) +MingwModuleHandler::GenerateObjectFileTargets () { const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); if ( pchFilename ) { + string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); + string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + const FileLocation& baseHeaderFile = module.pch->file; CLEAN_FILE ( *pchFilename ); string dependencies = backend->GetFullName ( baseHeaderFile ); - string flags = cflagsMacro; - CompilerType type = module.cplusplus ? CompilerTypeCPP : CompilerTypeCC; - flags += " "; - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , type ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); @@ -1862,33 +1830,22 @@ "\t%s -o %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - flags.c_str(), + cflagsMacro.c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; } - GenerateObjectFileTargets ( module.non_if_data, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets ( module.non_if_data ); fprintf ( fMakefile, "\n" ); } /* caller needs to delete the returned object */ const FileLocation* -MingwModuleHandler::GenerateArchiveTarget ( const string& ar, - const string& objs_macro ) const +MingwModuleHandler::GenerateArchiveTarget () { const FileLocation *archiveFilename = GetModuleArchiveFilename (); - fprintf ( fMakefile, - "%s: %s | %s\n", - backend->GetFullName ( *archiveFilename ).c_str (), - objs_macro.c_str (), - backend->GetFullPath ( *archiveFilename ).c_str() ); + arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); if ( module.type == StaticLibrary && module.importLibrary ) { @@ -1904,12 +1861,7 @@ delete definitionFilename; } - fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); - - fprintf ( fMakefile, - "\t%s -rc $@ %s\n", - ar.c_str (), - objs_macro.c_str ()); + arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); GenerateCleanObjectsAsYouGoCode (); @@ -2201,10 +2153,6 @@ void MingwModuleHandler::GenerateRules () { - string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); - string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); - string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" ); - string targetMacro = GetTargetMacro ( module ); //CLEAN_FILE ( targetMacro ); CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) ); @@ -2227,17 +2175,11 @@ if ( !ReferenceObjects ( module ) ) { - const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - CLEAN_FILE ( *ar_target ); + const FileLocation* ar_target = GenerateArchiveTarget (); delete ar_target; } - GenerateObjectFileTargets ( cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets (); } void Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Feb 29 14:33:34 2008 @@ -152,32 +152,12 @@ std::string GenerateNasmParameters () const; const FileLocation* GetPrecompiledHeaderFilename () const; void GenerateGccCommand ( const FileLocation* sourceFile, - const std::string& extraDependencies, - const std::string& cc, - const std::string& cflagsMacro ); + const std::string& extraDependencies ); void GenerateCommands ( const CompilationUnit& compilationUnit, - const std::string& extraDependencies, - const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - void GenerateObjectFileTargets ( const IfableData& data, - const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - void GenerateObjectFileTargets ( const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - const FileLocation* GenerateArchiveTarget ( const std::string& ar, - const std::string& objs_macro ) const; + const std::string& extraDependencies ); + void GenerateObjectFileTargets ( const IfableData& data ); + void GenerateObjectFileTargets (); + const FileLocation* GenerateArchiveTarget (); void GetMcObjectDependencies ( std::vector<FileLocation>& dependencies, const FileLocation *file ) const; void GetSpecObjectDependencies ( std::vector<FileLocation>& dependencies,

1 0

[fireball] 32527: - Fix memory corruption, thanks to Alex for reporting.
by fireball＠svn.reactos.org 29 Feb '08

29 Feb '08

Author: fireball Date: Fri Feb 29 12:43:36 2008 New Revision: 32527 URL: http://svn.reactos.org/svn/reactos?rev=32527&view=rev Log: - Fix memory corruption, thanks to Alex for reporting. Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Fri Feb 29 12:43:36 2008 @@ -88,6 +88,7 @@ /* All lists failed, use the pool */ List->L.FreeMisses++; ExFreePool(Packet); + return; } }

1 0

[fireball] 32526: Samuel Serapion <samcharly@hotmail.com> - Make the ext2 dbgprint not annoying.
by fireball＠svn.reactos.org 28 Feb '08

28 Feb '08

Author: fireball Date: Thu Feb 28 17:51:41 2008 New Revision: 32526 URL: http://svn.reactos.org/svn/reactos?rev=32526&view=rev Log: Samuel Serapion <samcharly(a)hotmail.com> - Make the ext2 dbgprint not annoying. Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Thu Feb 28 17:51:41 2008 @@ -185,15 +185,14 @@ { \ if( ( TYPE ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint(" "); \ + if( ( DEBUG_TRACE_LINENO ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ + { \ + DbgPrint("(%s:%ld) ", __FILE__, __LINE__ ); \ + } \ DbgPrint(X,Y); \ if( ( DEBUG_TRACE_IRQL ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint( " IRQL = %d ", KeGetCurrentIrql( ) ); \ - } \ - if( ( DEBUG_TRACE_LINENO ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ - { \ - DbgPrint( " [%s] Line No = %ld", __FILE__, __LINE__ ); \ + DbgPrint( ",IRQL = %d ", KeGetCurrentIrql( ) ); \ } \ DbgPrint("\n"); \ } \

1 0

[hpoussin] 32525: Use a generic .spec file, instead of a .def file per architecture
by hpoussin＠svn.reactos.org 28 Feb '08

28 Feb '08

Author: hpoussin Date: Thu Feb 28 17:13:07 2008 New Revision: 32525 URL: http://svn.reactos.org/svn/reactos?rev=32525&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/base/kdcom/kdcom.spec (with props) Removed: trunk/reactos/drivers/base/kdcom/kdcom_arm.def trunk/reactos/drivers/base/kdcom/kdcom_i386.def Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Thu Feb 28 17:13:07 2008 @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> - <importlibrary definition="kdcom_$(ARCH).def"></importlibrary> + <importlibrary definition="kdcom.spec.def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <library>ntoskrnl</library> <library>hal</library> <file>kdbg.c</file> + <file>kdcom.spec</file> </module> Added: trunk/reactos/drivers/base/kdcom/kdcom.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.s… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.spec (added) +++ trunk/reactos/drivers/base/kdcom/kdcom.spec Thu Feb 28 17:13:07 2008 @@ -1,0 +1,21 @@ +; Old KD +@ stdcall KdPortGetByte(ptr) +@ stdcall KdPortGetByteEx(ptr ptr) +@ stdcall KdPortInitialize(ptr long long) +@ stdcall KdPortInitializeEx(ptr long long) +@ stdcall KdPortPollByte(ptr) +@ stdcall KdPortPollByteEx(ptr ptr) +@ stdcall KdPortPutByte(long) +@ stdcall KdPortPutByteEx(ptr long) +@ stdcall KdPortRestore() +@ stdcall KdPortSave() +@ stdcall KdPortDisableInterrupts() +@ stdcall KdPortEnableInterrupts() + +; New KD +@ stdcall KdDebuggerInitialize0(ptr) +@ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdSave(long) +@ stdcall KdRestore(long) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdSendPacket(long ptr ptr ptr) Propchange: trunk/reactos/drivers/base/kdcom/kdcom.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/base/kdcom/kdcom_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom_a… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom_arm.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom_arm.def (removed) @@ -1,24 +1,0 @@ -LIBRARY kdcom.dll -EXPORTS - -; Old KD -KdPortGetByte -KdPortGetByteEx -KdPortInitialize -KdPortInitializeEx -KdPortPollByte -KdPortPollByteEx -KdPortPutByte -KdPortPutByteEx -KdPortRestore -KdPortSave -KdPortDisableInterrupts -KdPortEnableInterrupts - -; New KD -KdDebuggerInitialize0 -KdDebuggerInitialize1 -KdSave -KdRestore -KdReceivePacket -KdSendPacket Removed: trunk/reactos/drivers/base/kdcom/kdcom_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom_i… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom_i386.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom_i386.def (removed) @@ -1,24 +1,0 @@ -LIBRARY kdcom.dll -EXPORTS - -; Old KD -KdPortGetByte@4 -KdPortGetByteEx@8 -KdPortInitialize@12 -KdPortInitializeEx@12 -KdPortPollByte@4 -KdPortPollByteEx@8 -KdPortPutByte@4 -KdPortPutByteEx@8 -KdPortRestore@0 -KdPortSave@0 -KdPortDisableInterrupts@0 -KdPortEnableInterrupts@0 - -; New KD -KdDebuggerInitialize0@4 -KdDebuggerInitialize1@4 -KdSave@4 -KdRestore@4 -KdReceivePacket@20 -KdSendPacket@16

1 0

[fireball] 32524: - Fix coding style in some places.
by fireball＠svn.reactos.org 28 Feb '08

28 Feb '08

Author: fireball Date: Thu Feb 28 17:05:47 2008 New Revision: 32524 URL: http://svn.reactos.org/svn/reactos?rev=32524&view=rev Log: - Fix coding style in some places. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Feb 28 17:05:47 2008 @@ -160,6 +160,8 @@ { PUSHORT LdtDescriptor; ULONG LdtBase; + PULONG Pde; + PULONG PageDir; ULONG i, j; DPRINT("Mmi386ReleaseMmInfo(Process %x)\n",Process); @@ -176,9 +178,6 @@ ExFreePool((PVOID) LdtBase); } - - PULONG Pde; - PULONG PageDir; PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart)); for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) { @@ -250,6 +249,7 @@ NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[2]; + PULONG PageDirectory; DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); @@ -267,7 +267,6 @@ } } - PULONG PageDirectory; PageDirectory = MmCreateHyperspaceMapping(Pfn[0]); memcpy(PageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), @@ -317,6 +316,7 @@ PEPROCESS CurrentProcess = PsGetCurrentProcess(); ULONG i; PFN_TYPE Pfn; + PULONG PageTable; DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address); if (Process != NULL && Process != CurrentProcess) @@ -324,7 +324,6 @@ KeAttachProcess(&Process->Pcb); } - PULONG PageTable; PageTable = (PULONG)PAGE_ROUND_DOWN((PVOID)ADDR_TO_PTE(Address)); for (i = 0; i < 1024; i++) { @@ -564,11 +563,11 @@ { BOOLEAN WasValid = FALSE; PFN_TYPE Pfn; + ULONG Pte; + PULONG Pt; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", Process, Address, FreePage, WasDirty, Page); - ULONG Pte; - PULONG Pt; Pt = MmGetPageTableForProcess(Process, Address, FALSE); @@ -718,84 +717,85 @@ NTAPI MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) { - if (Address < MmSystemRangeStart && Process == NULL) - { - DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); - KEBUGCHECK(0); - } - + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); + + if (Pte & PA_ACCESSED) + { + MiFlushTlb(Pt, Address); + return TRUE; + } + else + { + MmUnmapPageTable(Pt); + return FALSE; + } +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmSetCleanPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); + + if (Pte & PA_DIRTY) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ PULONG Pt; ULONG Pte; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) - { - KEBUGCHECK(0); - } - - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); - - if (Pte & PA_ACCESSED) - { - MiFlushTlb(Pt, Address); - return TRUE; - } - else - { - MmUnmapPageTable(Pt); - return FALSE; - } -} - -VOID -NTAPI -MmSetCleanPage(PEPROCESS Process, PVOID Address) -{ - if (Address < MmSystemRangeStart && Process == NULL) - { - DPRINT1("MmSetCleanPage is called for user space without a process.\n"); - KEBUGCHECK(0); - } - - PULONG Pt; - ULONG Pte; - - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - - if (Pt == NULL) - { - KEBUGCHECK(0); - } - - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); - - if (Pte & PA_DIRTY) - { - MiFlushTlb(Pt, Address); - } - else - { - MmUnmapPageTable(Pt); - } -} - -VOID -NTAPI -MmSetDirtyPage(PEPROCESS Process, PVOID Address) -{ if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetDirtyPage is called for user space without a process.\n"); KEBUGCHECK(0); } - PULONG Pt; - ULONG Pte; Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) @@ -871,6 +871,8 @@ ULONG i; PVOID Addr; ULONG PdeOffset, oldPdeOffset; + PULONG Pt; + ULONG Pte; BOOLEAN NoExecute = FALSE; DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", @@ -894,9 +896,6 @@ } Addr = Address; - - PULONG Pt; - ULONG Pte; oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr); Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); @@ -948,6 +947,9 @@ PVOID Address, SWAPENTRY SwapEntry) { + PULONG Pt; + ULONG Pte; + if (Process == NULL && Address < MmSystemRangeStart) { DPRINT1("No process\n"); @@ -962,9 +964,6 @@ { KEBUGCHECK(0); } - - PULONG Pt; - ULONG Pte; Pt = MmGetPageTableForProcess(Process, Address, TRUE); if (Pt == NULL) @@ -1013,6 +1012,8 @@ PVOID Addr; ULONG i; ULONG oldPdeOffset, PdeOffset; + PULONG Pt = NULL; + ULONG Pte; BOOLEAN NoExecute = FALSE; DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", @@ -1068,9 +1069,6 @@ } Addr = Address; - - PULONG Pt = NULL; - ULONG Pte; oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr) + 1; for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE)) { @@ -1208,6 +1206,7 @@ { ULONG Attributes = 0; BOOLEAN NoExecute = FALSE; + PULONG Pt; DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", Process, Address, flProtect); @@ -1230,7 +1229,6 @@ { Attributes |= PA_USER; } - PULONG Pt; Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) @@ -1251,9 +1249,9 @@ */ { PHYSICAL_ADDRESS p; + ULONG Pte; DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr); - ULONG Pte; Pte = MmGetPageEntryForProcess(NULL, vaddr); if (Pte != 0 && Pte & PA_PRESENT) { @@ -1338,9 +1336,10 @@ MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) { PFN_TYPE Pfn; + ULONG Entry; + ASSERT (IS_HYPERSPACE(Address)); - ULONG Entry; Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn = PTE_TO_PFN(Entry); @@ -1353,9 +1352,10 @@ MmDeleteHyperspaceMapping(PVOID Address) { PFN_TYPE Pfn; + ULONG Entry; + ASSERT (IS_HYPERSPACE(Address)); - ULONG Entry; Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); Pfn = PTE_TO_PFN(Entry); @@ -1368,13 +1368,13 @@ MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) { ULONG StartOffset, EndOffset, Offset; + PULONG Pde; if (Address < MmSystemRangeStart) { KEBUGCHECK(0); } - PULONG Pde; StartOffset = ADDR_TO_PDE_OFFSET(Address); EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); @@ -1405,10 +1405,10 @@ MmInitGlobalKernelPageDirectory(VOID) { ULONG i; + PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; DPRINT("MmInitGlobalKernelPageDirectory()\n"); - PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) { if (i != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) &&

1 0

[fireball] 32523: - Remove duplicates, add STATUS_SUCCESS define (which gets commented out by wmc for now). - Add STATUS_WAIT_X and STATUS_INSUFFICIENT_RESOURCES codes.
by fireball＠svn.reactos.org 28 Feb '08

28 Feb '08

Author: fireball Date: Thu Feb 28 16:52:54 2008 New Revision: 32523 URL: http://svn.reactos.org/svn/reactos?rev=32523&view=rev Log: - Remove duplicates, add STATUS_SUCCESS define (which gets commented out by wmc for now). - Add STATUS_WAIT_X and STATUS_INSUFFICIENT_RESOURCES codes. Modified: trunk/reactos/dll/ntdll/def/ntstatus.mc Modified: trunk/reactos/dll/ntdll/def/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntstatus.mc?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntstatus.mc (original) +++ trunk/reactos/dll/ntdll/def/ntstatus.mc Thu Feb 28 16:52:54 2008 @@ -20,7 +20,39 @@ ) LanguageNames=(English=0x409:MSG00409) - +;#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) +MessageId=0x00 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_0 +Language=English +STATUS_WAIT_0 + +. +MessageId=0x01 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_1 +Language=English +STATUS_WAIT_1 + +. +MessageId=0x02 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_2 +Language=English +STATUS_WAIT_2 + +. +MessageId=0x03 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_3 +Language=English +STATUS_WAIT_3 + +. MessageId=0x80 Severity=Success Facility=System @@ -245,23 +277,6 @@ SymbolicName=STATUS_PROCESS_IN_JOB Language=English The specified process is part of a job. - -. -MessageId=0x125 -Severity=Success -Facility=System -SymbolicName=STATUS_SPECIAL_GROUP -Language=English -{Volume Shadow Copy Service} -The system is now ready for hibernation. - -. -MessageId=0x126 -Severity=Success -Facility=System -SymbolicName=STATUS_SPECIAL_USER -Language=English -A file system or file system filter driver has successfully completed an FsFilter operation. . MessageId=0x367 @@ -1870,6 +1885,14 @@ When a block of memory is allotted for future updates, such as the memory allocated to hold discretionary access control and primary group information, successive updates may exceed the amount of memory originally allotted. Since quota may already have been charged to several processes which have handles to the object, it is not reasonable to alter the size of the allocated memory. Instead, a request that requires more memory than has been allotted must fail and the STATUS_ALLOTED_SPACE_EXCEEDED error returned. + +. +MessageId=0x9a +Severity=Error +Facility=System +SymbolicName=STATUS_INSUFFICIENT_RESOURCES +Language=English +Insufficient system resources exist to complete this API. . MessageId=0x9c

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