Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 19466: Replace File by CompilationUnit
by chorns＠svn.reactos.com 22 Nov '05

22 Nov '05

Replace File by CompilationUnit Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/compilationunit.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -129,11 +129,11 @@ { Module &module = *ProjectNode.modules[i]; - for(size_t k = 0; k < module.non_if_data.files.size(); k++) + for(size_t k = 0; k < module.non_if_data.compilationUnits.size(); k++) { - File &file = *module.non_if_data.files[k]; - - ProcessFile(file.name); + CompilationUnit &compilationUnit = *module.non_if_data.compilationUnits[k]; + string filename = compilationUnit.GetFilename(); + ProcessFile(filename); } } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -388,13 +388,12 @@ { size_t i; - const vector<File*>& files = module.non_if_data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - if ( includeGeneratedFiles || !files[i]->IsGeneratedFile () ) + if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) { - list.push_back ( - GetActualSourceFilename ( files[i]->name ) ); + list.push_back ( GetActualSourceFilename ( compilationUnits[i]->GetFilename () ) ); } } // intentionally make a copy so that we can append more work in @@ -408,15 +407,12 @@ const vector<If*>& ifs = rIf.data.ifs; for ( j = 0; j < ifs.size (); j++ ) v.push_back ( ifs[j] ); - const vector<File*>& files = rIf.data.files; - for ( j = 0; j < files.size (); j++ ) + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) { - File& file = *files[j]; - if ( includeGeneratedFiles || !file.IsGeneratedFile () ) - { - list.push_back ( - GetActualSourceFilename ( file.name ) ); - } + CompilationUnit& compilationUnit = *compilationUnits[j]; + if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) + list.push_back ( GetActualSourceFilename ( compilationUnit.GetFilename () ) ); } } } @@ -545,17 +541,16 @@ string MingwModuleHandler::GetObjectFilenames () { - const vector<File*>& files = module.non_if_data.files; - if ( files.size () == 0 ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + if ( compilationUnits.size () == 0 ) return ""; string objectFilenames ( "" ); - for ( size_t i = 0; i < files.size (); i++ ) + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += - GetObjectFilename ( files[i]->name, NULL ); + objectFilenames += GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ); } return objectFilenames; } @@ -804,7 +799,7 @@ if ( rIf.data.defines.size() || rIf.data.includes.size() || rIf.data.libraries.size() - || rIf.data.files.size() + || rIf.data.compilationUnits.size() || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { @@ -826,14 +821,14 @@ } void -MingwModuleHandler::CleanupFileVector ( vector<File*>& sourceFiles ) +MingwModuleHandler::CleanupCompilationUnitVector ( vector<CompilationUnit*>& compilationUnits ) { - for (size_t i = 0; i < sourceFiles.size (); i++) - delete sourceFiles[i]; + for (size_t i = 0; i < compilationUnits.size (); i++) + delete compilationUnits[i]; } void -MingwModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +MingwModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { } @@ -845,19 +840,18 @@ { size_t i; - const vector<File*>& files = data.files; - if ( files.size () > 0 ) + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; + if ( compilationUnits.size () > 0 ) { - for ( i = 0; i < files.size (); i++ ) + for ( i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - if ( file.first ) + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( compilationUnit.IsFirstFile () ) { fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - GetObjectFilename ( - file.name, NULL ).c_str (), + GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str (), objectsMacro.c_str() ); } } @@ -866,17 +860,16 @@ "%s %s", objectsMacro.c_str (), assignmentOperation ); - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < compilationUnits.size(); i++ ) { - File& file = *files[i]; - if ( !file.first ) + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( !compilationUnit.IsFirstFile () ) { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - GetObjectFilename ( - file.name, NULL ).c_str () ); + GetObjectFilename ( compilationUnit.GetFilename (), NULL ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -889,7 +882,7 @@ if ( rIf.data.defines.size() || rIf.data.includes.size() || rIf.data.libraries.size() - || rIf.data.files.size() + || rIf.data.compilationUnits.size() || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { @@ -909,18 +902,17 @@ } } - vector<File*> sourceFiles; - GetModuleSpecificSourceFiles ( sourceFiles ); - for ( i = 0; i < sourceFiles.size (); i++ ) + vector<CompilationUnit*> sourceCompilationUnits; + GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); + for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), - GetObjectFilename ( - sourceFiles[i]->name, NULL ).c_str () ); + GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ).c_str () ); } - CleanupFileVector ( sourceFiles ); + CleanupCompilationUnitVector ( sourceCompilationUnits ); } string @@ -1104,9 +1096,9 @@ } string -MingwModuleHandler::GetWidlFlags ( const File& file ) +MingwModuleHandler::GetWidlFlags ( const CompilationUnit& compilationUnit ) { - return file.switches; + return compilationUnit.GetSwitches (); } string @@ -1118,13 +1110,14 @@ void MingwModuleHandler::GenerateWidlCommandsServer ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string dependencies = file.name; + string filename = compilationUnit.GetFilename (); + string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); string generatedHeaderFilename = GetRpcServerHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); @@ -1144,11 +1137,11 @@ fprintf ( fMakefile, "\t%s %s %s -h -H %s -s -S %s %s\n", "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( file ).c_str (), + GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), generatedHeaderFilename.c_str (), generatedServerFilename.c_str (), - file.name.c_str () ); + filename.c_str () ); } string @@ -1160,13 +1153,14 @@ void MingwModuleHandler::GenerateWidlCommandsClient ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - string dependencies = file.name; + string filename = compilationUnit.GetFilename (); + string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); string generatedHeaderFilename = GetRpcClientHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); @@ -1186,29 +1180,29 @@ fprintf ( fMakefile, "\t%s %s %s -h -H %s -c -C %s %s\n", "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( file ).c_str (), + GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), generatedHeaderFilename.c_str (), generatedClientFilename.c_str (), - file.name.c_str () ); + filename.c_str () ); } void MingwModuleHandler::GenerateWidlCommands ( - const File& file, + const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { if ( module.type == RpcServer ) - GenerateWidlCommandsServer ( file, + GenerateWidlCommandsServer ( compilationUnit, widlflagsMacro ); else - GenerateWidlCommandsClient ( file, + GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); } void MingwModuleHandler::GenerateCommands ( - const File& file, + const CompilationUnit& compilationUnit, const string& cc, const string& cppc, const string& cflagsMacro, @@ -1216,10 +1210,11 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - string extension = GetExtension ( file.name ); + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".c" || extension == ".C" ) { - GenerateGccCommand ( file.name, + GenerateGccCommand ( filename, "", cc, cflagsMacro ); @@ -1229,7 +1224,7 @@ extension == ".cpp" || extension == ".CPP" || extension == ".cxx" || extension == ".CXX" ) { - GenerateGccCommand ( file.name, + GenerateGccCommand ( filename, "", cppc, cflagsMacro ); @@ -1237,27 +1232,27 @@ } else if ( extension == ".s" || extension == ".S" ) { - GenerateGccAssemblerCommand ( file.name, + GenerateGccAssemblerCommand ( filename, cc, cflagsMacro ); return; } else if ( extension == ".asm" || extension == ".ASM" ) { - GenerateNasmCommand ( file.name, + GenerateNasmCommand ( filename, nasmflagsMacro ); return; } else if ( extension == ".rc" || extension == ".RC" ) { - GenerateWindresCommand ( file.name, + GenerateWindresCommand ( filename, windresflagsMacro ); return; } else if ( extension == ".spec" || extension == ".SPEC" ) { - GenerateWinebuildCommands ( file.name ); - GenerateGccCommand ( GetActualSourceFilename ( file.name ), + GenerateWinebuildCommands ( filename ); + GenerateGccCommand ( GetActualSourceFilename ( filename ), "", cc, cflagsMacro ); @@ -1265,10 +1260,10 @@ } else if ( extension == ".idl" || extension == ".IDL" ) { - GenerateWidlCommands ( file, + GenerateWidlCommands ( compilationUnit, widlflagsMacro ); - GenerateGccCommand ( GetActualSourceFilename ( file.name ), - GetExtraDependencies ( file.name ), + GenerateGccCommand ( GetActualSourceFilename ( filename ), + GetExtraDependencies ( filename ), cc, cflagsMacro ); return; @@ -1278,7 +1273,7 @@ __LINE__, "Unsupported filename extension '%s' in file '%s'", extension.c_str (), - file.name.c_str () ); + filename.c_str () ); } void @@ -1371,10 +1366,10 @@ MingwModuleHandler::GetObjectsVector ( const IfableData& data, vector<string>& objectFiles ) const { - for ( size_t i = 0; i < data.files.size (); i++ ) + for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { - File& file = *data.files[i]; - objectFiles.push_back ( GetObjectFilename ( file.name, NULL ) ); + CompilationUnit& compilationUnit = *data.compilationUnits[i]; + objectFiles.push_back ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ); } } @@ -1519,10 +1514,10 @@ { size_t i; - const vector<File*>& files = data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - GenerateCommands ( *files[i], + GenerateCommands ( *compilationUnits[i], cc, cppc, cflagsMacro, @@ -1545,11 +1540,11 @@ widlflagsMacro ); } - vector<File*> sourceFiles; - GetModuleSpecificSourceFiles ( sourceFiles ); - for ( i = 0; i < sourceFiles.size (); i++ ) + vector<CompilationUnit*> sourceCompilationUnits; + GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); + for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { - GenerateCommands ( *sourceFiles[i], + GenerateCommands ( *sourceCompilationUnits[i], cc, cppc, cflagsMacro, @@ -1557,7 +1552,7 @@ windresflagsMacro, widlflagsMacro ); } - CleanupFileVector ( sourceFiles ); + CleanupCompilationUnitVector ( sourceCompilationUnits ); } void @@ -1703,13 +1698,14 @@ if ( library.importedModule->type == RpcServer || library.importedModule->type == RpcClient ) { - for ( size_t j = 0; j < library.importedModule->non_if_data.files.size (); j++ ) + for ( size_t j = 0; j < library.importedModule->non_if_data.compilationUnits.size (); j++ ) { - File& file = *library.importedModule->non_if_data.files[j]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *library.importedModule->non_if_data.compilationUnits[j]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".idl" || extension == ".IDL" ) { - string basename = GetBasename ( file.name ); + string basename = GetBasename ( filename ); if ( library.importedModule->type == RpcServer ) dependencies.push_back ( GetRpcServerHeaderFilename ( basename ) ); if ( library.importedModule->type == RpcClient ) @@ -1739,13 +1735,14 @@ vector<string> s; if ( module.importLibrary ) { - const vector<File*>& files = module.non_if_data.files; - for ( size_t i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *compilationUnits[i]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( s, file.name ); + GetSpecObjectDependencies ( s, filename ); } } if ( s.size () > 0 ) @@ -2093,19 +2090,16 @@ string_list& dependencies ) const { string dkNkmLibNoFixup = "dk/nkm/lib"; - const vector<File*>& files = module.non_if_data.files; - for ( size_t i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( size_t i = 0; i < compilationUnits.size (); i++ ) { - File& file = *files[i]; - string extension = GetExtension ( file.name ); + CompilationUnit& compilationUnit = *compilationUnits[i]; + string filename = compilationUnit.GetFilename (); + string extension = GetExtension ( filename ); if ( extension == ".spec" || extension == ".SPEC" ) - { - GetSpecObjectDependencies ( dependencies, file.name ); - } + GetSpecObjectDependencies ( dependencies, filename ); if ( extension == ".idl" || extension == ".IDL" ) - { - GetWidlObjectDependencies ( dependencies, file.name ); - } + GetWidlObjectDependencies ( dependencies, filename ); } } @@ -2176,7 +2170,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2265,7 +2259,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2313,7 +2307,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2360,7 +2354,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2407,7 +2401,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2454,7 +2448,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2507,7 +2501,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -2560,7 +2554,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); @@ -3043,12 +3037,12 @@ } void -MingwTestModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { string basePath = "$(INTERMEDIATE)" + sSep + module.GetBasePath (); - sourceFiles.push_back ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + sSep + "_startup.c", false, "", false ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_startup.c", false, "", false ) ) ); } void @@ -3062,7 +3056,7 @@ GenerateImportLibraryTargetIfNeeded (); - if ( module.non_if_data.files.size () > 0 ) + if ( module.non_if_data.compilationUnits.size () > 0 ) { GenerateRules (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-22 14:23:17 UTC (rev 19466) @@ -81,7 +81,7 @@ void GenerateDependsTarget () const; static bool ReferenceObjects ( const Module& module ); protected: - virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); + virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; std::string GetActualSourceFilename ( const std::string& filename ) const; @@ -156,16 +156,16 @@ void GenerateWindresCommand ( const std::string& sourceFilename, const std::string& windresflagsMacro ); void GenerateWinebuildCommands ( const std::string& sourceFilename ); - std::string GetWidlFlags ( const File& file ); + std::string GetWidlFlags ( const CompilationUnit& compilationUnit ); void GenerateWidlCommandsServer ( - const File& file, + const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommandsClient ( - const File& file, + const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateWidlCommands ( const File& file, + void GenerateWidlCommands ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateCommands ( const File& file, + void GenerateCommands ( const CompilationUnit& compilationUnit, const std::string& cc, const std::string& cppc, const std::string& cflagsMacro, @@ -198,7 +198,7 @@ static std::string RemoveVariables ( std::string path); void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); - void CleanupFileVector ( std::vector<File*>& sourceFiles ); + void CleanupCompilationUnitVector ( std::vector<CompilationUnit*>& compilationUnits ); void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; @@ -420,7 +420,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); protected: - virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); + virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); private: void GenerateTestModuleTarget (); }; _____ Modified: trunk/reactos/tools/rbuild/compilationunit.cpp --- trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -23,9 +23,17 @@ using std::string; using std::vector; -CompilationUnit::CompilationUnit ( const Project& project, +CompilationUnit::CompilationUnit ( File* file ) + : project(NULL), + module(NULL), + node(NULL) +{ + files.push_back ( file ); +} + +CompilationUnit::CompilationUnit ( const Project* project, const Module* module, - const XMLElement& node ) + const XMLElement* node ) : project(project), module(module), node(node) @@ -34,9 +42,69 @@ CompilationUnit::~CompilationUnit () { + size_t i; + for ( i = 0; i < files.size (); i++ ) + delete files[i]; } void CompilationUnit::ProcessXML () { + size_t i; + for ( i = 0; i < files.size (); i++ ) + files[i]->ProcessXML (); } + +bool +CompilationUnit::IsGeneratedFile () const +{ + if ( files.size () != 1 ) + return false; + File* file = files[0]; + string extension = GetExtension ( file->name ); + return ( extension == ".spec" || extension == ".SPEC" ); +} + +bool +CompilationUnit::HasFileWithExtension ( const std::string& extension ) const +{ + size_t i; + for ( i = 0; i < files.size (); i++ ) + { + File& file = *files[i]; + string fileExtension = GetExtension ( file.name ); + if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) + return true; + } + return false; +} + +bool +CompilationUnit::IsFirstFile () const +{ + if ( files.size () == 0 || files.size () > 1 ) +{ +printf("fs:'%d'\n", files.size ()); + throw InvalidOperationException ( __FILE__, __LINE__ ); +} + File* file = files[0]; + return file->first; +} + +std::string +CompilationUnit::GetFilename () const +{ + if ( files.size () == 0 || files.size () > 1 ) + throw InvalidOperationException ( __FILE__, __LINE__ ); + File* file = files[0]; + return file->name; +} + +std::string +CompilationUnit::GetSwitches () const +{ + if ( files.size () == 0 || files.size () > 1 ) + throw InvalidOperationException ( __FILE__, __LINE__ ); + File* file = files[0]; + return file->switches; +} _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -182,8 +182,6 @@ IfableData::~IfableData() { size_t i; - for ( i = 0; i < files.size (); i++ ) - delete files[i]; for ( i = 0; i < includes.size (); i++ ) delete includes[i]; for ( i = 0; i < defines.size (); i++ ) @@ -203,8 +201,6 @@ void IfableData::ProcessXML () { size_t i; - for ( i = 0; i < files.size (); i++ ) - files[i]->ProcessXML (); for ( i = 0; i < includes.size (); i++ ) includes[i]->ProcessXML (); for ( i = 0; i < defines.size (); i++ ) @@ -478,12 +474,20 @@ first, switches, false ); + if ( parseContext.compilationUnit ) + parseContext.compilationUnit->files.push_back ( pFile ); + else + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( pFile ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + } if ( parseContext.ifData ) parseContext.ifData->data.files.push_back ( pFile ); else non_if_data.files.push_back ( pFile ); - if ( parseContext.compilationUnit ) - parseContext.compilationUnit->files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) @@ -623,7 +627,7 @@ } else if ( e.name == "compilationunit" ) { - CompilationUnit* pCompilationUnit = new CompilationUnit ( project, this, e ); + CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); if ( parseContext.ifData ) parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); else @@ -925,11 +929,10 @@ const std::string& extension ) const { size_t i; - for ( i = 0; i < data.files.size (); i++ ) + for ( i = 0; i < data.compilationUnits.size (); i++ ) { - File& file = *data.files[i]; - string file_ext = GetExtension ( file.name ); - if ( !stricmp ( file_ext.c_str (), extension.c_str () ) ) + CompilationUnit* compilationUnit = data.compilationUnits[i]; + if ( compilationUnit->HasFileWithExtension ( extension ) ) return true; } for ( i = 0; i < data.ifs.size (); i++ ) @@ -971,14 +974,7 @@ { } -bool -File::IsGeneratedFile () const -{ - string extension = GetExtension ( name ); - return ( extension == ".spec" || extension == ".SPEC" ); -} - Library::Library ( const XMLElement& _node, const Module& _module, const string& _name ) _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 14:23:17 UTC (rev 19466) @@ -353,7 +353,6 @@ bool _isPreCompiledHeader ); void ProcessXML(); - bool IsGeneratedFile () const; }; @@ -788,16 +787,22 @@ class CompilationUnit { public: - const Project& project; + const Project* project; const Module* module; - const XMLElement& node; + const XMLElement* node; std::vector<File*> files; - CompilationUnit ( const Project& project, + CompilationUnit ( File* file ); + CompilationUnit ( const Project* project, const Module* module, - const XMLElement& node ); + const XMLElement* node ); ~CompilationUnit (); void ProcessXML(); + bool IsGeneratedFile () const; + bool HasFileWithExtension ( const std::string& extension ) const; + bool IsFirstFile () const; + std::string GetFilename () const; + std::string GetSwitches () const; }; _____ Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -29,8 +29,14 @@ IS_TRUE ( module1.type == BuildTool ); ARE_EQUAL ( 2, module1.non_if_data.files.size()); + ARE_EQUAL ( "dir1" SSEP "file1.c", module1.non_if_data.files[0]->name ); + ARE_EQUAL ( "dir1" SSEP "file2.c", module1.non_if_data.files[1]->name ); + ARE_EQUAL ( 1, module1.non_if_data.compilationUnits.size () ); CompilationUnit& compilationUnit1 = *module1.non_if_data.compilationUnits[0]; ARE_EQUAL ( 2, compilationUnit1.files.size () ); + + ARE_EQUAL ( "dir1" SSEP "file1.c", compilationUnit1.files[0]->name ); + ARE_EQUAL ( "dir1" SSEP "file2.c", compilationUnit1.files[1]->name ); } _____ Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp --- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 14:07:34 UTC (rev 19465) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-11-22 14:23:17 UTC (rev 19466) @@ -294,11 +294,12 @@ { size_t i; - const vector<File*>& files = module.non_if_data.files; - for ( i = 0; i < files.size (); i++ ) + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + for ( i = 0; i < compilationUnits.size (); i++ ) { - if ( !files[i]->IsGeneratedFile () && IsTestFile ( files[i]->name ) ) - list.push_back ( files[i]->name ); + string filename = compilationUnits[i]->GetFilename(); + if ( !compilationUnits[i]->IsGeneratedFile () && IsTestFile ( filename ) ) + list.push_back ( filename ); } // intentionally make a copy so that we can append more work in // the middle of processing without having to go recursive @@ -311,14 +312,13 @@ const vector<If*>& ifs = rIf.data.ifs; for ( j = 0; j < ifs.size (); j++ ) v.push_back ( ifs[j] ); - const vector<File*>& files = rIf.data.files; - for ( j = 0; j < files.size (); j++ ) + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) { - File& file = *files[j]; - if ( !file.IsGeneratedFile () && IsTestFile ( file.name ) ) - { - list.push_back ( file.name ); - } + CompilationUnit& compilationUnit = *compilationUnits[j]; + string filename = compilationUnits[j]->GetFilename(); + if ( !compilationUnit.IsGeneratedFile () && IsTestFile ( filename ) ) + list.push_back ( filename ); } } }

1 0

[npwoods] 19465: Regedit: Favorites now appear in the favorites menu (though they are currently grayed out)
by npwoods＠svn.reactos.com 22 Nov '05

22 Nov '05

Regedit: Favorites now appear in the favorites menu (though they are currently grayed out) Modified: trunk/reactos/subsys/system/regedit/framewnd.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 11:20:01 UTC (rev 19464) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-22 14:07:34 UTC (rev 19465) @@ -72,6 +72,60 @@ /*********************************************************************** *********/ +static void OnInitMenu(HWND hWnd) +{ + LONG lResult; + HKEY hKey = NULL; + DWORD dwIndex, cbValueName, cbValueData, dwType; + TCHAR szValueName[256]; + BYTE abValueData[256]; + int nFavoriteMenuPos = 3; + static int s_nFavoriteMenuSubPos = -1; + HMENU hMenu; + BOOL bDisplayedAny = FALSE; + + /* Find Favorites menu and clear it out */ + hMenu = GetSubMenu(GetMenu(hWnd), nFavoriteMenuPos); + if (!hMenu) + goto done; + if (s_nFavoriteMenuSubPos < 0) + { + s_nFavoriteMenuSubPos = GetMenuItemCount(hMenu); + } + else + { + while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) + ; + } + + lResult = RegOpenKey(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favo rites"), &hKey); + if (lResult != ERROR_SUCCESS) + goto done; + + dwIndex = 0; + do + { + cbValueName = sizeof(szValueName) / sizeof(szValueName[0]); + cbValueData = sizeof(abValueData); + lResult = RegEnumValue(hKey, dwIndex, szValueName, &cbValueName, NULL, &dwType, abValueData, &cbValueData); + if ((lResult == ERROR_SUCCESS) && (dwType == REG_SZ)) + { + if (!bDisplayedAny) + { + AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); + bDisplayedAny = TRUE; + } + AppendMenu(hMenu, MF_GRAYED, 0, szValueName); + } + dwIndex++; + } + while(lResult == ERROR_SUCCESS); + +done: + if (hKey) + RegCloseKey(hKey); +} + static void OnEnterMenuLoop(HWND hWnd) { int nParts; @@ -941,6 +995,9 @@ break; case WM_TIMER: break; + case WM_INITMENU: + OnInitMenu(hWnd); + break; case WM_ENTERMENULOOP: OnEnterMenuLoop(hWnd); break;

1 0

[weiden] 19464: Fixed a bunch of uninitialized variable warnings. Dereferencing random pointers can't be a good idea, testing would've been great. The changes may not be correct, please review!
by weiden＠svn.reactos.com 22 Nov '05

22 Nov '05

Fixed a bunch of uninitialized variable warnings. Dereferencing random pointers can't be a good idea, testing would've been great. The changes may not be correct, please review! Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-22 10:24:14 UTC (rev 19463) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-22 11:20:01 UTC (rev 19464) @@ -79,8 +79,8 @@ static DWORD waveThread(LPVOID lpParameter) { - PWAVEALLOC pClient; - BOOL Terminate; + PWAVEALLOC pClient = (PWAVEALLOC)lpParameter; + BOOL Terminate = FALSE; SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL); SetEvent(pClient->AuxEvent2); @@ -305,7 +305,7 @@ static MMRESULT waveReadWrite(PWAVEALLOC pClient) { DWORD dwSize; - BOOL Result; + BOOL Result = FALSE; while (pClient->NextBuffer) @@ -549,7 +549,7 @@ BOOL Result; DWORD BytesReturned; LPWAVEFORMATEX pFormats; - PWAVEALLOC *pUserHandle; + PWAVEALLOC *pUserHandle = &pClient; HANDLE hDevice; pFormats = (LPWAVEFORMATEX)((LPWAVEOPENDESC)dwParam1)->lpFormat;

1 0

[hpoussin] 19463: Fix sublanguage IDs in .rc files:
by hpoussin＠svn.reactos.com 22 Nov '05

22 Nov '05

Fix sublanguage IDs in .rc files: - LANG_ENGLISH -> SUBLANG_ENGLISH_US - LANG_JAPANESE -> SUBLANG_DEFAULT - others -> SUBLANG_NEUTRAL I didn't change .rc files in files synched with Wine Modified: trunk/reactos/boot/freeldr/fdebug/En.rc Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Ja.rc Modified: trunk/reactos/lib/aclui/aclui_Nl.rc Modified: trunk/reactos/lib/aclui/aclui_Pl.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/avifil32/avifile_Cs.rc Modified: trunk/reactos/lib/avifil32/avifile_En.rc Modified: trunk/reactos/lib/avifil32/avifile_It.rc Modified: trunk/reactos/lib/avifil32/avifile_Nl.rc Modified: trunk/reactos/lib/avifil32/avifile_Pl.rc Modified: trunk/reactos/lib/avifil32/avifile_Pt.rc Modified: trunk/reactos/lib/avifil32/avifile_Ru.rc Modified: trunk/reactos/lib/avifil32/avifile_Si.rc Modified: trunk/reactos/lib/cpl/access/En.rc Modified: trunk/reactos/lib/cpl/access/Nl.rc Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc Modified: trunk/reactos/lib/cpl/appwiz/De.rc Modified: trunk/reactos/lib/cpl/appwiz/Dk.rc Modified: trunk/reactos/lib/cpl/appwiz/Nl.rc Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Modified: trunk/reactos/lib/cpl/control/Cz.rc Modified: trunk/reactos/lib/cpl/control/De.rc Modified: trunk/reactos/lib/cpl/control/Dk.rc Modified: trunk/reactos/lib/cpl/control/Nl.rc Modified: trunk/reactos/lib/cpl/control/Pl.rc Modified: trunk/reactos/lib/cpl/control/Ru.rc Modified: trunk/reactos/lib/cpl/control/Sv.rc Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/nl.rc Modified: trunk/reactos/lib/cpl/desk/pl.rc Modified: trunk/reactos/lib/cpl/desk/sv.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/nl.rc Modified: trunk/reactos/lib/cpl/intl/sv.rc Modified: trunk/reactos/lib/cpl/liccpa/En.rc Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/Nl.rc Modified: trunk/reactos/lib/cpl/ncpa/cz.rc Modified: trunk/reactos/lib/cpl/ncpa/de.rc Modified: trunk/reactos/lib/cpl/ncpa/dk.rc Modified: trunk/reactos/lib/cpl/ncpa/en.rc Modified: trunk/reactos/lib/cpl/ncpa/nl.rc Modified: trunk/reactos/lib/cpl/ncpa/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/cz.rc Modified: trunk/reactos/lib/cpl/sysdm/dk.rc Modified: trunk/reactos/lib/cpl/sysdm/en.rc Modified: trunk/reactos/lib/cpl/sysdm/fr.rc Modified: trunk/reactos/lib/cpl/sysdm/nl.rc Modified: trunk/reactos/lib/cpl/sysdm/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Modified: trunk/reactos/lib/cpl/timedate/Cz.rc Modified: trunk/reactos/lib/cpl/timedate/Dk.rc Modified: trunk/reactos/lib/cpl/timedate/En.rc Modified: trunk/reactos/lib/cpl/timedate/Fr.rc Modified: trunk/reactos/lib/cpl/timedate/Nl.rc Modified: trunk/reactos/lib/cpl/timedate/Pl.rc Modified: trunk/reactos/lib/cpl/timedate/Ru.rc Modified: trunk/reactos/lib/cpl/timedate/Sv.rc Modified: trunk/reactos/lib/devenum/devenum.rc Modified: trunk/reactos/lib/kernel32/locale_rc.rc Modified: trunk/reactos/lib/msacm/msacm_En.rc Modified: trunk/reactos/lib/msacm/msacm_Es.rc Modified: trunk/reactos/lib/msacm/msacm_It.rc Modified: trunk/reactos/lib/msacm/msacm_Ja.rc Modified: trunk/reactos/lib/msacm/msacm_Nl.rc Modified: trunk/reactos/lib/msacm/msacm_Pt.rc Modified: trunk/reactos/lib/msacm/msacm_Ru.rc Modified: trunk/reactos/lib/msacm/msacm_Sv.rc Modified: trunk/reactos/lib/msgina/msgina.rc Modified: trunk/reactos/lib/newdev/De.rc Modified: trunk/reactos/lib/setupapi/Bg.rc Modified: trunk/reactos/lib/setupapi/Cs.rc Modified: trunk/reactos/lib/setupapi/Da.rc Modified: trunk/reactos/lib/setupapi/De.rc Modified: trunk/reactos/lib/setupapi/Fi.rc Modified: trunk/reactos/lib/setupapi/It.rc Modified: trunk/reactos/lib/setupapi/Ja.rc Modified: trunk/reactos/lib/setupapi/Ko.rc Modified: trunk/reactos/lib/setupapi/Nl.rc Modified: trunk/reactos/lib/setupapi/Pl.rc Modified: trunk/reactos/lib/setupapi/Ru.rc Modified: trunk/reactos/lib/setupapi/Sv.rc Modified: trunk/reactos/lib/shellext/slayer/De.rc Modified: trunk/reactos/lib/shellext/slayer/En.rc Modified: trunk/reactos/lib/shellext/slayer/Nl.rc Modified: trunk/reactos/lib/shellext/slayer/Pl.rc Modified: trunk/reactos/lib/shellext/slayer/Ru.rc Modified: trunk/reactos/lib/shellext/slayer/Sv.rc Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc [truncated at 100 lines; 133 more skipped] _____ Modified: trunk/reactos/boot/freeldr/fdebug/En.rc --- trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 _____ Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc --- trunk/reactos/boot/freeldr/fdebug/Ja.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/Ja.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #pragma code_page(932) #endif //_WIN32 _____ Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc --- trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ // 2005 Emil Kaczmarek #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL #pragma code_page(1250) #endif //_WIN32 _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Ja.rc --- trunk/reactos/lib/aclui/aclui_Ja.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Ja.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Nl.rc --- trunk/reactos/lib/aclui/aclui_Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Pl.rc --- trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/avifil32/avifile_Cs.rc --- trunk/reactos/lib/avifil32/avifile_Cs.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Cs.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_En.rc --- trunk/reactos/lib/avifil32/avifile_En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_It.rc --- trunk/reactos/lib/avifil32/avifile_It.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_It.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Nl.rc --- trunk/reactos/lib/avifil32/avifile_Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Pl.rc --- trunk/reactos/lib/avifil32/avifile_Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Pt.rc --- trunk/reactos/lib/avifil32/avifile_Pt.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Pt.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Ru.rc --- trunk/reactos/lib/avifil32/avifile_Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/avifil32/avifile_Si.rc --- trunk/reactos/lib/avifil32/avifile_Si.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/avifil32/avifile_Si.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVENIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/access/En.rc --- trunk/reactos/lib/cpl/access/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/access/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDI_CPLACCESS ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/access/Nl.rc --- trunk/reactos/lib/cpl/access/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/access/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDI_CPLACCESS ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc --- trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/De.rc --- trunk/reactos/lib/cpl/appwiz/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Dk.rc --- trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Nl.rc --- trunk/reactos/lib/cpl/appwiz/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc --- trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -11,7 +11,7 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDI_CPLSYSTEM ICON "resources/applet.ico" _____ Modified: trunk/reactos/lib/cpl/control/Cz.rc --- trunk/reactos/lib/cpl/control/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Czech language resource file (potapnik, 2005-04-30) -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/De.rc --- trunk/reactos/lib/cpl/control/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // German language resource file (frik85, 2005-03-08) -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Dk.rc --- trunk/reactos/lib/cpl/control/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Danish language resource file (Thomas Larsen, 2005-03-11) -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Nl.rc --- trunk/reactos/lib/cpl/control/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Dutch language resource file (frik85, 2005-03-08) -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/lib/cpl/control/Pl.rc --- trunk/reactos/lib/cpl/control/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-06) -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Ru.rc --- trunk/reactos/lib/cpl/control/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Russian language resource file (unC0Rr, 2005-03-11) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Sv.rc --- trunk/reactos/lib/cpl/control/Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/control/Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Swedish resources by Andreas Bjerkeholt 2005-04-28 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc --- trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -9,7 +9,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/nl.rc --- trunk/reactos/lib/cpl/desk/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/pl.rc --- trunk/reactos/lib/cpl/desk/pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,5 +1,5 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-07) -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,7 +1,7 @@ /* Swedish resources by David Nordenberg Updated 2005-07-09 by Andreas Bjerkeholt */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/nl.rc --- trunk/reactos/lib/cpl/intl/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* $Id$ */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/sv.rc --- trunk/reactos/lib/cpl/intl/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/intl/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,7 +1,7 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ /* Swedish resources by Andreas Bjerkeholt (harteex(a)gmail.com) */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/liccpa/En.rc --- trunk/reactos/lib/cpl/liccpa/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/liccpa/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/De.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/main/Nl.rc --- trunk/reactos/lib/cpl/main/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/main/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/cz.rc --- trunk/reactos/lib/cpl/ncpa/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/de.rc --- trunk/reactos/lib/cpl/ncpa/de.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/de.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/dk.rc --- trunk/reactos/lib/cpl/ncpa/dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/en.rc --- trunk/reactos/lib/cpl/ncpa/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/nl.rc --- trunk/reactos/lib/cpl/ncpa/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/sv.rc --- trunk/reactos/lib/cpl/ncpa/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/ncpa/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ /* Swedish resources by Kris "Wacko" Engeman */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/cz.rc --- trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/dk.rc --- trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/en.rc --- trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/en.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/fr.rc --- trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/fr.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_DEVMGR ICON "resources/devmgr.ico" _____ Modified: trunk/reactos/lib/cpl/sysdm/nl.rc --- trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ //Swedish resources by Kris Engeman 2005-04-28 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -5,7 +5,7 @@ #include <commctrl.h> #include "resource.h" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Applet\0" _____ Modified: trunk/reactos/lib/cpl/timedate/Cz.rc --- trunk/reactos/lib/cpl/timedate/Cz.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Cz.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Dk.rc --- trunk/reactos/lib/cpl/timedate/Dk.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Dk.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 149 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/En.rc --- trunk/reactos/lib/cpl/timedate/En.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/En.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Fr.rc --- trunk/reactos/lib/cpl/timedate/Fr.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Fr.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Nl.rc --- trunk/reactos/lib/cpl/timedate/Nl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Nl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Pl.rc --- trunk/reactos/lib/cpl/timedate/Pl.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Pl.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,6 +1,6 @@ // Polish translation by Sebastian Gasiorek -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Ru.rc --- trunk/reactos/lib/cpl/timedate/Ru.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Ru.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/timedate/Sv.rc --- trunk/reactos/lib/cpl/timedate/Sv.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/cpl/timedate/Sv.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -3,7 +3,7 @@ * */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/devenum/devenum.rc --- trunk/reactos/lib/devenum/devenum.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/devenum/devenum.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -34,7 +34,7 @@ #include "wine/wine_common_ver.rc" STRINGTABLE DISCARDABLE -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US { 7 "Default DirectSound" 8 "DirectSound: %s" @@ -43,7 +43,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { 7 "Standard DirectSound" 8 "DirectSound: %s" @@ -52,7 +52,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { 7 "DirectSound di Default" 8 "DirectSound: %s" @@ -61,7 +61,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { 7 "DirectSound padrÒo" 8 "DirectSound: %s" @@ -70,7 +70,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { 7 "DirectSound por defecto" 8 "DirectSound: %s" _____ Modified: trunk/reactos/lib/kernel32/locale_rc.rc --- trunk/reactos/lib/kernel32/locale_rc.rc 2005-11-22 09:53:00 UTC (rev 19462) +++ trunk/reactos/lib/kernel32/locale_rc.rc 2005-11-22 10:24:14 UTC (rev 19463) @@ -46,9 +46,9 @@ #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ #endif -#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ +#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_NEUTRAL */ -#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ +#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_NEUTRAL */ #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ @@ -56,9 +56,9 @@ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ //#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ -#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ +#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_NEUTRAL */ -#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ +#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_NEUTRAL */ #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ @@ -66,7 +66,7 @@ #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ -#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ +#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_NEUTRAL */ #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ @@ -103,7 +103,7 @@ #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ -#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ +#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_NEUTRAL */ #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ @@ -112,16 +112,16 @@ #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ -#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ +#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_NEUTRAL */ -#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ +#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_NEUTRAL */ -#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ +#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_NEUTRAL */ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ +//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ //#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ @@ -131,104 +131,104 @@ #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ -#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ +#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_NEUTRAL */ #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ -#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ +#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_NEUTRAL */ -#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ +#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_NEUTRAL */ -#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ +#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_NEUTRAL */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ -#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ +#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_NEUTRAL */ -#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ +#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_NEUTRAL */ #include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ -#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ +#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_NEUTRAL */ -#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ +#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_NEUTRAL */ //#include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ -#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ +#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_NEUTRAL */ -#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ +#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_NEUTRAL */ -#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ +#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_NEUTRAL */ -#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ +#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_NEUTRAL */ -#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ +#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_NEUTRAL */ -#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ +#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_NEUTRAL */ //#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -//#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ +//#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_NEUTRAL */ -//#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ +//#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ -//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ +//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ //#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ //#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ -#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ +#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_NEUTRAL */ -#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ +#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_NEUTRAL */ -#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ +#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_NEUTRAL */ -//#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ +//#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_NEUTRAL */ -#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ +#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_NEUTRAL */ -//#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ +//#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_NEUTRAL */ #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -//#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ +//#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_NEUTRAL */ -//#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ +//#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_NEUTRAL */ -#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ +#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_NEUTRAL */ //#include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -//#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +//#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_NEUTRAL */ -//#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ +//#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_NEUTRAL */ -//#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ +//#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_NEUTRAL */ -//#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ +//#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_NEUTRAL */ -//#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ +//#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_NEUTRAL */ -//#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ +//#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_NEUTRAL */ -//#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ +//#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_NEUTRAL */ -//#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ +//#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_NEUTRAL */ -//#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ +//#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_NEUTRAL */ -#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ [truncated at 1000 lines; 2099 more skipped]

1 0

[ion] 19462: Fix boot regression.
by ion＠svn.reactos.com 22 Nov '05

22 Nov '05

Fix boot regression. Modified: trunk/reactos/ntoskrnl/mm/process.c _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-11-22 08:26:06 UTC (rev 19461) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-11-22 09:53:00 UTC (rev 19462) @@ -201,16 +201,12 @@ NTSTATUS Status; KAFFINITY ProcessAffinityMask = 0; SectionOffset.QuadPart = (ULONGLONG)0; - DPRINT("MmCreatePeb\n"); /* Allocate the PEB */ - Peb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS); - if (Peb != MM_HIGHEST_VAD_ADDRESS) - { - DPRINT1("MiCreatePebOrTeb() returned %x\n", Peb); - return STATUS_UNSUCCESSFUL; - } + Peb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + ASSERT(Peb == (PVOID)0x7FFDF000) /* Map NLS Tables */ DPRINT("Mapping NLS\n"); @@ -348,7 +344,8 @@ } /* Allocate the TEB */ - Teb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS); + Teb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); /* Initialize the PEB */ RtlZeroMemory(Teb, sizeof(TEB));

1 0

[hpoussin] 19461: Fix French translation
by hpoussin＠svn.reactos.com 22 Nov '05

22 Nov '05

Fix French translation Modified: trunk/reactos/lib/userenv/Fr.rc _____ Modified: trunk/reactos/lib/userenv/Fr.rc --- trunk/reactos/lib/userenv/Fr.rc 2005-11-22 08:25:35 UTC (rev 19460) +++ trunk/reactos/lib/userenv/Fr.rc 2005-11-22 08:26:06 UTC (rev 19461) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Eric Kohl + * Copyright (C) 2005 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 @@ -16,33 +16,32 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Dossiers et Arrangements" - IDS_APPDATA "DonnÚes Applications" + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" IDS_DESKTOP "Bureau" - IDS_FAVORITES "Favorits" - IDS_STARTMENU "DÚmarrer" - IDS_PROGRAMS "DÚmarrer\\Programmes" - IDS_ADMINTOOLS "DÚmarrer\\Programmes\\Outils Administrative" - IDS_STARTUP "DÚmarrer\\Programmes\\DÚmarrage" - IDS_MYDOCUMENTS "Mes Documents" - IDS_MYPICTURES "Mes Documents\\Mes Photos" - IDS_MYMUSIC "Mes Documents\\Ma Musique" - IDS_MYVIDEOS "Mes Documents\\Mes VidÚos" - IDS_TEMPLATES "Calibres" - IDS_RECENT "RecÚnements" - IDS_SENDTO "Envoyer?" - IDS_PRINTHOOD "ImprimezHood" - IDS_NETHOOD "NetHood" - IDS_LOCALSETTINGS "Arrangements Local" - IDS_LOCALAPPDATA "Arrangements Local\\DonnÚes Application" - IDS_TEMP "Arrangements Local\\Temporaire" - IDS_CACHE "Arrangements Local\\Dossiers Internet Temporaire" - IDS_HISTORY "Arrangements Local\\Histoire" - IDS_COOKIES "Biscuits" - IDS_PROGRAMFILES "%SystemDrive%\\Programme Dossiers" + IDS_FAVORITES "Favoris" + IDS_STARTMENU "Menu DÚmarrer" + IDS_PROGRAMS "Menu DÚmarrer\\Programmes" + IDS_ADMINTOOLS "Menu DÚmarrer\\Programmes\\Outils d'administration" + IDS_STARTUP "Menu DÚmarrer\\Programmes\\DÚmarrage" + IDS_MYDOCUMENTS "Mes documents" + IDS_MYPICTURES "Mes documents\\Mes photos" + IDS_MYMUSIC "Mes documents\\Ma musique" + IDS_MYVIDEOS "Mes documents\\Mes vidÚos" + IDS_TEMPLATES "ModÞles" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "Voisinage d'impression" + IDS_NETHOOD "Voisinage rÚseau" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\Historique" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" END -

1 0

[sedwards] 19460: porting fixes
by sedwards＠svn.reactos.com 22 Nov '05

22 Nov '05

porting fixes Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c --- trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-11-22 08:21:42 UTC (rev 19459) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-11-22 08:25:35 UTC (rev 19460) @@ -16,17 +16,15 @@ #define DHCP_TIMEOUT 1000 -#define EXPORT __declspec(dllexport) WINAPI - -DWORD EXPORT DhcpCApiInitialize(LPDWORD Version) { +DWORD APIENTRY DhcpCApiInitialize(LPDWORD Version) { *Version = 2; return 0; } -VOID EXPORT DhcpCApiCleanup() { +VOID APIENTRY DhcpCApiCleanup() { } -DWORD EXPORT DhcpQueryHWInfo( DWORD AdapterIndex, +DWORD APIENTRY DhcpQueryHWInfo( DWORD AdapterIndex, PDWORD MediaType, PDWORD Mtu, PDWORD Speed ) { @@ -51,7 +49,7 @@ } } -DWORD EXPORT DhcpLeaseIpAddress( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpLeaseIpAddress( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -67,7 +65,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -83,7 +81,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpRenewIpAddressLease( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpRenewIpAddressLease( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -99,7 +97,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpStaticRefreshParams( DWORD AdapterIndex, +DWORD APIENTRY DhcpStaticRefreshParams( DWORD AdapterIndex, DWORD Address, DWORD Netmask ) { COMM_DHCP_REQ Req;

1 0

[ion] 19459: - I wish svn delete would..delete the file -before- committing to that testing before a commit would actually be useful. Fix wdmguid.c build
by ion＠svn.reactos.com 22 Nov '05

22 Nov '05

- I wish svn delete would..delete the file -before- committing to that testing before a commit would actually be useful. Fix wdmguid.c build - Update NDK text files. Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/lib/wdmguid/wdmguid.c _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-22 08:21:42 UTC (rev 19459) @@ -1,8 +1,135 @@ Complete list of NDK Fixmes before 1.0 Release (Nov 25th 2005) -------------------------------------------------------------- +_______________________________________________________________________ _______________ +[CRITICAL] - Breaking compatibility with official structures. +|pstypes.h - EPROCESS has ReactOS only fields. Includes ReactOS Internal header. +|pstypes.h - W32_CALLOUT_DATA has ReactOS only fields. +|obtypes.h - Object callbacks are ReactOS only definitions. +|obtypes.h - Object Header includes ReactOS only type. +|mmtypes.h - _MADDRESS_SPACE is ReactOS only field. +|ketypes.h - _KPROFILE needs to be updated with new definitions. +|ketypes.h - _KINTERRUPT needs to be verified with new definitions. +|haltypes.h - Loader Parameter Block is ReactOS Version, not NT. +| +[MAJOR] - Using incorrect, missing, or invalid names or definitions. +|i386/ketypes.h - _KTRAP_FRAME definition is broken. +|i386/ketypes.h - _KTSSNOIOPM is not an official type. +|rtltypes.h - PPF_ Defines don't seem to be the real names (try to find them). +|rtltypes.h - _RTL_PROCESS_BACKTRACE_INFORMATION isn't done. +|haltypes.h - Multi-Boot flags are ReactOS Only. +|extypes.h - SystemPowerInformation in SYSTEM_INFORMATION_CLASS causes conflict. +|extypes.h - _RUNDOWN_DESCRIPTOR is possibly incorrect/unofficial. +|asm.h - Selector names are not official. +|extypes.h - Class 42 (SYSTEM_POWER_INFORMATION causes conflict). +|extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. +| +[MINOR] - Related to location of functions, comments, etc. +|arch/ketypes.h - _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there. +|zwfuncs.h - APIs are not organized. +|pstypes.h - Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead. +|lpctypes.h - Consider moving _HARDERROR_MSG to extypes.h? +|lpctypes.h - Consider moving _CLIENT_DIED_MSG to pstypes.h? +|ketypes.h - Consider moving KNODE to mmtypes.h? +|ketypes.h - Consider moving NtBuildNumber to extypes.h? +|extypes.h - consider moving PORT_ALL_ACCESS to lpctypes.h +|GENERIC - Make sure that all files can be included in standalone! +|______________________________________________________________________ _______________ List of ReactOS Applications compiling with the NDK +(verify, fix, and optimize their usage) -------------------------------------------------------------- - +apps\utils\ps\ps.c: #include <ndk/ntndk.h> +drivers\dd\blue\blue.c: #include <ndk/halfuncs.h> +drivers\dd\bootvid\bootvid.c: #include <ndk/ldrfuncs.h> +drivers\storage\diskdump\diskdump.c: #include <ndk/extypes.h> +drivers\storage\diskdump\diskdump.c: #include <ndk/rtlfuncs.h> +hal\hal\hal.c: #include <ndk/halfuncs.h> +hal\hal\hal.c: #include <ndk/kdfuncs.h> +lib\crt\except\unwind.c: #include <ndk/umtypes.h> +lib\crt\except\unwind.c: #include <ndk/extypes.h> +lib\crt\except\unwind.c: #include <ndk/rtlfuncs.h> +lib\dnsapi\dnsapi\stubs.c: #include <ndk/ntndk.h> +lib\epsapi\enum\drivers.c: #include <ndk/ntndk.h> +lib\epsapi\enum\modules.c: #include <ndk/ntndk.h> +lib\epsapi\enum\processes.c: #include <ndk/ntndk.h> +lib\lsasrv\lsaport.c: #include <ndk/ntndk.h> +lib\lsasrv\lsasrv.c: #include <ndk/ntndk.h> +lib\nt\entry_point.c: #include <ndk/ntndk.h> +lib\samlib\samlib.c: #include <ndk/ntndk.h> +lib\samsrv\samsrv.c: #include <ndk/ntndk.h> +lib\smdll\query.c: #include <ndk/ntndk.h> +lib\string\mbstowcs.c: #include <ndk/umtypes.h> +lib\string\mbstowcs.c: #include <ndk/rtlfuncs.h> +lib\string\sscanf.c: #include <ndk/umtypes.h> +lib\string\sscanf.c: #include <ndk/rtlfuncs.h> +lib\string\wcstombs.c: #include <ndk/umtypes.h> +lib\string\wcstombs.c: #include <ndk/rtlfuncs.h> +lib\syssetup\install.c: #include <ndk/ntndk.h> +lib\syssetup\logfile.c: #include <ndk/ntndk.h> +lib\wdmguid\wdmguid.c: #include <ndk/sysguid.h> +regtests\shared\regtests.c: #include <ndk/ntndk.h> +services\umpnpmgr\umpnpmgr.c: #include <ndk/ntndk.h> +subsys\csr\main.c: #include <ndk/ntndk.h> +subsys\ntvdm\ntvdm.c: #include <ndk/ntndk.h> +subsys\system\autochk\autochk.c: #include <ndk/ntndk.h> +subsys\system\lsass\lsass.c: #include <ndk/ntndk.h> +subsys\system\setup\setup.c: #include <ndk/ntndk.h> +subsys\system\sm\sm.c: #include <ndk/ntndk.h> +boot\freeldr\freeldr\include\freeldr.h: #include <ndk/ntndk.h> +drivers\fs\ms\msfs.h: #include <ndk/ntndk.h> +drivers\fs\np\npfs.h: #include <ndk/iotypes.h> +drivers\fs\vfat\vfat.h: #include <ndk/ntndk.h> +drivers\net\ndis\include\ndissys.h: #include <ndk/ntndk.h> +drivers\net\tcpip\include\precomp.h: #include <ndk/ntndk.h> +drivers\video\miniport\xboxvmp\xboxvmp.h: #include <ndk/ntndk.h> +drivers\video\videoprt\videoprt.h: #include <ndk/ntndk.h> +hal\halx86\include\hal.h: #include <ndk/ntndk.h> +include\drivers\diskdump\diskdump.h: #include <ndk/ntndk.h> +lib\advapi32\advapi32.h: #include <ndk/ntndk.h> +lib\crt\precomp.h: #include <ndk/ntndk.h> +lib\dbghelp\stackframe.h: #include <ndk/umtypes.h> +lib\dbghelp\stackframe.h: #include <ndk/extypes.h> +lib\dbghelp\stackframe.h: #include <ndk/rtlfuncs.h> +lib\dnsapi\dnsapi\precomp.h: #include <ndk/ntndk.h> +lib\fmifs\precomp.h: #include <ndk/ntndk.h> +lib\fslib\vfatlib\vfatlib.h: #include <ndk/ntndk.h> +lib\fslib\vfatxlib\vfatxlib.h: #include <ndk/ntndk.h> +lib\gdi32\include\precomp.h: #include <ndk/ntndk.h> +lib\imagehlp\precomp.h: #include <ndk/umtypes.h> +lib\imagehlp\precomp.h: #include <ndk/rtlfuncs.h> +lib\iphlpapi\iphlpapi_private.h: #include <ndk/ntndk.h> +lib\kernel32\k32.h: #include <ndk/ntndk.h> +lib\msafd\msafd.h: #include <ndk/ntndk.h> +lib\ntdll\inc\ntdll.h: #include <ndk/ntndk.h> +lib\opengl32\teb.h: #include <ndk/ntndk.h> +lib\psapi\precomp.h: #include <ndk/ntndk.h> +lib\rtl\rtl.h: #include <ndk/ntndk.h> +lib\secur32\precomp.h: #include <ndk/ntndk.h> +lib\setupapi\setupapi_private.h: #include <ndk/ntndk.h> +lib\smlib\precomp.h: #include <ndk/ntndk.h> +lib\user32\include\user32.h: #include <ndk/ntndk.h> +lib\userenv\precomp.h: #include <ndk/ntndk.h> +lib\ws2help\ws2help.h: #include <ndk/ntndk.h> +lib\ws2_32\include\ws2_32.h: #include <ndk/ntndk.h> +lib\wshirda\wshirda.h: #include <ndk/ntndk.h> +ntoskrnl\include\ntoskrnl.h: #include <ndk/ntndk.h> +ntoskrnl\include\internal\napi.h: #include <ndk/asm.h> +services\dhcp\include\rosdhcp.h: #include <ndk/ntndk.h> +services\eventlog\eventlog.h: #include <ndk/ntndk.h> +services\rpcss\rpcss.h: #include <ndk/ntndk.h> +subsys\csr\csrsrv\srv.h: #include <ndk/ntndk.h> +subsys\csrss\csrss.h: #include <ndk/ntndk.h> +subsys\csrss\include\api.h: #include <ndk/ntndk.h> +subsys\csrss\win32csr\w32csr.h: #include <ndk/ntndk.h> +subsys\smss\smss.h: #include <ndk/ntndk.h> +subsys\system\cmd\precomp.h: #include <ndk/ntndk.h> +subsys\system\services\services.h: #include <ndk/ntndk.h> +subsys\system\taskmgr\precomp.h: #include <ndk/ntndk.h> +subsys\system\usetup\usetup.h: #include <ndk/ntndk.h> +subsys\system\winlogon\winlogon.h: #include <ndk/ntndk.h> +subsys\win\basesrv\basesrv.h: #include <ndk/ntndk.h> +subsys\win\winsrv\winsrv.h: #include <ndk/ntndk.h> +subsys\win32k\w32k.h: #include <ndk/ntndk.h> +subsys\win32k\include\napi.h: #include <ndk/asm.h> \ No newline at end of file _____ Modified: trunk/reactos/include/ndk/readme.txt --- trunk/reactos/include/ndk/readme.txt 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/include/ndk/readme.txt 2005-11-22 08:21:42 UTC (rev 19459) @@ -2,6 +2,20 @@ NDK 1.00 ----------------------------- +0. PREABMLE + +0.1 COPYRIGHT + +The NDK is Copyright ® 2005 Alex Ionescu. + +0.2 CONTACT INFORMATION + +The author, Alex Ionescu, may be reached through the following means: + +Email: alex.ionescu(a)reactos.com +Mail: 2246, Duvernay. H3J 2Y3. Montreal, QC. CANADA. +Phone: (514)581-7156 + 1. LICENSE 1.1 OPEN SOURCE USAGE @@ -45,8 +59,63 @@ If you are unsure of have any questions about the NDK License, please contact the author for further clarification. -2. USAGE +2. ORIGINS OF NDK MATERIAL, AND ADDING YOUR OWN -2.1 TODO (COPY FROM WIKI) +2.1 CONTRIBUTIONS AND SOURCES +The NDK could not exist without the various contributions made by a variety of people +and sources. The following public sources of information were lawfully used: + +- GNU NTIFS.H, Revision 43 +- W32API, Version 2.5 +- Microsoft Driver Development Kit 2003 SP1 +- Microsoft Driver Development Kit 2000 +- Microsoft Driver Development Kit NT 4 +- Microsoft Driver Development Kit WinME +- Microsoft Installable File Systems Kit 2003 SP1 +- Microsoft Windows Debugger (WinDBG) 6.5.0003.7 +- Microsoft Public Symbolic Data +- Microsoft Public Windows Binaries (strings) +- OSR Technical Articles +- Undocumented windows 2000 Secrets, a Programmer's Cookbook +- Windows NT/2000 Native API Reference +- Windows NT File System Internals +- Windows Internals I - II +- Windows Internals 4th Edition + +If the information contained in these sources was copyrighted, the information was not +copied, but simply used as a basis for developing a compatible and identical definition. +No information protected by a patent or NDA was used. All information was publically +located through the Internet or purchased or licensed for lawful use. + +Additionally, the following people contributed to the NDK: + +- Eric Kohl +- Filip Navara +- Steven Edwards + +2.2 BECOMING A CONTRIBUTOR + +To contribute information to the NDK, simply contact the author with your new structure, +definition, enumeration, or prototype. Please make sure that your addition is: + +1) Actually correct! +2) Present in Windows NT 5, 5.1, 5.2 and/or 6.0 +3) Not already accessible through another public header in the DDK, IFS, WDK and/or PSDK. +4) From a publically verifiable source. The author needs to be able to search for your + addition in a public information location (book, Internet, etc) and locate this definition. +5) Not Reversed. Reversing a type is STRONGLY discouraged and a reversed type will more then likely + not be accepted, due to the fact that functionality and naming will be entirely guessed, and things + like unions are almost impossible to determine. It can also bring up possible legal ramifications + depending on your location. However, using a tool to dump the strings inside an executable + for the purpose of locating the actual name or definition of a structure (sometimes possible due + to ASSERTs or debugging strings) is considered 'fair use' and will be a likely candidate. + +If your addition satsfies these points, then please submit it, and also include whether or not +you would like to be credited for it. + +3. USAGE + +3.1 TODO (COPY FROM WIKI) + ... TODO ... (COPY FROM WIKI) _____ Modified: trunk/reactos/lib/wdmguid/wdmguid.c --- trunk/reactos/lib/wdmguid/wdmguid.c 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/lib/wdmguid/wdmguid.c 2005-11-22 08:21:42 UTC (rev 19459) @@ -5,6 +5,6 @@ #include "initguid.h" #include <ddk/wdmguid.h> -#include <ndk/sysguid.h> +#include <umpnpmgr/sysguid.h> /* EOF */

1 0

[sedwards] 19458: add __i386__
by sedwards＠svn.reactos.com 22 Nov '05

22 Nov '05

add __i386__ Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-22 08:18:03 UTC (rev 19457) +++ trunk/reactos/ReactOS.xml 2005-11-22 08:20:55 UTC (rev 19458) @@ -11,6 +11,7 @@ <define name="_M_IX86" /> <define name="_X86_" /> + <define name="__i386__" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if>

1 0

[chorns] 19457: Parse <compilationunit>
by chorns＠svn.reactos.com 22 Nov '05

22 Nov '05

Parse <compilationunit> Added: trunk/reactos/tools/rbuild/compilationunit.cpp Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt Added: trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/test.h Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp Added: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Added: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml Modified: trunk/reactos/tools/tools.mak _____ Copied: trunk/reactos/tools/rbuild/compilationunit.cpp (from rev 19411, trunk/reactos/tools/rbuild/compilationunit.cpp) _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt --- trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 08:18:03 UTC (rev 19457) @@ -129,7 +129,7 @@ None. Elements: - bootstrap, component, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. + bootstrap, component, compilationunit, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. Module types @@ -190,6 +190,25 @@ None. +CompilationUnit element +----------------------- +A compilationunit element specifies that one or more source code files are to be compiled as a single compilation unit. + +Syntax: + <compilationunit> + ... + </compilationunit> + +Attributes: + None. + +Value: + None. + +Elements: + directory, file, if. + + Component element ----------------- A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions in the library. This element can only be used for modules of type test. @@ -313,7 +332,7 @@ None. Elements: - compilerflag, define, directory, file, if, include, property. + compilationunit, compilerflag, define, directory, file, if, include, property. Importlibrary element _____ Copied: trunk/reactos/tools/rbuild/global.cpp (from rev 19411, trunk/reactos/tools/rbuild/global.cpp) --- trunk/reactos/tools/rbuild/global.cpp 2005-11-21 18:02:28 UTC (rev 19411) +++ trunk/reactos/tools/rbuild/global.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "rbuild.h" + +using std::string; +using std::vector; + +string ExePrefix; +string ExePostfix; +string sSep; +string sBadSep; +char cSep; +char cBadSep; + + +void +InitializeEnvironment () +{ + char *SepValue, *ExePostfixValue, *ExePrefixValue;; + + SepValue = getenv ( "SEP" ); + if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) ) + { + cSep = SepValue[0]; + sSep = SepValue; + } + else + { + cSep = DEF_CSEP; + sSep = DEF_SSEP; + } + if ( cSep == DEF_CSEP ) + { + cBadSep = DEF_CBAD_SEP; + sBadSep = DEF_SBAD_SEP; + } + else + { + cBadSep = DEF_CSEP; + sBadSep = DEF_SSEP; + } + ExePostfixValue = getenv ( "EXEPOSTFIX" ); + ExePrefixValue = getenv ( "EXEPREFIX" ); + if ( ( ExePostfixValue == NULL || 0 == strlen ( ExePostfixValue ) ) && + ( ExePrefixValue == NULL || 0 == strlen ( ExePrefixValue ) ) ) + { + ExePostfix = DEF_EXEPOSTFIX; + ExePrefix = DEF_EXEPREFIX; + } + else + { + ExePostfix = ExePostfixValue ? ExePostfixValue : ""; + ExePrefix = ExePrefixValue ? ExePrefixValue : ""; + } +} _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -182,20 +182,22 @@ IfableData::~IfableData() { size_t i; - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < files.size (); i++ ) delete files[i]; - for ( i = 0; i < includes.size(); i++ ) + for ( i = 0; i < includes.size (); i++ ) delete includes[i]; - for ( i = 0; i < defines.size(); i++ ) + for ( i = 0; i < defines.size (); i++ ) delete defines[i]; - for ( i = 0; i < libraries.size(); i++ ) + for ( i = 0; i < libraries.size (); i++ ) delete libraries[i]; - for ( i = 0; i < properties.size(); i++ ) + for ( i = 0; i < properties.size (); i++ ) delete properties[i]; - for ( i = 0; i < compilerFlags.size(); i++ ) + for ( i = 0; i < compilerFlags.size (); i++ ) delete compilerFlags[i]; - for ( i = 0; i < ifs.size(); i++ ) + for ( i = 0; i < ifs.size (); i++ ) delete ifs[i]; + for ( i = 0; i < compilationUnits.size (); i++ ) + delete compilationUnits[i]; } void IfableData::ProcessXML () @@ -215,6 +217,8 @@ compilerFlags[i]->ProcessXML (); for ( i = 0; i < ifs.size (); i++ ) ifs[i]->ProcessXML (); + for ( i = 0; i < compilationUnits.size (); i++ ) + compilationUnits[i]->ProcessXML (); } Module::Module ( const Project& project, @@ -413,7 +417,10 @@ size_t i; for ( i = 0; i < node.subElements.size(); i++ ) - ProcessXMLSubElement ( *node.subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node.subElements[i], path, parseContext ); + } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); for ( i = 0; i < dependencies.size(); i++ ) @@ -434,8 +441,9 @@ void Module::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf /*= NULL*/ ) + ParseContext& parseContext ) { + If* pOldIf = parseContext.ifData; bool subs_invalid = false; string subpath ( path ); if ( e.name == "file" && e.value.size () > 0 ) @@ -470,17 +478,19 @@ first, switches, false ); - if ( pIf ) - pIf->data.files.push_back ( pFile ); + if ( parseContext.ifData ) + parseContext.ifData->data.files.push_back ( pFile ); else non_if_data.files.push_back ( pFile ); + if ( parseContext.compilationUnit ) + parseContext.compilationUnit->files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) { Library* pLibrary = new Library ( e, *this, e.value ); - if ( pIf ) - pIf->data.libraries.push_back ( pLibrary ); + if ( parseContext.ifData ) + parseContext.ifData->data.libraries.push_back ( pLibrary ); else non_if_data.libraries.push_back ( pLibrary ); subs_invalid = true; @@ -494,8 +504,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( project, this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -503,15 +513,15 @@ else if ( e.name == "define" ) { Define* pDefine = new Define ( project, this, e ); - if ( pIf ) - pIf->data.defines.push_back ( pDefine ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( pDefine ); else non_if_data.defines.push_back ( pDefine ); subs_invalid = true; } else if ( e.name == "invoke" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<invoke> is not a valid sub-element of <if>" ); @@ -520,7 +530,7 @@ } else if ( e.name == "dependency" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<dependency> is not a valid sub-element of <if>" ); @@ -529,7 +539,7 @@ } else if ( e.name == "importlibrary" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<importlibrary> is not a valid sub-element of <if>" ); @@ -542,29 +552,27 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this ); + parseContext.ifData = new If ( e, project, this ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this, true ); + parseContext.ifData = new If ( e, project, this, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -601,7 +609,7 @@ } else if ( e.name == "pch" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<pch> is not a valid sub-element of <if>" ); @@ -613,13 +621,24 @@ e, *this, File ( FixSeparator ( path + cSep + e.value ), false, "", true ) ); subs_invalid = true; } + else if ( e.name == "compilationunit" ) + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( project, this, e ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + parseContext.compilationUnit = pCompilationUnit; + subs_invalid = false; + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); + parseContext.ifData = pOldIf; } ModuleType _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -66,6 +66,11 @@ "reactos" ); } +ParseContext::ParseContext () + : ifData (NULL), + compilationUnit (NULL) +{ +} Project::Project ( const string& filename ) : xmlfile (filename), @@ -254,7 +259,10 @@ size_t i; for ( i = 0; i < node->subElements.size (); i++ ) - ProcessXMLSubElement ( *node->subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node->subElements[i], path, parseContext ); + } for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); for ( i = 0; i < linkerFlags.size (); i++ ) @@ -269,13 +277,13 @@ void Project::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf ) + ParseContext& parseContext ) { bool subs_invalid = false; string subpath(path); if ( e.name == "module" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<module> is not a valid sub-element of <if>" ); @@ -310,8 +318,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( *this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -319,8 +327,8 @@ else if ( e.name == "define" ) { Define* define = new Define ( *this, e ); - if ( pIf ) - pIf->data.defines.push_back ( define ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( define ); else non_if_data.defines.push_back ( define ); subs_invalid = true; @@ -328,8 +336,8 @@ else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( *this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -341,29 +349,29 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL, true ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "property" ) { Property* property = new Property ( e, *this, NULL ); - if ( pIf ) - pIf->data.properties.push_back ( property ); + if ( parseContext.ifData ) + parseContext.ifData->data.properties.push_back ( property ); else non_if_data.properties.push_back ( property ); } @@ -373,7 +381,7 @@ "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); } Module* @@ -405,5 +413,3 @@ { return xmlfile; } - - _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -35,13 +35,6 @@ static string RootXmlFile = "ReactOS.xml"; static Configuration configuration; -string ExePrefix; -string ExePostfix; -string sSep; -string sBadSep; -char cSep; -char cBadSep; - bool ParseAutomaticDependencySwitch ( char switchChar2, char* switchStart ) @@ -193,43 +186,8 @@ int main ( int argc, char** argv ) { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + InitializeEnvironment (); - SepValue = getenv("SEP"); - if (SepValue && (0 == strcmp(SepValue, DEF_SSEP) || 0 == strcmp(SepValue, DEF_SBAD_SEP))) - { - cSep = SepValue[0]; - sSep = SepValue; - } - else - { - cSep = DEF_CSEP; - sSep = DEF_SSEP; - } - if (cSep == DEF_CSEP) - { - cBadSep = DEF_CBAD_SEP; - sBadSep = DEF_SBAD_SEP; - } - else - { - cBadSep = DEF_CSEP; - sBadSep = DEF_SSEP; - } - ExePostfixValue = getenv("EXEPOSTFIX"); - ExePrefixValue = getenv("EXEPREFIX"); - if ((ExePostfixValue == NULL || 0 == strlen(ExePostfixValue)) && - (ExePrefixValue == NULL || 0 == strlen(ExePrefixValue))) - { - ExePostfix = DEF_EXEPOSTFIX; - ExePrefix = DEF_EXEPREFIX; - } - else - { - ExePostfix = ExePostfixValue ? ExePostfixValue : ""; - ExePrefix = ExePrefixValue ? ExePrefixValue : ""; - } - if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 08:18:03 UTC (rev 19457) @@ -91,6 +91,7 @@ class PchFile; class StubbedComponent; class StubbedSymbol; +class CompilationUnit; class SourceFileTest; @@ -121,6 +122,7 @@ const std::string& defaultValue ); }; + class FileSupportCode { public: @@ -128,9 +130,20 @@ std::string filename ); }; + +class ParseContext +{ +public: + If* ifData; + CompilationUnit* compilationUnit; + ParseContext (); +}; + + class IfableData { public: + std::vector<CompilationUnit*> compilationUnits; std::vector<File*> files; std::vector<Include*> includes; std::vector<Define*> defines; @@ -177,7 +190,7 @@ void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); // disable copy semantics Project ( const Project& ); @@ -277,7 +290,7 @@ std::string GetDefaultModuleBaseaddress () const; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); }; @@ -771,6 +784,26 @@ std::string StripSymbol ( std::string symbol ); }; + +class CompilationUnit +{ +public: + const Project& project; + const Module* module; + const XMLElement& node; + std::vector<File*> files; + + CompilationUnit ( const Project& project, + const Module* module, + const XMLElement& node ); + ~CompilationUnit (); + void ProcessXML(); +}; + + +extern void +InitializeEnvironment (); + extern std::string Right ( const std::string& s, size_t n ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 08:18:03 UTC (rev 19457) @@ -152,9 +152,11 @@ RBUILD_COMMON_SOURCES = \ $(RBUILD_BACKEND_SOURCES) \ $(addprefix $(RBUILD_BASE_), \ + global.cpp \ automaticdependency.cpp \ bootstrap.cpp \ cdfile.cpp \ + compilationunit.cpp \ compilerflag.cpp \ configuration.cpp \ define.cpp \ @@ -219,6 +221,7 @@ RBUILD_TESTS = \ tests$(SEP)cdfiletest.cpp \ + tests$(SEP)compilationunittest.cpp \ tests$(SEP)definetest.cpp \ tests$(SEP)functiontest.cpp \ tests$(SEP)iftest.cpp \ @@ -256,6 +259,10 @@ $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ +$(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -268,6 +275,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)compilationunit.o: $(RBUILD_BASE_)compilationunit.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -380,6 +391,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)compilationunittest.o: $(RBUILD_TESTS_BASE_)compilationunittest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/rbuild/test.h --- trunk/reactos/tools/rbuild/test.h 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/test.h 2005-11-22 08:18:03 UTC (rev 19457) @@ -21,6 +21,8 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" +#define SSEP DEF_SSEP + #define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest @@ -153,4 +155,10 @@ void Run (); }; +class CompilationUnitTest : public BaseTest +{ +public: + void Run (); +}; + #endif /* __TEST_H */ _____ Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp --- trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -196,6 +196,7 @@ tests.push_back(new SourceFileTest()); tests.push_back(new CDFileTest()); tests.push_back(new SymbolTest()); + tests.push_back(new CompilationUnitTest()); } }; @@ -203,6 +204,7 @@ int main(int argc, char** argv) { + InitializeEnvironment (); TestDispatcher testDispatcher; testDispatcher.Run(); return 0; _____ Copied: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp (from rev 19411, trunk/reactos/tools/rbuild/tests/compilationunittest.cpp) _____ Copied: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml (from rev 19411, trunk/reactos/tools/rbuild/tests/data/compilationunit.xml) _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/tools.mak 2005-11-22 08:18:03 UTC (rev 19457) @@ -5,9 +5,9 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = -Wall -Wpointer-arith -TOOLS_LFLAGS = +TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith +TOOLS_LFLAGS = $(LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

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