Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gdalsnes] 12914: when echoing too much stuff on windows, a newline is generated and it tries to execute the stuff echoed...
by gdalsnes＠svn.reactos.com 10 Jan '05

10 Jan '05

when echoing too much stuff on windows, a newline is generated and it tries to execute the stuff echoed... Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-01-09 21:26:16 UTC (rev 12913) +++ trunk/reactos/tools/helper.mk 2005-01-10 03:03:24 UTC (rev 12914) @@ -997,10 +997,7 @@ MK_CLEANDEPS := $(join $(dir $(MK_CLEANFILTERED)), $(addprefix ., $(notdir $(MK_CLEANFILTERED)))) clean: $(MK_REGTESTS_CLEAN) $(SUBDIRS:%=%_clean) - $(HALFVERBOSEECHO) [CLEAN] *.o $(MK_PCHNAME) $(MK_BASENAME).sym $(MK_BASENAME).a \ - $(MK_RESOURCE) $(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) \ - $(MK_BASENAME).map junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) \ - $(MK_STUBS_SRC) $(MK_GENERATED_MAKEFILE) $(TARGET_CLEAN) + $(HALFVERBOSEECHO) [CLEAN] - $(RM) *.o $(MK_PCHNAME) $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \ $(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) $(MK_BASENAME).map \ junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) $(MK_STUBS_SRC) \

1 0

[chorns] 12913: * Nasm support
by chorns＠svn.reactos.com 09 Jan '05

09 Jan '05

* Nasm support * Hal, rosrtl, pseh, string modules * Build ntoskrnl Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/hal/directory.xml Added: branches/xmlbuildsystem/reactos/hal/hal/hal.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/kjs/kjs.xml Deleted: branches/xmlbuildsystem/reactos/lib/kjs/module.xml Added: branches/xmlbuildsystem/reactos/lib/pseh/pseh.xml Added: branches/xmlbuildsystem/reactos/lib/rosrtl/rosrtl.xml Added: branches/xmlbuildsystem/reactos/lib/rtl/rtl.xml Added: branches/xmlbuildsystem/reactos/lib/string/string.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -12,6 +12,9 @@ <directory name="tools"> <xi:include href="tools/tools.xml" /> </directory> + <directory name="hal"> + <xi:include href="hal/directory.xml" /> + </directory> <directory name="iface"> <directory name="native"> <xi:include href="iface/native/module.xml" /> _____ Added: branches/xmlbuildsystem/reactos/hal/directory.xml --- branches/xmlbuildsystem/reactos/hal/directory.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/hal/directory.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,3 @@ +<directory name="hal"> + <xi:include href="hal/hal.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/hal/hal/hal.xml --- branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,3 @@ +<module name="hal" type="kernelmodedll"> + <importlibrary basename="hal" definition="hal.def" /> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -1,3 +1,15 @@ <directory name="kjs"> - <xi:include href="kjs/module.xml" /> + <xi:include href="kjs/kjs.xml" /> </directory> +<directory name="pseh"> + <xi:include href="pseh/pseh.xml" /> +</directory> +<directory name="rosrtl"> + <xi:include href="rosrtl/rosrtl.xml" /> +</directory> +<directory name="rtl"> + <xi:include href="rtl/rtl.xml" /> +</directory> +<directory name="string"> + <xi:include href="string/string.xml" /> +</directory> _____ Copied: branches/xmlbuildsystem/reactos/lib/kjs/kjs.xml (from rev 12911, branches/xmlbuildsystem/reactos/lib/kjs/module.xml) _____ Deleted: branches/xmlbuildsystem/reactos/lib/kjs/module.xml --- branches/xmlbuildsystem/reactos/lib/kjs/module.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/kjs/module.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -1,41 +0,0 @@ -<module name="kjs" type="staticlibrary"> - <include base="kjs">.</include> - <include base="kjs">src</include> - <include base="kjs">include</include> - <directory name="ksrc"> - <file>setjmp.S</file> - <file>longjmp.S</file> - <file>alloc.c</file> - <file>bc.c</file> - <file>b_core.c</file> - <file>b_file.c</file> - <file>b_func.c</file> - <file>b_regexp.c</file> - <file>b_system.c</file> - <file>compat.c</file> - <file>debug.c</file> - <file>iostream.c</file> - <file>js.c</file> - <file>kjs.c</file> - <file>mrgsort.c</file> - <file>object.c</file> - <file>regex.c</file> - <file>vm.c</file> - <file>vmjumps.c</file> - <file>vmswitch.c</file> - <file>vmswt0.c</file> - </directory> - <directory name="src"> - <file>b_array.c</file> - <file>b_bool.c</file> - <file>b_object.c</file> - <file>b_number.c</file> - <file>b_string.c</file> - <file>b_vm.c</file> - <file>compiler.c</file> - <file>crc32.c</file> - <file>dl_dummy.c</file> - <file>heap.c</file> - <file>utils.c</file> - </directory> -</module> _____ Added: branches/xmlbuildsystem/reactos/lib/pseh/pseh.xml --- branches/xmlbuildsystem/reactos/lib/pseh/pseh.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/pseh/pseh.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,8 @@ +<module name="pseh" type="staticlibrary"> + <define name="__USE_W32API" /> + <directory name="i386"> + <file>framebased.asm</file> + <file>setjmp.asm</file> + </directory> + <file>framebased.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/rosrtl/rosrtl.xml --- branches/xmlbuildsystem/reactos/lib/rosrtl/rosrtl.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/rosrtl/rosrtl.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,33 @@ +<module name="rosrtl" type="staticlibrary"> + <define name="__USE_W32API" /> + <directory name="file"> + <file>sparse.c</file> + </directory> + <directory name="misc"> + <file>devmode.c</file> + <file>intrlck.c</file> + <file>logfont.c</file> + <file>qsort.c</file> + </directory> + <directory name="recmutex"> + <file>recmutex.c</file> + </directory> + <directory name="registry"> + <file>registry.c</file> + </directory> + <directory name="string"> + <file>append.c</file> + <file>resstr.c</file> + </directory> + <directory name="thread"> + <directory name="i386"> + <file>context.c</file> + <file>stackexit.S</file> + </directory> + <file>create.c</file> + <file>exit.c</file> + <file>linearstack.c</file> + <file>priv.c</file> + <file>stack.c</file> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/rtl/rtl.xml --- branches/xmlbuildsystem/reactos/lib/rtl/rtl.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/rtl/rtl.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,34 @@ +<module name="rtl" type="staticlibrary"> + <directory name="i386"> + <file>except.s</file> + <file>exception.c</file> + </directory> + <file>acl.c</file> + <file>bit.c</file> + <file>bitmap.c</file> + <file>bootdata.c</file> + <file>compress.c</file> + <file>dos8dot3.c</file> + <file>encode.c</file> + <file>env.c</file> + <file>error.c</file> + <file>exception.c</file> + <file>generictable.c</file> + <file>heap.c</file> + <file>image.c</file> + <file>largeint.c</file> + <file>luid.c</file> + <file>mem.c</file> + <file>network.c</file> + <file>nls.c</file> + <file>random.c</file> + <file>sd.c</file> + <file>security.c</file> + <file>sid.c</file> + <file>splaytree.c</file> + <file>time.c</file> + <file>timezone.c</file> + <file>unicode.c</file> + <file>unicodeprefix.c</file> + <file>version.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/string/string.xml --- branches/xmlbuildsystem/reactos/lib/string/string.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/lib/string/string.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -0,0 +1,30 @@ +<module name="string" type="staticlibrary"> + <file>memccpy.c</file> + <file>memchr.c</file> + <file>memcmp.c</file> + <file>memcpy.c</file> + <file>memmove.c</file> + <file>memset.c</file> + <file>strcat.c</file> + <file>strchr.c</file> + <file>strcmp.c</file> + <file>strcpy.c</file> + <file>strcspn.c</file> + <file>strlen.c</file> + <file>strncat.c</file> + <file>strncmp.c</file> + <file>strncpy.c</file> + <file>strnlen.c</file> + <file>strrchr.c</file> + <file>strspn.c</file> + <file>wcscat.c</file> + <file>wcschr.c</file> + <file>wcscmp.c</file> + <file>wcscpy.c</file> + <file>wcslen.c</file> + <file>wcsncat.c</file> + <file>wcsncmp.c</file> + <file>wcsncpy.c</file> + <file>wcsnlen.c</file> + <file>wcsrchr.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-09 21:26:16 UTC (rev 12913) @@ -1,4 +1,4 @@ -<module name="ntoskrnl" type="kernelmodedll" extension=".exe"> +<module name="ntoskrnl" type="kernel"> <dependency>buildno</dependency> <dependency>genntdll</dependency> <dependency>wmc</dependency> @@ -9,7 +9,12 @@ <define name="__ELF_WORD_SIZE">32</define> <include base="kjs">include</include> <include base="ntoskrnl">include</include> + <library>hal</library> <library>kjs</library> + <library>pseh</library> + <library>rosrtl</library> + <library>rtl</library> + <library>string</library> <invoke module="wmc"> <input> <inputfile>ntoskrnl.mc</inputfile> @@ -83,13 +88,11 @@ <file>user.c</file> </directory> <directory name="ex"> -  <file>btree.c</file> <file>callback.c</file> <file>fmutex.c</file> @@ -315,6 +318,7 @@ <file>plugplay.c</file> <file>profile.c</file> <file>vdm.c</file> + <file>zw.c</file> </directory> <directory name="ob"> <file>dirobj.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-09 21:26:16 UTC (rev 12913) @@ -65,7 +65,7 @@ fprintf ( fMakefile, "host_gcc = gcc\n" ); fprintf ( fMakefile, "host_ar = ar\n" ); fprintf ( fMakefile, "host_ld = ld\n" ); - fprintf ( fMakefile, "rm = del /y\n" ); + fprintf ( fMakefile, "rm = del /f /q\n" ); fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "ld = ld\n" ); fprintf ( fMakefile, "ar = ar\n" ); @@ -82,7 +82,7 @@ Module& module = *ProjectNode.modules[i]; fprintf ( fMakefile, " %s", - FixupTargetFilename(module.GetPath ()).c_str () ); + FixupTargetFilename( module.GetPath () ).c_str () ); } fprintf ( fMakefile, "\n\t\n\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 21:26:16 UTC (rev 12913) @@ -100,7 +100,7 @@ dependencies += " "; const Module* importedModule = module.project.LocateModule ( module.libraries[i]->name ); assert ( importedModule != NULL ); - dependencies += FixupTargetFilename ( importedModule->GetPath () ).c_str (); + dependencies += FixupTargetFilename ( importedModule->GetDependencyPath () ).c_str (); } return dependencies; } @@ -261,11 +261,17 @@ MingwModuleHandler::GenerateGccParameters ( const Module& module ) const { string parameters = GenerateGccDefineParameters ( module ); - parameters += ssprintf(" $(%s_INCLUDES)",module.name.c_str()); + parameters += ssprintf(" $(%s_INCLUDES)", module.name.c_str()); return parameters; } string +MingwModuleHandler::GenerateNasmParameters ( const Module& module ) const +{ + return ""; +} + +string MingwModuleHandler::GenerateGccCommand ( const Module& module, const string& sourceFilename, const string& cc ) const @@ -292,6 +298,18 @@ } string +MingwModuleHandler::GenerateNasmCommand ( const Module& module, + const string& sourceFilename ) const +{ + string objectFilename = GetObjectFilename ( sourceFilename ); + return ssprintf ( "%s -f win32 %s -o %s %s\n", + "nasm", + sourceFilename.c_str (), + objectFilename.c_str (), + GenerateNasmParameters ( module ).c_str () ); +} + +string MingwModuleHandler::GenerateCommand ( const Module& module, const string& sourceFilename, const string& cc ) const @@ -305,6 +323,9 @@ return GenerateGccAssemblerCommand ( module, sourceFilename, cc ); + else if ( extension == ".asm" || extension == ".ASM" ) + return GenerateNasmCommand ( module, + sourceFilename ); throw InvalidOperationException ( __FILE__, __LINE__, @@ -506,6 +527,7 @@ preconditionDependenciesName.c_str () ); } + static MingwBuildToolModuleHandler buildtool_handler; MingwBuildToolModuleHandler::MingwBuildToolModuleHandler() @@ -540,7 +562,7 @@ static MingwKernelModuleHandler kernelmodule_handler; MingwKernelModuleHandler::MingwKernelModuleHandler () - : MingwModuleHandler ( KernelModeDLL ) + : MingwModuleHandler ( Kernel ) { } @@ -564,13 +586,15 @@ string base_tmp = ros_junk + module.name + ".base.tmp"; string junk_tmp = ros_junk + module.name + ".junk.tmp"; string temp_exp = ros_junk + module.name + ".temp.exp"; + string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,_NtProcessStartup -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.GetBasePath ().c_str () ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); fprintf ( fMakefile, - "\t${gcc} -Wl,--entry,_NtProcessStartup -Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -Wl,--base-file,%s -nostartfiles -o %s %s %s\n", - module.GetBasePath ().c_str (), + "\t${gcc} %s -Wl,--base-file,%s -o %s %s %s\n", + gccOptions.c_str (), base_tmp.c_str (), junk_tmp.c_str (), archiveFilename.c_str (), @@ -587,7 +611,8 @@ "\t${rm} %s\n", base_tmp.c_str () ); fprintf ( fMakefile, - "\t${ld} -Wl,%s -o %s %s %s\n", + "\t${gcc} %s -Wl,%s -o %s %s %s\n", + gccOptions.c_str (), temp_exp.c_str (), target.c_str (), archiveFilename.c_str (), @@ -600,6 +625,7 @@ GenerateObjectFileTargetsTarget ( module ); } + static MingwStaticLibraryModuleHandler staticlibrary_handler; MingwStaticLibraryModuleHandler::MingwStaticLibraryModuleHandler () @@ -621,3 +647,65 @@ GenerateArchiveTargetTarget ( module ); GenerateObjectFileTargetsTarget ( module ); } + + +static MingwKernelModeDLLModuleHandler kernelmodedll_handler; + +MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler () + : MingwModuleHandler ( KernelModeDLL ) +{ +} + +void +MingwKernelModeDLLModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateKernelModeDLLModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Module& module ) +{ + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string target ( FixupTargetFilename ( module.GetPath () ) ); + string workingDirectory = GetWorkingDirectory ( ); + string archiveFilename = GetModuleArchiveFilename ( module ); + string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + if (module.importLibrary != NULL) + { + fprintf ( fMakefile, "%s:\n", + module.GetDependencyPath ().c_str () ); + + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", + module.GetTargetName ().c_str (), + FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); + } + + if (module.files.size () > 0) + { + fprintf ( fMakefile, "%s: %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll -o %s %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + GenerateArchiveTargetTarget ( module ); + GenerateObjectFileTargetsTarget ( module ); + } + else + { + fprintf ( fMakefile, "%s:\n\n", + target.c_str ()); + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); + } +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 21:26:16 UTC (rev 12913) @@ -48,12 +48,15 @@ void GenerateGccModuleIncludeVariable ( const Module& module ) const; std::string GenerateGccIncludeParameters ( const Module& module ) const; std::string GenerateGccParameters ( const Module& module ) const; + std::string GenerateNasmParameters ( const Module& module ) const; std::string GenerateGccCommand ( const Module& module, const std::string& sourceFilename, const std::string& cc ) const; std::string GenerateGccAssemblerCommand ( const Module& module, const std::string& sourceFilename, const std::string& cc ) const; + std::string GenerateNasmCommand ( const Module& module, + const std::string& sourceFilename ) const; std::string GenerateCommand ( const Module& module, const std::string& sourceFilename, const std::string& cc ) const; @@ -94,4 +97,14 @@ void GenerateStaticLibraryModuleTarget ( const Module& module ); }; + +class MingwKernelModeDLLModuleHandler : public MingwModuleHandler +{ +public: + MingwKernelModeDLLModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateKernelModeDLLModuleTarget ( const Module& module ); +}; + #endif /* MINGW_MODULEHANDLER_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-09 21:26:16 UTC (rev 12913) @@ -24,8 +24,9 @@ Module::Module ( const Project& project, const XMLElement& moduleNode, const string& modulePath ) - : project(project), - node(moduleNode) + : project (project), + node (moduleNode), + importLibrary (NULL) { if ( node.name != "module" ) throw Exception ( "internal tool error: Module created with non-<module> node" ); @@ -126,6 +127,11 @@ dependencies.push_back ( new Dependency ( e, *this ) ); subs_invalid = true; } + else if ( e.name == "importlibrary" ) + { + importLibrary = new ImportLibrary ( e, *this ); + subs_invalid = true; + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, @@ -142,6 +148,8 @@ return BuildTool; if ( attribute.value == "staticlibrary" ) return StaticLibrary; + if ( attribute.value == "kernel" ) + return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; throw InvalidAttributeValueException ( location, @@ -158,6 +166,8 @@ return EXEPOSTFIX; case StaticLibrary: return ".a"; + case Kernel: + return ".exe"; case KernelModeDLL: return ".dll"; } @@ -166,18 +176,43 @@ } string -Module::GetBasePath() const +Module::GetTargetName () const { + return name + extension; +} + +string +Module::GetDependencyPath () const +{ + if ( type == KernelModeDLL ) + return ssprintf ( "dk%snkm%slib%slib%s.a", + SSEP, + SSEP, + SSEP, + name.c_str () ); + else + return GetPath (); +} + +string +Module::GetBasePath () const +{ return path; } string Module::GetPath () const { - return path + CSEP + name + extension; + return path + CSEP + GetTargetName (); } string +Module::GetPathWithPrefix ( const string& prefix ) const +{ + return path + CSEP + prefix + GetTargetName (); +} + +string Module::GetTargets () const { if ( invocations.size () > 0 ) @@ -371,3 +406,20 @@ module.name.c_str(), node.value.c_str() ); } + + +ImportLibrary::ImportLibrary ( const XMLElement& _node, + const Module& _module ) + : node (_node), + module (_module) +{ + const XMLAttribute* att = _node.GetAttribute ( "basename", false ); + if (att != NULL) + basename = att->value; + else + basename = module.name; + + att = _node.GetAttribute ( "definition", true ); + assert (att); + definition = att->value; +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-09 19:40:08 UTC (rev 12912) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-09 21:26:16 UTC (rev 12913) @@ -30,6 +30,7 @@ class Invoke; class InvokeFile; class Dependency; +class ImportLibrary; class Project { @@ -63,6 +64,7 @@ { BuildTool, StaticLibrary, + Kernel, KernelModeDLL }; @@ -76,6 +78,7 @@ std::string extension; std::string path; ModuleType type; + ImportLibrary* importLibrary; std::vector<File*> files; std::vector<Library*> libraries; std::vector<Include*> includes; @@ -89,8 +92,11 @@ ~Module (); ModuleType GetModuleType ( const std::string& location, const XMLAttribute& attribute ); + std::string GetTargetName () const; + std::string GetDependencyPath () const; std::string GetBasePath() const; std::string GetPath () const; + std::string GetPathWithPrefix ( const std::string& prefix ) const; std::string GetTargets () const; std::string GetInvocationTarget ( const int index ) const; void ProcessXML(); @@ -217,6 +223,21 @@ void ProcessXML(); }; + +class ImportLibrary +{ +public: + const XMLElement& node; + const Module& module; + std::string basename; + std::string definition; + + ImportLibrary ( const XMLElement& _node, + const Module& module ); + + void ProcessXML (); +}; + extern std::string FixSeparator ( const std::string& s );

1 0

[gdalsnes] 12912: small cleanup
by gdalsnes＠svn.reactos.com 09 Jan '05

09 Jan '05

small cleanup Modified: trunk/reactos/include/pseh/prettybased.h _____ Modified: trunk/reactos/include/pseh/prettybased.h --- trunk/reactos/include/pseh/prettybased.h 2005-01-09 19:16:35 UTC (rev 12911) +++ trunk/reactos/include/pseh/prettybased.h 2005-01-09 19:40:08 UTC (rev 12912) @@ -166,9 +166,6 @@ } while(0); \ \ _SEHLeave(&_SEHFrame->SEH_Header); \ - \ - if (!_SEHHandlers.SH_Finally) break; \ - _loop ++; \ } \ else \ { \ @@ -195,7 +192,6 @@ #define ___END_DUAL \ - \ } while (0); \ \ if (_ret > 1) \ @@ -205,7 +201,6 @@ } \ break; \ } \ - _loop ++; \ } \ \ } while (0); @@ -253,7 +248,7 @@ _SEHPortableFrame = &_SEHFrame->SEH_Header; \ (void)_SEHPortableFrame; \ \ - for(;;) \ + for(;;_loop++) \ if (_loop == 1) \ { \ _SEHEnter(&_SEHFrame->SEH_Header); \ @@ -266,7 +261,6 @@ } while(0); \ \ _SEHLeave(&_SEHFrame->SEH_Header); \ - _loop ++; \ } \ else \ { \ @@ -290,7 +284,6 @@ } \ break; \ } \ - _loop ++; \ } \ } while (0);

1 0

[royce] 12911: added xi:fallback support
by royce＠svn.reactos.com 09 Jan '05

09 Jan '05

added xi:fallback support fixed some memory leaks in Project detect and report "end of file looking for end tag" instead of just crashing Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/config.template.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-09 19:16:35 UTC (rev 12911) @@ -1,6 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> <define name="_M_IX86" /> <include>include</include> <include>w32api/include</include> _____ Added: branches/xmlbuildsystem/reactos/config.template.xml --- branches/xmlbuildsystem/reactos/config.template.xml 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/config.template.xml 2005-01-09 19:16:35 UTC (rev 12911) @@ -0,0 +1,66 @@ + + +<define name="ARCH" value="i386" /> + + + + +<define name="OARCH" value="i486" /> + + + +<define name="KDBG" value="0" /> + + + + +<define name="DBG" value="0" /> + + + + +<define name="OPTIMIZED" value="0" /> + + + + +<define name="MP" value="0" /> + + + +<define name="ACPI" value="0" /> + + + + +<define name="3GB" value="1" /> + + + _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-09 19:16:35 UTC (rev 12911) @@ -22,6 +22,28 @@ string working_directory; +class XMLInclude +{ +public: + XMLElement *e; + Path path; + + XMLInclude ( XMLElement* e_, const Path& path_ ) + : e(e_), path(path_) + { + } +}; + +class XMLIncludes : public vector<XMLInclude*> +{ +public: + ~XMLIncludes() + { + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; + } +}; + void InitWorkingDirectory() { @@ -306,6 +328,19 @@ { } +XMLAttribute::XMLAttribute ( const XMLAttribute& src ) + : name(src.name), value(src.value) +{ + +} + +XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src ) +{ + name = src.name; + value = src.value; + return *this; +} + XMLElement::XMLElement ( const string& location_ ) : location(location_), parentElement(NULL) @@ -451,7 +486,6 @@ // XMLParse() // This function reads a "token" from the file loaded in XMLFile -// REM TODO FIXME: At the moment it can't handle comments or non-xml tags. // if it finds a tag that is non-singular, it parses sub-elements and/or // inner text into the XMLElement that it is building to return. // Return Value: an XMLElement allocated via the new operator that contains @@ -459,13 +493,14 @@ // (no more data) XMLElement* XMLParse(XMLFile& f, + XMLIncludes* includes, const Path& path, - bool* pend_tag /*= NULL*/) + bool* pend_tag = NULL ) { string token; if ( !f.get_token(token) ) return NULL; - bool end_tag; + bool end_tag, is_include = false; while ( token[0] != '<' || !strncmp ( token.c_str(), "<!--", 4 ) @@ -482,32 +517,10 @@ XMLElement* e = new XMLElement ( f.Location() ); bool bNeedEnd = e->Parse ( token, end_tag ); - if ( e->name == "xi:include" ) + if ( e->name == "xi:include" && includes ) { - XMLAttribute* att; - att = e->GetAttribute("href",true); - assert(att); - - string file ( path.Fixup(att->value,true) ); - string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); - e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); - XMLFile fInc; - if ( !fInc.open ( file ) ) - throw FileNotFoundException ( - ssprintf("%s (referenced from %s)", - file.c_str(), - f.Location().c_str() ) ); - else - { - Path path2 ( path, att->value ); - for ( ;; ) - { - XMLElement* e2 = XMLParse ( fInc, path2 ); - if ( !e2 ) - break; - e->AddSubElement ( e2 ); - } - } + includes->push_back ( new XMLInclude ( e, path ) ); + is_include = true; } if ( !bNeedEnd ) @@ -531,7 +544,9 @@ { if ( !f.get_token ( token ) || !token.size() ) { - throw Exception ( "internal tool error - get_token() failed when more_tokens() returned true" ); + throw InvalidBuildFileException ( + f.Location(), + "internal tool error - get_token() failed when more_tokens() returned true" ); break; } if ( e->subElements.size() && !bThisMixingErrorReported ) @@ -556,12 +571,23 @@ } else { - XMLElement* e2 = XMLParse ( f, path, &end_tag ); + XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); + if ( !e2 ) + { + throw InvalidBuildFileException ( + e->location, + "end of file found looking for end tag" ); + break; + } if ( end_tag ) { if ( e->name != e2->name ) + { + delete e2; throw XMLSyntaxErrorException ( f.Location(), "end tag name mismatch" ); + break; + } delete e2; break; } @@ -576,3 +602,118 @@ } return e; } + +void +XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) +{ + for ( ;; ) + { + XMLElement* e = XMLParse ( f, &includes, path ); + if ( !e ) + return; + head.AddSubElement ( e ); + } +} + +XMLElement* +XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) +{ + // TODO FIXME + XMLAttribute* att; + att = e->GetAttribute("href",true); + assert(att); + + string file ( path.Fixup(att->value,true) ); + string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); + e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); + XMLFile fInc; + if ( !fInc.open ( file ) ) + { + // look for xi:fallback element + for ( size_t i = 0; i < e->subElements.size(); i++ ) + { + XMLElement* e2 = e->subElements[i]; + if ( e2->name == "xi:fallback" ) + { + // now look for xi:include below... + for ( i = 0; i < e2->subElements.size(); i++ ) + { + XMLElement* e3 = e2->subElements[i]; + if ( e3->name == "xi:include" ) + { + return XMLLoadInclude ( e3, path, includes ); + } + } + throw InvalidBuildFileException ( + e2->location, + "<xi:fallback> must have a <xi:include> sub-element" ); + return NULL; + } + } + return NULL; + } + else + { + XMLElement* new_e = new XMLElement ( e->location ); + new_e->name = "xi:included"; + Path path2 ( path, att->value ); + XMLReadFile ( fInc, *new_e, includes, path2 ); + return new_e; + } +} + +XMLElement* +XMLLoadFile ( const string& filename, const Path& path ) +{ + XMLIncludes includes; + XMLFile f; + + if ( !f.open ( filename ) ) + throw FileNotFoundException ( filename ); + + XMLElement* head = new XMLElement("(virtual)"); + + XMLReadFile ( f, *head, includes, path ); + + for ( size_t i = 0; i < includes.size(); i++ ) + { + XMLElement* e = includes[i]->e; + XMLElement* e2 = XMLLoadInclude ( includes[i]->e, includes[i]->path, includes ); + if ( !e2 ) + { + throw FileNotFoundException ( + ssprintf("%s (referenced from %s)", + e->GetAttribute("top_href",true)->value.c_str(), + f.Location().c_str() ) ); + } + XMLElement* parent = e->parentElement; + XMLElement** parent_container = NULL; + if ( !parent ) + { + delete e; + throw Exception ( "internal tool error: xi:include doesn't have a parent" ); + return NULL; + } + for ( size_t j = 0; j < parent->subElements.size(); j++ ) + { + if ( parent->subElements[j] == e ) + { + parent_container = &parent->subElements[j]; + break; + } + } + if ( !parent_container ) + { + delete e; + throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); + return NULL; + } + // replace inclusion tree with the imported tree + e2->name = e->name; + e2->attributes = e->attributes; + *parent_container = e2; + e->attributes.resize(0); + delete e; + } + return head; +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-09 19:16:35 UTC (rev 12911) @@ -52,6 +52,8 @@ XMLAttribute(); XMLAttribute ( const std::string& name_, const std::string& value_ ); + XMLAttribute ( const XMLAttribute& ); + XMLAttribute& operator = ( const XMLAttribute& ); }; @@ -77,8 +79,11 @@ }; XMLElement* +XMLLoadFile ( const std::string& filename, const Path& path ); + +/*XMLElement* XMLParse(XMLFile& f, const Path& path, - bool* pend_tag = NULL); + bool* pend_tag = NULL);*/ #endif//XML_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-09 19:16:35 UTC (rev 12911) @@ -8,17 +8,29 @@ using std::vector; using std::map; -map<string,Backend::Factory*>* Backend::Factory::factories = NULL; +map<string,Backend::Factory*>* +Backend::Factory::factories = NULL; +int +Backend::Factory::ref = 0; Backend::Factory::Factory ( const std::string& name_ ) { string name(name_); strlwr ( &name[0] ); - if ( !factories ) + if ( !ref++ ) factories = new map<string,Factory*>; (*factories)[name] = this; } +Backend::Factory::~Factory() +{ + if ( !--ref ) + { + delete factories; + factories = NULL; + } +} + /*static*/ Backend* Backend::Factory::Create ( const string& name, Project& project ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-01-09 19:16:35 UTC (rev 12911) @@ -13,11 +13,12 @@ class Factory { static std::map<std::string,Factory*>* factories; + static int ref; protected: Factory ( const std::string& name_ ); - virtual ~Factory() {} + virtual ~Factory(); virtual Backend* operator() ( Project& ) = 0; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 19:16:35 UTC (rev 12911) @@ -12,17 +12,28 @@ map<ModuleType,MingwModuleHandler*>* MingwModuleHandler::handler_map = NULL; +int +MingwModuleHandler::ref = 0; FILE* MingwModuleHandler::fMakefile = NULL; MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype ) { - if ( !handler_map ) + if ( !ref++ ) handler_map = new map<ModuleType,MingwModuleHandler*>; (*handler_map)[moduletype] = this; } +MingwModuleHandler::~MingwModuleHandler() +{ + if ( !--ref ) + { + delete handler_map; + handler_map = NULL; + } +} + /*static*/ void MingwModuleHandler::SetMakefile ( FILE* f ) { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 19:16:35 UTC (rev 12911) @@ -7,9 +7,10 @@ { public: static std::map<ModuleType,MingwModuleHandler*>* handler_map; + static int ref; MingwModuleHandler ( ModuleType moduletype ); - virtual ~MingwModuleHandler() {} + virtual ~MingwModuleHandler(); static void SetMakefile ( FILE* f ); static MingwModuleHandler* LookupHandler ( const std::string& location, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-09 19:16:35 UTC (rev 12911) @@ -7,39 +7,48 @@ using std::string; using std::vector; -Project::Project() +/*Project::Project() + : node(NULL), head(NULL) { -} +}*/ Project::Project ( const string& filename ) + : xmlfile(filename), node(NULL), head(NULL) { - if ( !xmlfile.open ( filename ) ) - throw FileNotFoundException ( filename ); ReadXml(); } Project::~Project () { - for ( size_t i = 0; i < modules.size (); i++ ) + size_t i; + for ( i = 0; i < modules.size (); i++ ) delete modules[i]; - delete node; + for ( i = 0; i < includes.size(); i++ ) + delete includes[i]; + for ( i = 0; i < defines.size(); i++ ) + delete defines[i]; + delete head; } void -Project::ReadXml () +Project::ReadXml() { Path path; - - do + head = XMLLoadFile ( xmlfile, path ); + node = NULL; + for ( size_t i = 0; i < head->subElements.size(); i++ ) { - node = XMLParse ( xmlfile, path ); - if ( !node ) - throw InvalidBuildFileException ( - node->location, - "Document contains no 'project' tag." ); - } while ( node->name != "project" ); + if ( head->subElements[i]->name == "project" ) + { + node = head->subElements[i]; + this->ProcessXML ( "." ); + return; + } + } - this->ProcessXML ( "." ); + throw InvalidBuildFileException ( + node->location, + "Document contains no 'project' tag." ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-09 19:16:35 UTC (rev 12911) @@ -31,38 +31,6 @@ Backend* backend = Backend::Factory::Create ( buildtarget, project ); backend->Process (); delete backend; - - // REM TODO FIXME actually do something with Project object... -#if 0 - printf ( "Found %d modules:\n", project.modules.size() ); - for ( size_t i = 0; i < project.modules.size(); i++ ) - { - Module& m = *project.modules[i]; - printf ( "\t%s in folder: %s\n", - m.name.c_str(), - m.path.c_str() ); - printf ( "\txml dependencies:\n\t\t%s\n", - projectFilename.c_str() ); - const XMLElement* e = &m.node; - while ( e ) - { - if ( e->name == "xi:include" ) - { - const XMLAttribute* att = e->GetAttribute("top_href",false); - if ( att ) - { - printf ( "\t\t%s\n", att->value.c_str() ); - } - } - e = e->parentElement; - } - printf ( "\tfiles:\n" ); - for ( size_t j = 0; j < m.files.size(); j++ ) - { - printf ( "\t\t%s\n", m.files[j]->name.c_str() ); - } - } -#endif return 0; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-09 17:24:09 UTC (rev 12910) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-09 19:16:35 UTC (rev 12911) @@ -33,6 +33,8 @@ class Project { + std::string xmlfile; + XMLElement *node, *head; public: std::string name; std::string makefile; @@ -40,7 +42,7 @@ std::vector<Include*> includes; std::vector<Define*> defines; - Project (); + //Project (); Project ( const std::string& filename ); ~Project (); void ProcessXML ( const std::string& path ); @@ -48,10 +50,12 @@ const Module* LocateModule ( const std::string& name ) const; private: void ReadXml (); - XMLFile xmlfile; - XMLElement* node; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path ); + + // disable copy semantics + Project ( const Project& ); + Project& operator = ( const Project& ); };

1 0

[chorns] 12910: Fix compilation.
by chorns＠svn.reactos.com 09 Jan '05

09 Jan '05

Fix compilation. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-09 16:44:14 UTC (rev 12909) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-09 17:24:09 UTC (rev 12910) @@ -9,7 +9,7 @@ ARE_EQUAL(2, project.modules.size()); Module& module1 = *project.modules[0]; - IS_TRUE(module1.etype == BuildTool); + IS_TRUE(module1.type == BuildTool); ARE_EQUAL(2, module1.files.size()); ARE_EQUAL("." SSEP "dir1" SSEP "file1.c", module1.files[0]->name); ARE_EQUAL("." SSEP "dir1" SSEP "file2.c", module1.files[1]->name); @@ -17,7 +17,7 @@ ARE_EQUAL(0, module1.libraries.size()); Module& module2 = *project.modules[1]; - IS_TRUE(module2.etype == KernelModeDLL); + IS_TRUE(module2.type == KernelModeDLL); ARE_EQUAL(2, module2.files.size()); ARE_EQUAL("." SSEP "dir2" SSEP "file3.c", module2.files[0]->name); ARE_EQUAL("." SSEP "dir2" SSEP "file4.c", module2.files[1]->name);

1 0

[frik85] 12909: 8 german language files (update)
by frik85＠svn.reactos.com 09 Jan '05

09 Jan '05

8 german language files (update) Modified: trunk/reactos/lib/shell32/shell32_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/winmm/winmm_De.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/regedit/De.rc Modified: trunk/reactos/subsys/system/taskmgr/De.rc Modified: trunk/reactos/subsys/system/vmwinst/De.rc Modified: trunk/reactos/subsys/system/winlogon/De.rc _____ Modified: trunk/reactos/lib/shell32/shell32_De.rc --- trunk/reactos/lib/shell32/shell32_De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/lib/shell32/shell32_De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -51,7 +51,7 @@ MENUITEM SEPARATOR MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Icons anordnen", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -38,16 +38,16 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "The ReactOS developers would like to acknowledge the following Open Source projects, "\ - "(parts of) which were used to create ReactOS:", + LTEXT "Die ReactOS Programmierer wollen folgende Open Source Projekte anerkennen, "\ + "die (teils) verwendet wurden, um ReactOS zu erstellen:", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\ - "(parts of) it you must respect the GPL", + LTEXT "ReactOS ist unter der GPL veröffentlicht, wenn Sie also (Teile von) ReactOS wiederverwenden "\ + "oder wiederveröffentlichen wollen, müssen Sie die GPL respektieren.", IDC_STATIC,15,110,227,19 - PUSHBUTTON "&View GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Click Next to continue with Setup.",IDC_STATIC,15,136, + PUSHBUTTON "&GPL &ansehen...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Klicken Sie auf Weiter, um mit dem Setup fortzufahren.",IDC_STATIC,15,136, 195,17 END @@ -57,11 +57,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Geben Sie ihren Namen und ihre Firma oder Organization ein.", + LTEXT "Geben Sie ihren Namen und ihre Firma oder Organisation ein.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8 + LTEXT "&Organisation:", IDC_STATIC, 54, 57, 44, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -93,17 +93,17 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The system locale should match the language of the applications "\ - "you want to use. The user locale controls how numbers, "\ - "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Die lokalen Systemeinstellungen sollten mit der Sprache der Anwendungen, "\ + "die Sie nutzen wollen übereinstimmen. Die lokalen Nutzereinstellungen geben vor, "\ + "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 7, 253, 20 LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "To change system or user locale settings, click Customize.", + LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu ändern, klicken Sie auf Einstellen", IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "The keyboard layout controls the characters that appear when you type.", + PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Das Tastaturlayout gibt vor, welche Zeichen erscheinen, wenn Sie eine Taste drücken.", IDC_STATIC, 53, 86, 253, 8 LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "To change the keyboard layout, click Customize.", + LTEXT "Um das Tastaturlayout zu ändern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Die Installation von ReactOS wurde erfolgreich fertiggestellt.", IDC_STATIC, 13, 12, 212, 16 - LTEXT "Um fortzufahren muss Ihr Computer neu gesratet werden. "\ + LTEXT "Um fortzufahren muss Ihr Computer neu gestartet werden. "\ "Der Computer wird in 15 Minuten automatisch neu gestartet oder wenn Sie auf "\ "Neustart klicken.", IDC_STATIC, 13, 33, 212, 32 /* GROUPBOX "", -1, 7, 3, 231, 106 */ @@ -179,16 +179,16 @@ STRINGTABLE BEGIN - IDS_ACKTITLE "Acknowledgements" - IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" - IDS_OWNERTITLE "Personalize your Software" - IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalize ReactOS." - IDS_COMPUTERTITLE "Computer Name and Administrator Password" - IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." - IDS_LOCALETITLE "Regional settings" - IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." - IDS_DATETIMETITLE "Date and Time" - IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." + IDS_ACKTITLE "Anerkennungen" + IDS_ACKSUBTITLE "Das Fundament, auf dem ReactOS gebaut ist und Lizenzinformationen" + IDS_OWNERTITLE "Personalisieren Sie ihre Software" + IDS_OWNERSUBTITLE "Das Setup nutzt diese Informationen über Sie, um ReactOS zu personalisieren." + IDS_COMPUTERTITLE "Computername und Administratorpasswort" + IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für ihren Computer festsetzen." + IDS_LOCALETITLE "Regionale Einstellungen" + IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." + IDS_DATETIMETITLE "Datum und Uhrzeit" + IDS_DATETIMESUBTITLE "SSetzen Sie das korrekte Datum und Uhrzeit für ihren Computer." IDS_PROCESSTITLE "Process page title" IDS_PROCESSSUBTITLE "Process page subtitle" END _____ Modified: trunk/reactos/lib/winmm/winmm_De.rc --- trunk/reactos/lib/winmm/winmm_De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/lib/winmm/winmm_De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -57,7 +57,7 @@ MCIERR_DEVICE_OPEN, "Der Gerätename wird von dieser Anwendung bereits als Alias benutzt. Benutzen Sie einen eindeutigen Alias" MCIERR_CANNOT_LOAD_DRIVER, "Es gibt ein unbekanntes Problem beim Laden des angegebenen Gerätetreibers." MCIERR_MISSING_COMMAND_STRING, "Kein Befehl wurde angegeben." -MCIERR_PARAM_OVERFLOW, "Die Ausgabezeichenkennte war zu lang für den Rückgabepuffer. Erhöhen Sie die Puffergröße." +MCIERR_PARAM_OVERFLOW, "Die Ausgabezeichenkette war zu lang für den Rückgabepuffer. Erhöhen Sie die Puffergröße." MCIERR_MISSING_STRING_ARGUMENT, "Der Befehl erfordert einen Zeichenkettenparameter. Bitte stellen Sie einen bereit." MCIERR_BAD_INTEGER, "Die Angabe einer ganzen Zahl ist für diesen Befehl ungültig." MCIERR_PARSER_INTERNAL, "Der Gerätetreiber hat einen ungültigen Rückgabewert geliefert. Fragen Sie den Gerätehersteller nach einem neuen Treiber." _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -348,7 +348,7 @@ MENUITEM "&Suchen...\tF1", ID_HELP MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "Info about &Winefile...", ID_ABOUT_WINEFILE + MENUITEM "&Info about ReactOS Explorer...", ID_ABOUT_WINEFILE END END @@ -386,8 +386,8 @@ POPUP "&Hilfe" BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS + MENUITEM "&Über ReactOS Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Über React&OS...", ID_ABOUT_WINDOWS END END @@ -620,7 +620,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Startmenu" + IDS_STARTMENU "Startmenü" IDS_MINIMIZE_ALL "alle Fenster minimieren" IDS_DESKTOP_NUM "Desktop %d" IDS_VOLUME "Lautstärke" @@ -773,8 +773,8 @@ MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart", 65535 - MENUITEM "&Einstellungen beim Beenden speichern", 511 + MENUITEM "&Symbol after Running", 65535 + MENUITEM "&Save Changes on Exit", 511 END POPUP "&Security" BEGIN @@ -1099,7 +1099,7 @@ IDS_CONTROL_PANEL "Control Panel" IDS_PRINTERS "Printers" IDS_BROWSE "Browse Files" - IDS_SEARCH_PRG "Search Programm..." + IDS_SEARCH_PRG "Search Program..." IDS_ALL_USERS "All Users\\" IDS_SEARCH "Search" IDS_ABOUT_EXPLORER "&About Explorer..." _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -255,6 +255,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "Fehler" + IDS_WARNING "Warnung" IDS_BAD_VALUE "Kann den Wert '%s' nicht lesen" IDS_UNSUPPORTED_TYPE "Kann den Schlüssel des Typen (%ld) nicht ändern" IDS_TOO_BIG_VALUE "Der Wert (%ld) ist zu groß" _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -597,8 +597,8 @@ ID_VIEW_SMALL "Zeigt Tasks als kleine Symbole an." ID_VIEW_DETAILS "Zeigt Informationen über jeden Task an." ID_VIEW_UPDATESPEED_HIGH "Aktualisiert die Anzeige zweimal pro Sekunde." - ID_VIEW_UPDATESPEED_NORMAL "Aktualisiert die Anzeige alle zwei Sekunde." - ID_VIEW_UPDATESPEED_LOW "Aktualisiert die Anzeige alle vier Sekunde." + ID_VIEW_UPDATESPEED_NORMAL "Aktualisiert die Anzeige alle zwei Sekunden." + ID_VIEW_UPDATESPEED_LOW "Aktualisiert die Anzeige alle vier Sekunden." END STRINGTABLE DISCARDABLE @@ -616,10 +616,10 @@ ID_FILE_EXIT "Beendet den Task-Manager." ID_OPTIONS_SHOW16BITTASKS "Zeigt die 16-Bit Tasks unter der zugehörigen ntvdm.exe an." - ID_VIEW_SELECTCOLUMNS "Legt fest welche Spaletn auf der Registerkarte Prozesse angezeigt werden." + ID_VIEW_SELECTCOLUMNS "Legt fest welche Spalten auf der Registerkarte Prozesse angezeigt werden." ID_VIEW_SHOWKERNELTIMES "Zeigt die Kernel-Zeiten in den Systemmonitordiagrammen an." ID_VIEW_CPUHISTORY_ONEGRAPHALL - "Zeigt für jede CPU-Auslastung ein Verlausdiagramm an." + "Zeigt für jede CPU-Auslastung ein Verlaufsdiagramm an." ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Zeigt die gesamte CPU-Auslastung in einem Verlaufdiagramm an." ID_APPLICATION_PAGE_SWITCHTO "Zeigt das Fenster im Vordergrund an und wechselt zu diesem Task." _____ Modified: trunk/reactos/subsys/system/vmwinst/De.rc --- trunk/reactos/subsys/system/vmwinst/De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/subsys/system/vmwinst/De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -64,7 +64,7 @@ PUSHBUTTON "Die Bildeinstellungen ändern", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Einen anderen Grafiktreiber benutzen", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Den VMware(r) SVGA entfernen", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klichen Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' und en Asssistenten zu beenden.", -1, 25, 93, 225, 12 + LTEXT "Klichen Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' und den Asssistenten zu beenden.", -1, 25, 93, 225, 12 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -72,7 +72,7 @@ CAPTION "Grafikreiberinstallation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Wählen Sie bitte den Grafiktreiber aus,d en Sie verwenden wollen:",-1,25,25,225,15 + LTEXT "Wählen Sie bitte den Grafiktreiber aus, den Sie verwenden wollen:",-1,25,25,225,15 PUSHBUTTON "ReactOS VGA Treiber", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON PUSHBUTTON "ReactOS VBE Treiber (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON LTEXT "Klicken Sie auf 'Fertigstellen' um die Installation fertigzustellen oder auf 'Abbrechen' um das Setup ohne Veränderungen zu beenden.", -1, 25, 93, 225, 20 @@ -83,7 +83,7 @@ CAPTION "Grafikreiberinstallation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "The ReactOS Setup wird Ihren VMware(r) SVGA Treiber entfernen!!!\n\n\nKlicken Sie auf 'Fertigstellen' um den Treiber zu entfernen oder auf 'Abbrechen' um ihn zu lassen.",-1,25,25,225,85 + LTEXT "The ReactOS Setup wird Ihren VMware(r) SVGA Treiber entfernen!!!\n\n\nKlicken Sie auf 'Fertigstellen' um den Treiber zu entfernen oder auf 'Abbrechen' um ihn weiterhin zu verwenden.",-1,25,25,225,85 END STRINGTABLE _____ Modified: trunk/reactos/subsys/system/winlogon/De.rc --- trunk/reactos/subsys/system/winlogon/De.rc 2005-01-09 16:36:57 UTC (rev 12908) +++ trunk/reactos/subsys/system/winlogon/De.rc 2005-01-09 16:44:14 UTC (rev 12909) @@ -7,7 +7,7 @@ CAPTION "Computer herunterfahren" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It is now safe to turn off your computer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Sie können den Computer jetzt ausschalten.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "Neusta&rt", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END @@ -28,7 +28,7 @@ IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..." IDS_RUNNINGSTARTUPSCRIPTS "Startscripts ausführen..." IDS_RUNNINGSHUTDOWNSCRIPTS "Scripte um den Computer herunterzufahren ausführen..." - IDS_APPLYINGYOURPERSONALSETTINGS "Ihr persönlichen Einstellungen setzen..." + IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen setzen..." IDS_RUNNINGLOGOFFSCRIPTS "Scripts um auszuloggen ausführen..." IDS_RUNNINGLOGONSCRIPTS "Scripts um einzuloggen ausführen..." IDS_LOADINGYOURPERSONALSETTINGS "Ihr persönlichen Einstellungen laden..."

1 0

[chorns] 12908: GCC assembler support.
by chorns＠svn.reactos.com 09 Jan '05

09 Jan '05

GCC assembler support. Modified: branches/xmlbuildsystem/reactos/iface/native/genntdll.c Modified: branches/xmlbuildsystem/reactos/iface/native/module.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h _____ Modified: branches/xmlbuildsystem/reactos/iface/native/genntdll.c --- branches/xmlbuildsystem/reactos/iface/native/genntdll.c 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/iface/native/genntdll.c 2005-01-09 16:36:57 UTC (rev 12908) @@ -359,34 +359,34 @@ return(1); } - in = fopen(argv[1],"rb"); - if (in == NULL) - { - perror("Failed to open input file (system calls database)"); - return(1); - } - - out1 = fopen(argv[2],"wb"); + out1 = fopen(argv[1],"wb"); if (out1 == NULL) { perror("Failed to open output file (NTDLL stubs)"); return(1); } - out2 = fopen(argv[3],"wb"); + out2 = fopen(argv[2],"wb"); if (out2 == NULL) { perror("Failed to open output file (NTOSKRNL service table)"); return(1); } - out3 = fopen(argv[4],"wb"); + out3 = fopen(argv[3],"wb"); if (out3 == NULL) { perror("Failed to open output file (NTOSKRNL Zw stubs)"); return(1); } + in = fopen(argv[4],"rb"); + if (in == NULL) + { + perror("Failed to open input file (system calls database)"); + return(1); + } + ret = process(in,out1,out2,out3); rewind(in); ret = makeSystemServiceTable(in, out2); _____ Modified: branches/xmlbuildsystem/reactos/iface/native/module.xml --- branches/xmlbuildsystem/reactos/iface/native/module.xml 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/iface/native/module.xml 2005-01-09 16:36:57 UTC (rev 12908) @@ -1,4 +1,14 @@ <module name="genntdll" type="buildtool"> <include base="genntdll">.</include> <file>genntdll.c</file> + <invoke> + <input> + <inputfile>sysfuncs.lst</inputfile> + </input> + <output> + <outputfile>../../lib/ntdll/napi.c</outputfile> + <outputfile>../../include/ntdll/napi.h</outputfile> + <outputfile>../../ntoskrnl/nt/zw.c</outputfile> + </output> + </invoke> </module> _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-09 16:36:57 UTC (rev 12908) @@ -1,11 +1,13 @@ <module name="ntoskrnl" type="kernelmodedll" extension=".exe"> <dependency>buildno</dependency> + <dependency>genntdll</dependency> <dependency>wmc</dependency> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="__3GB__" /> - <include base="kjs">./include</include> + <define name="__ELF_WORD_SIZE">32</define> + <include base="kjs">include</include> <include base="ntoskrnl">include</include> <library>kjs</library> <invoke module="wmc"> @@ -34,6 +36,7 @@ <file>rtlfunc.c</file> </directory> <directory name="dbg"> +  +  <or>  +  </or> <file>dbgctrl.c</file> <file>errinfo.c</file> @@ -75,11 +83,13 @@ <file>user.c</file> </directory> <directory name="ex"> +  <file>btree.c</file> <file>callback.c</file> <file>fmutex.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-09 16:36:57 UTC (rev 12908) @@ -51,6 +51,15 @@ } string +MingwModuleHandler::GetExtension ( const string& filename ) const +{ + size_t index = filename.find_last_of ( '.' ); + if (index != string::npos) + return filename.substr ( index ); + return ""; +} + +string MingwModuleHandler::ReplaceExtension ( const string& filename, const string& newExtension ) const { @@ -245,6 +254,54 @@ return parameters; } +string +MingwModuleHandler::GenerateGccCommand ( const Module& module, + const string& sourceFilename, + const string& cc ) const +{ + string objectFilename = GetObjectFilename ( sourceFilename ); + return ssprintf ( "%s -c %s -o %s %s\n", + cc.c_str (), + sourceFilename.c_str (), + objectFilename.c_str (), + GenerateGccParameters ( module ).c_str () ); +} + +string +MingwModuleHandler::GenerateGccAssemblerCommand ( const Module& module, + const string& sourceFilename, + const string& cc ) const +{ + string objectFilename = GetObjectFilename ( sourceFilename ); + return ssprintf ( "%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", + cc.c_str (), + sourceFilename.c_str (), + objectFilename.c_str (), + GenerateGccParameters ( module ).c_str () ); +} + +string +MingwModuleHandler::GenerateCommand ( const Module& module, + const string& sourceFilename, + const string& cc ) const +{ + string extension = GetExtension ( sourceFilename ); + if ( extension == ".c" || extension == ".C" ) + return GenerateGccCommand ( module, + sourceFilename, + cc ); + else if ( extension == ".s" || extension == ".S" ) + return GenerateGccAssemblerCommand ( module, + sourceFilename, + cc ); + + throw InvalidOperationException ( __FILE__, + __LINE__, + "Unsupported filename extension '%s' in file '%s'", + extension.c_str (), + sourceFilename.c_str () ); +} + void MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, const string& cc) const @@ -263,11 +320,10 @@ objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, - "\t%s -c %s -o %s %s\n", - cc.c_str (), - sourceFilename.c_str (), - objectFilename.c_str (), - GenerateGccParameters ( module ).c_str () ); + "\t%s\n", + GenerateCommand ( module, + sourceFilename, + cc ).c_str () ); } fprintf ( fMakefile, "\n" ); @@ -502,7 +558,8 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); fprintf ( fMakefile, - "\t${gcc} -Wl,--base-file,%s -o %s %s %s\n", + "\t${gcc} -Wl,--entry,_NtProcessStartup -Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -Wl,--base-file,%s -nostartfiles -o %s %s %s\n", + module.GetBasePath ().c_str (), base_tmp.c_str (), junk_tmp.c_str (), archiveFilename.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-09 16:36:57 UTC (rev 12908) @@ -17,7 +17,8 @@ virtual void Process ( const Module& module ) = 0; protected: - std::string MingwModuleHandler::GetWorkingDirectory () const; + std::string GetWorkingDirectory () const; + std::string GetExtension ( const std::string& filename ) const; std::string ReplaceExtension ( const std::string& filename, const std::string& newExtension ) const; std::string GetModuleArchiveFilename ( const Module& module ) const; @@ -46,6 +47,15 @@ void GenerateGccModuleIncludeVariable ( const Module& module ) const; std::string GenerateGccIncludeParameters ( const Module& module ) const; std::string GenerateGccParameters ( const Module& module ) const; + std::string GenerateGccCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& cc ) const; + std::string GenerateGccAssemblerCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& cc ) const; + std::string GenerateCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& cc ) const; void GenerateObjectFileTargets ( const Module& module, const std::string& cc ) const; void GenerateArchiveTarget ( const Module& module, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-09 16:36:57 UTC (rev 12908) @@ -34,14 +34,32 @@ InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber) + const int linenumber ) { Message = ssprintf ( "%s:%d", filename, linenumber ); } +InvalidOperationException::InvalidOperationException ( const char* filename, + const int linenumber, + const char* message, + ... ) +{ + string errorMessage; + va_list args; + va_start ( args, + message ); + errorMessage = ssvprintf ( message, + args ); + va_end ( args ); + Message = ssprintf ( "%s:%d %s", + filename, + linenumber, + errorMessage.c_str () ); +} + FileNotFoundException::FileNotFoundException ( const string& filename ) : Exception ( "File '%s' not found.", filename.c_str() ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-09 14:16:36 UTC (rev 12907) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-09 16:36:57 UTC (rev 12908) @@ -22,6 +22,10 @@ public: InvalidOperationException ( const char* filename, const int linenumber); + InvalidOperationException ( const char* filename, + const int linenumber, + const char* message, + ... ); };

1 0

[navaraf] 12907: Open the DLL files as FILE_SHARE_READ to prevent sharing violations.
by navaraf＠svn.reactos.com 09 Jan '05

09 Jan '05

Open the DLL files as FILE_SHARE_READ to prevent sharing violations. Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-09 14:11:25 UTC (rev 12906) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-09 14:16:36 UTC (rev 12907) @@ -618,7 +618,7 @@ GENERIC_READ|SYNCHRONIZE, &FileObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) {

1 0

[navaraf] 12906: - Output correct length and page to the controller on DMA transfers.
by navaraf＠svn.reactos.com 09 Jan '05

09 Jan '05

- Output correct length and page to the controller on DMA transfers. - Fix the value of AdapterObject->PagePort. - Don't modify variables we're not supposed to modify in IoMapTransfer. Modified: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/include/hal.h _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-01-09 11:38:07 UTC (rev 12905) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-01-09 14:11:25 UTC (rev 12906) @@ -479,18 +479,13 @@ { PHYSICAL_ADDRESS Address; KIRQL OldIrql; - UCHAR Mode; + ULONG LengthShift = 0; -#if defined(__GNUC__) - Address.QuadPart = 0ULL; -#else Address.QuadPart = 0; -#endif /* Isa System (slave) DMA? */ if (MapRegisterBase && !AdapterObject->MasterDevice) { - KeAcquireSpinLock(&AdapterObject->SpinLock, &OldIrql); /* @@ -510,11 +505,8 @@ * -- Filip Navara, 19/07/2004 */ - /* Get the mode for easier coding */ - Mode = AdapterObject->AdapterMode; - /* if it is a write to the device, copy the caller buffer to the low buffer */ - if ((WriteToDevice) && !((PDMA_MODE)&Mode)->AutoInitialize) + if (WriteToDevice && !AdapterObject->AdapterMode.AutoInitialize) { memcpy(MapRegisterBase, (char*)MmGetSystemAddressForMdl(Mdl) + ((ULONG)CurrentVa - (ULONG)MmGetMdlVirtualAddress(Mdl)), @@ -522,59 +514,73 @@ } /* Writer Adapter Mode, transfer type */ - ((PDMA_MODE)&Mode)->TransferType = (WriteToDevice ? WRITE_TRANSFER : READ_TRANSFER); + AdapterObject->AdapterMode.TransferType = (WriteToDevice ? WRITE_TRANSFER : READ_TRANSFER); - // program up the dma controller, and return - if (!((PDMA_MODE)&Mode)->AutoInitialize) { + /* program up the dma controller, and return */ + if (!AdapterObject->AdapterMode.AutoInitialize) { Address = MmGetPhysicalAddress( MapRegisterBase ); } else { Address = MmGetPhysicalAddress( CurrentVa ); } /* 16-bit DMA has a shifted length */ - if (AdapterObject->Width16Bits) *Length = (*Length >> 1); + if (AdapterObject->Width16Bits) { + LengthShift = 1; + } /* Make the Transfer */ if (AdapterObject->AdapterNumber == 1) { PDMA1_CONTROL DmaControl1 = AdapterObject->AdapterBaseVa; /* For Writing Less Code */ + /* Mask the Channel */ + WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_SETMASK); + /* Reset Register */ WRITE_PORT_UCHAR(&DmaControl1->ClearBytePointer, 0); /* Set the Mode */ - WRITE_PORT_UCHAR(&DmaControl1->Mode, (UCHAR)(Mode)); + WRITE_PORT_UCHAR(&DmaControl1->Mode, AdapterObject->AdapterModeByte); - /* Set the Page Register (apparently always 0 for us if I trust the previous comment) */ + /* Set the Page Register */ + WRITE_PORT_UCHAR(AdapterObject->PagePort, (UCHAR)(Address.u.LowPart >> 16)); + + /* Set the Offset Register (apparently always 0 for us if I trust the previous comment) */ WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); /* Set the Length */ WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length) - 1)); + (UCHAR)((*Length >> LengthShift) - 1)); WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length) - 1) >> 8); + (UCHAR)(((*Length >> LengthShift) - 1) >> 8)); /* Unmask the Channel */ WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); } else { PDMA2_CONTROL DmaControl2 = AdapterObject->AdapterBaseVa; /* For Writing Less Code */ + /* Mask the Channel */ + WRITE_PORT_UCHAR(&DmaControl2->SingleMask, AdapterObject->ChannelNumber | DMA_SETMASK); + /* Reset Register */ WRITE_PORT_UCHAR(&DmaControl2->ClearBytePointer, 0); /* Set the Mode */ - WRITE_PORT_UCHAR(&DmaControl2->Mode, (UCHAR)(Mode)); + WRITE_PORT_UCHAR(&DmaControl2->Mode, AdapterObject->AdapterModeByte); - /* Set the Page Register (apparently always 0 for us if I trust the previous comment) */ + /* Set the Page Register */ + WRITE_PORT_UCHAR(AdapterObject->PagePort, (UCHAR)(Address.u.LowPart >> 16)); + + /* Set the Offset Register (apparently always 0 for us if I trust the previous comment) */ WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); /* Set the Length */ WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length) - 1)); + (UCHAR)((*Length >> LengthShift) - 1)); WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length) - 1) >> 8); + (UCHAR)(((*Length >> LengthShift) - 1) >> 8)); /* Unmask the Channel */ WRITE_PORT_UCHAR(&DmaControl2->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-01-09 11:38:07 UTC (rev 12905) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-01-09 14:11:25 UTC (rev 12906) @@ -122,6 +122,7 @@ DWORD Controller; ULONG MaximumLength; BOOLEAN ChannelSetup; + DMA_MODE DmaMode; DPRINT("Entered Function\n"); @@ -254,16 +255,20 @@ switch (ChannelSelect) { case 0: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel0)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel0) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; case 1: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel1)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel1) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; case 2: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel2)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel2) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; case 3: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel3)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel3) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; } @@ -273,13 +278,16 @@ switch (ChannelSelect) { case 1: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel5)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel5) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; case 2: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel6)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel6) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; case 3: - AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel7)); + AdapterObject->PagePort = (PUCHAR)(FIELD_OFFSET(DMA_PAGE, Channel7) + + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages)); break; } @@ -341,7 +349,8 @@ *((PUCHAR)&ExtendedMode)); } } - /* Do 8/16-bit validation */ + + /* Do 8/16-bit validation */ DPRINT("Validating an Adapter Object\n"); if (!DeviceDescription->Master) { if ((DeviceDescription->DmaWidth == Width8Bits) && (Controller != 1)) { @@ -354,18 +363,19 @@ } } } - UCHAR DmaMode; - DPRINT("Final DMA Request Mode Setting of the Adapter Object\n"); + + DPRINT("Final DMA Request Mode Setting of the Adapter Object\n"); + /* Set the DMA Request Modes */ if (DeviceDescription->Master) { /* This is a cascade request */ - ((PDMA_MODE)&DmaMode)->RequestMode = CASCADE_REQUEST_MODE; + DmaMode.RequestMode = CASCADE_REQUEST_MODE; /* Send the request */ if (AdapterObject->AdapterNumber == 1) { /* Set the Request Data */ WRITE_PORT_UCHAR(&((PDMA1_CONTROL)AdapterObject->AdapterBaseVa)->Mode, - AdapterObject->AdapterMode); + AdapterObject->AdapterModeByte); /* Unmask DMA Channel */ WRITE_PORT_UCHAR(&((PDMA1_CONTROL)AdapterObject->AdapterBaseVa)->SingleM ask, @@ -373,7 +383,7 @@ } else { /* Set the Request Data */ WRITE_PORT_UCHAR(&((PDMA2_CONTROL)AdapterObject->AdapterBaseVa)->Mode, - AdapterObject->AdapterMode); + AdapterObject->AdapterModeByte); /* Unmask DMA Channel */ WRITE_PORT_UCHAR(&((PDMA2_CONTROL)AdapterObject->AdapterBaseVa)->SingleM ask, @@ -381,14 +391,14 @@ } } else if (DeviceDescription->DemandMode) { /* This is a Demand request */ - ((PDMA_MODE)&DmaMode)->RequestMode = DEMAND_REQUEST_MODE; + DmaMode.RequestMode = DEMAND_REQUEST_MODE; } else { /* Normal Request */ - ((PDMA_MODE)&DmaMode)->RequestMode = SINGLE_REQUEST_MODE; + DmaMode.RequestMode = SINGLE_REQUEST_MODE; } /* Auto Initialize Enabled or Not*/ - ((PDMA_MODE)&DmaMode)->AutoInitialize = DeviceDescription->AutoInitialize; + DmaMode.AutoInitialize = DeviceDescription->AutoInitialize; AdapterObject->AdapterMode = DmaMode; return AdapterObject; } _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-01-09 11:38:07 UTC (rev 12905) +++ trunk/reactos/hal/halx86/include/hal.h 2005-01-09 14:11:25 UTC (rev 12906) @@ -354,8 +354,11 @@ UCHAR ChannelNumber; UCHAR AdapterNumber; USHORT DmaPortAddress; - UCHAR AdapterMode; - BOOLEAN NeedsMapRegisters; + union { + DMA_MODE AdapterMode; + UCHAR AdapterModeByte; + }; + BOOLEAN NeedsMapRegisters; BOOLEAN MasterDevice; UCHAR Width16Bits; UCHAR ScatterGather;

1 0

[navaraf] 12905: Allocate correct number of bytes for EABuffer.
by navaraf＠svn.reactos.com 09 Jan '05

09 Jan '05

Allocate correct number of bytes for EABuffer. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-09 08:20:28 UTC (rev 12904) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-09 11:38:07 UTC (rev 12905) @@ -133,7 +133,7 @@ SizeOfEA = SizeOfPacket + sizeof(FILE_FULL_EA_INFORMATION) + AFD_PACKET_COMMAND_LENGTH; /* Set up EA Buffer */ - EABuffer = HeapAlloc(GlobalHeap, 0, (SIZE_T)&SizeOfEA); + EABuffer = HeapAlloc(GlobalHeap, 0, SizeOfEA); EABuffer->NextEntryOffset = 0; EABuffer->Flags = 0; EABuffer->EaNameLength = AFD_PACKET_COMMAND_LENGTH;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs