Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 32593: Prevent some FileLocation copies (in LinkerScript and PchFile classes)
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 09:16:26 2008 New Revision: 32593 URL: http://svn.reactos.org/svn/reactos?rev=3D32593&view=3Drev Log: Prevent some FileLocation copies (in LinkerScript and PchFile classes) Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/linkerscript.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automati= cdependency.cpp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Fri Mar 7 09:16:26 = 2008 @@ -301,7 +301,7 @@ = if ( module.pch !=3D NULL ) { - const FileLocation& pch =3D module.pch->file; + const FileLocation& pch =3D *module.pch->file; File *file =3D new File ( pch.directory, pch.relative_path, pch.name , f= alse, "", true ); files.push_back ( file ); } Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= codeblocks/codeblocks.cpp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Fri Mar 7= 09:16:26 2008 @@ -399,7 +399,7 @@ if ( module.pch !=3D NULL ) { string pch_path =3D Path::RelativeFromDirectory ( - module.pch->file.name, + module.pch->file->name, module.output->relative_path ); = header_files.push_back ( pch_path ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 0= 9:16:26 2008 @@ -1236,8 +1236,8 @@ if ( !module.pch || !use_pch ) return NULL; return new FileLocation ( IntermediateDirectory, - module.pch->file.relative_path, - ReplaceExtension ( module.pch->file.name, "_" += module.name + ".gch" ) ); + module.pch->file->relative_path, + ReplaceExtension ( module.pch->file->name, "_" = + module.name + ".gch" ) ); } = Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", @@ -1649,7 +1649,7 @@ = string linkerScriptArgument; if ( module.linkerScript !=3D NULL ) - linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= module.linkerScript->file ).c_str () ); + linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= *module.linkerScript->file ).c_str () ); else linkerScriptArgument =3D ""; = @@ -1807,7 +1807,7 @@ string cc =3D ( module.host =3D=3D HostTrue ? "${host_gcc}" : "${gcc}" ); string cppc =3D ( module.host =3D=3D HostTrue ? "${host_gpp}" : "${gpp}"= ); = - const FileLocation& baseHeaderFile =3D module.pch->file; + const FileLocation& baseHeaderFile =3D *module.pch->file; CLEAN_FILE ( *pchFilename ); string dependencies =3D backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= msvc/vcprojmaker.cpp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar 7 09:1= 6:26 2008 @@ -427,7 +427,7 @@ { fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=3D\"2\"\r\n" ); string pch_path =3D Path::RelativeFromDirectory ( - module.pch->file.name, + module.pch->file->name, module.output->relative_path ); string::size_type pos =3D pch_path.find_last_of ("/"); if ( pos !=3D string::npos ) Modified: trunk/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/linkersc= ript.cpp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/linkerscript.cpp (original) +++ trunk/reactos/tools/rbuild/linkerscript.cpp Fri Mar 7 09:16:26 2008 @@ -22,13 +22,14 @@ = LinkerScript::LinkerScript ( const XMLElement& node_, const Module& module_, - const FileLocation& file_ ) + const FileLocation *file_ ) : node(node_), module(module_), file(file_) { } = LinkerScript::~LinkerScript () { + delete file; } = void Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.c= pp?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Mar 7 09:16:26 2008 @@ -779,14 +779,14 @@ if ( pos =3D=3D string::npos ) { linkerScript =3D new LinkerScript ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e )= ); + e, *this, new FileLocation ( SourceDirectory, relative_path, e.value, = &e ) ); } else { string dir =3D e.value.substr ( 0, pos ); string name =3D e.value.substr ( pos + 1); linkerScript =3D new LinkerScript ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, = name, &e ) ); + e, *this, new FileLocation ( SourceDirectory, relative_path + sSep + d= ir, name, &e ) ); } subs_invalid =3D true; } @@ -824,14 +824,14 @@ if ( pos =3D=3D string::npos ) { pch =3D new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e )= ); + e, *this, new FileLocation ( SourceDirectory, relative_path, e.value, = &e ) ); } else { string dir =3D e.value.substr ( 0, pos ); string name =3D e.value.substr ( pos + 1); pch =3D new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, = name, &e ) ); + e, *this, new FileLocation ( SourceDirectory, relative_path + sSep + d= ir, name, &e ) ); } subs_invalid =3D true; } @@ -1704,9 +1704,14 @@ PchFile::PchFile ( const XMLElement& node_, const Module& module_, - const FileLocation& file_ ) + const FileLocation *file_ ) : node(node_), module(module_), file(file_) { +} + +PchFile::~PchFile() +{ + delete file; } = void Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h= ?rev=3D32593&r1=3D32592&r2=3D32593&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Mar 7 09:16:26 2008 @@ -639,11 +639,11 @@ public: const XMLElement& node; const Module& module; - FileLocation file; + const FileLocation *file; = LinkerScript ( const XMLElement& node, const Module& module, - const FileLocation& file ); + const FileLocation *file ); ~LinkerScript (); void ProcessXML(); }; @@ -843,12 +843,13 @@ public: const XMLElement& node; const Module& module; - FileLocation file; + const FileLocation *file; = PchFile ( const XMLElement& node, const Module& module, - const FileLocation& file ); + const FileLocation *file ); + ~PchFile(); void ProcessXML(); }; =

1 0

[hpoussin] 32592: Use a .rbuild file instead of a .make file to describe cdmake compilation
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 09:15:23 2008 New Revision: 32592 URL: http://svn.reactos.org/svn/reactos?rev=3D32592&view=3Drev Log: Use a .rbuild file instead of a .make file to describe cdmake compilation Added: trunk/reactos/tools/cdmake/cdmake.rbuild (with props) trunk/reactos/tools/tools.rbuild (with props) Removed: trunk/reactos/tools/cdmake/cdmake.mak Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/tools.mak Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuil= d?rev=3D32592&r1=3D32591&r2=3D32592&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Fri Mar 7 09:15:23 2008 @@ -63,5 +63,8 @@ <directory name=3D"subsystems"> <xi:include href=3D"subsystems/subsystems.rbuild" /> </directory> + <directory name=3D"tools"> + <xi:include href=3D"tools/tools.rbuild" /> + </directory> = </group> Removed: trunk/reactos/tools/cdmake/cdmake.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.m= ak?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak (removed) @@ -1,51 +1,0 @@ -CDMAKE_BASE =3D $(TOOLS_BASE_)cdmake -CDMAKE_BASE_ =3D $(CDMAKE_BASE)$(SEP) -CDMAKE_INT =3D $(INTERMEDIATE_)$(CDMAKE_BASE) -CDMAKE_INT_ =3D $(CDMAKE_INT)$(SEP) -CDMAKE_OUT =3D $(OUTPUT_)$(CDMAKE_BASE) -CDMAKE_OUT_ =3D $(CDMAKE_OUT)$(SEP) - -$(CDMAKE_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CDMAKE_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CDMAKE_TARGET =3D \ - $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) - -CDMAKE_SOURCES =3D $(addprefix $(CDMAKE_BASE_), \ - cdmake.c \ - llmosrt.c \ - ) - -CDMAKE_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(CDMAKE_SOURCES:.c=3D.o)) - -CDMAKE_HOST_CFLAGS =3D -Iinclude $(TOOLS_CFLAGS) - -CDMAKE_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -.PHONY: cdmake -cdmake: $(CDMAKE_TARGET) - -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) | $(CDMAKE_OUT) - $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@ - -$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c | $(CDMAKE_INT) - $(ECHO_CC) - ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ - -$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c | $(CDMAKE_INT) - $(ECHO_CC) - ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: cdmake_clean -cdmake_clean: - -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) -clean: cdmake_clean Added: trunk/reactos/tools/cdmake/cdmake.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.r= build?rev=3D32592&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cdmake/cdmake.rbuild (added) +++ trunk/reactos/tools/cdmake/cdmake.rbuild Fri Mar 7 09:15:23 2008 @@ -1,0 +1,6 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"cdmake" type=3D"buildtool"> + <file>cdmake.c</file> + <file>llmosrt.c</file> +</module> Propchange: trunk/reactos/tools/cdmake/cdmake.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/director= y.cpp?rev=3D32592&r1=3D32591&r2=3D32592&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Fri Mar 7 09:15:23 2008 @@ -211,18 +211,22 @@ = if ( escapedName.size() > 0 ) { - fprintf ( f, - "%s%c%s: | %s\n", - parent.c_str (), - cSep, - escapedName.c_str (), - parent.c_str () ); - - fprintf ( f, - "\t$(ECHO_MKDIR)\n" ); - - fprintf ( f, - "\t${mkdir} $@\n" ); + if ( ! (escapedName =3D=3D "tools" && + ( parent =3D=3D "$(OUTPUT)" || parent =3D=3D "$(INTERMEDIATE)" ) ) ) + { + fprintf ( f, + "%s%c%s: | %s\n", + parent.c_str (), + cSep, + escapedName.c_str (), + parent.c_str () ); + + fprintf ( f, + "\t$(ECHO_MKDIR)\n" ); + + fprintf ( f, + "\t${mkdir} $@\n" ); + } = path =3D parent + sSep + escapedName; } Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev= =3D32592&r1=3D32591&r2=3D32592&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Fri Mar 7 09:15:23 2008 @@ -43,7 +43,6 @@ include tools/bin2c.mak include tools/buildno/buildno.mak include tools/cabman/cabman.mak -include tools/cdmake/cdmake.mak include tools/gendib/gendib.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak Added: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re= v=3D32592&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/tools.rbuild (added) +++ trunk/reactos/tools/tools.rbuild Fri Mar 7 09:15:23 2008 @@ -1,0 +1,7 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi=3D"http://www.w3.org/2001/XInclude"> +<directory name=3D"cdmake"> + <xi:include href=3D"cdmake/cdmake.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/tools/tools.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[arty] 32591: Fix us back up to use PE-COFF again. This is getting ridiculous, but I now really understand everything, and freeldr moved the image mapping code to a common area.
by arty＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: arty Date: Fri Mar 7 07:53:55 2008 New Revision: 32591 URL: http://svn.reactos.org/svn/reactos?rev=3D32591&view=3Drev Log: Fix us back up to use PE-COFF again. This is getting ridiculous, but I now really understand everything, and freeldr moved the image mapping code to a common area. Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/section.h (with props) Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.h trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/util.h Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/M= akefile?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile Fri Mar 7 07:53:55 2008 @@ -1,6 +1,6 @@ elfpe: argparse.cpp argparse.h header.cpp header.h \ objectfile.cpp objectfile.h util.cpp util.h pedef.h \ - elfpe.cpp + elfpe.cpp reloc.cpp coff.cpp exports.cpp imports.cpp g++ -g -o $@ $^ -lelf = clean: Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/c= off.cpp?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,42 @@ +#include "coff.h" + +PECoffExecutable::PECoffExecutable +(const ElfObjectFile &elf, const std::string &file, uint32_t filealign) + : elf(elf), tempFile(file), filealign(filealign) +{ + int i; + FILE *f =3D fopen(tempFile.c_str(), "wb"); + if (!f) return; + + // Write PE Header + const ElfObjectFile::Section &section =3D *elf.getNamedSection(".pehea= der"); + fwrite(section.getSectionData(), 1, section.logicalSize(), f); + = + // Write out sections + uint32_t physSize; + uint32_t bytes =3D 0; + + for (i =3D 1; i < elf.getNumSections(); i++) + { + const ElfObjectFile::Section &section =3D elf.getSection(i); + if (section.getName() =3D=3D ".peheader") continue; + if (section.getType() !=3D SHT_NOBITS && section.getFlags() & SHF_ALLOC) + { + physSize =3D roundup(section.logicalSize(), filealign); +#if 0 + printf("P %08x:%08x %s\n", = + (int)ftell(f), + section.logicalSize(), = + section.getName().c_str()); +#endif + bytes =3D fwrite(section.getSectionData(), 1, section.logicalSize(), = f); + while(bytes++ < physSize) fputc(0, f); + } + } + fclose(f); +} + +void PECoffExecutable::Write(const std::string &resultFile) +{ + rename(tempFile.c_str(), resultFile.c_str()); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/c= off.h?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,22 @@ +#ifndef COMPDVR_COFF_H +#define COMPDVR_COFF_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +class PECoffExecutable { +public: + PECoffExecutable(const ElfObjectFile &elf, const std::string &tmpFile,= uint32_t filealign); + void Write(const std::string &resultFile); + +private: + const ElfObjectFile &elf; + std::string tempFile; + uint32_t filealign; +}; + +#endif//COMPDVR_COFF_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e= lfpe.cpp?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp Fri Mar 7 07:53:55 2008 @@ -12,8 +12,13 @@ #include "objectfile.h" #include "header.h" #include "argparse.h" +#include "reloc.h" +#include "coff.h" +#include "exports.h" +#include "imports.h" = #define TYPE_PEHEADER (SHT_LOOS + 1) +#define TYPE_PERELOC (SHT_LOOS + 2) = int execute_command( bool verbose, const std::vector<std::string> &args ) { @@ -55,6 +60,26 @@ } } args.insert(args.begin(), the_definition + "=3D" + body); +} + +std::vector<uint8_t> = +ProcessRelocSections +(const ElfObjectFile &eof, = + uint32_t imageBase, + const std::vector<section_mapping_t> &rvas) +{ + std::vector<uint8_t> relocData; + uint32_t relocAddr =3D (uint32_t)-1; + int i, j; + for (i =3D 1; i < eof.getNumSections(); i++) + { + const ElfObjectFile::Section &section =3D eof.getSection(i); + if (section.getType() =3D=3D SHT_REL || + section.getType() =3D=3D SHT_RELA) + SingleRelocSection(eof, section, rvas, relocData, imageBase, r= elocAddr); + } + AddReloc(relocData, 0, relocAddr, 0, 0); + return relocData; } = int main( int argc, char **argv ) { @@ -100,6 +125,11 @@ if(entry_point.size() && entry_point[0] =3D=3D '_') { entry_point =3D entry_point.substr(1); + } + size_t at =3D entry_point.find('@'); + if (at !=3D std::string::npos) + { + entry_point =3D entry_point.substr(0, at); } if( !compile_only ) { @@ -142,7 +172,7 @@ if( verbose ) gcc_args_str.insert(gcc_args_str.begin(),"-v"); if (!compile_only) { - if( is_dll ) gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); + //gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-q"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-d"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,--start-group"); @@ -160,30 +190,56 @@ } if (!compile_only) gcc_args_str.insert(gcc_args_str.end(), "-Wl,--end-= group"); = + std::vector<section_mapping_t> sectionRvas; if ( !(status =3D execute_command( verbose, gcc_args_str )) && !compil= e_only && mkheader ) { /* Ok fixup the elf object file */ ElfObjectFile eof(output_file); + if(!eof) exit(1); = + = + uint32_t imageSize; const ElfObjectFile::Symbol *entry_sym; - - if(!eof) exit(1); - entry_sym =3D eof.getNamedSymbol(entry_point); - + = + /* This computes the section RVAs */ ElfPeHeader header - (strtoul(image_base.c_str(), 0, 0), - strtoul(section_align.c_str(), 0, 0), - strtoul(file_align.c_str(), 0, 0), - entry_sym, - 0x10000, - 0x100000, - 0x10000, - 0x100000, - atoi(subsystem.c_str()), - is_dll, - &eof); - - eof.addSection(".peheader", header.getData(), TYPE_PEHEADER); + (strtoul(image_base.c_str(), 0, 0), + strtoul(section_align.c_str(), 0, 0), + strtoul(file_align.c_str(), 0, 0), + entry_sym, + 0x10000, + 0x100000, + 0x10000, + 0x100000, + atoi(subsystem.c_str()), + is_dll, + &eof); + = + // Get base section layout + imageSize =3D header.getSectionRvas(sectionRvas); + + // Add relocation info + std::vector<uint8_t> relocSection =3D = + ProcessRelocSections + (eof, strtoul(image_base.c_str(), 0, 0), sectionRvas); + eof.addSection(".reloc", relocSection, SHT_PROGBITS); + eof.update(); + + // Recompute RVAs after adding reloc section + imageSize =3D header.getSectionRvas(sectionRvas); + header.createHeaderSection(sectionRvas, imageSize); + eof.addSection(".peheader", header.getData(), SHT_PROGBITS); + eof.update(); + + // Fixup exports + ExportFixup(eof, sectionRvas); + + // Fixup imports + ImportFixup(eof, sectionRvas); + eof.update(); + + PECoffExecutable cof(eof, output_file + ".tmp", strtoul(file_align= .c_str(), 0, 0)); + cof.Write(output_file); } = return status; Added: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e= xports.cpp?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,46 @@ +#include "exports.h" +#include "objectfile.h" +#include "section.h" + +void ExportFixup +(ElfObjectFile &eof, + const std::vector<section_mapping_t> &mapping) +{ + const ElfObjectFile::Section *exportSect =3D eof.getNamedSection(".eda= ta"); + if (!exportSect) return; + uint8_t *exportTable =3D exportSect->getSectionData(); + // Fixup the words of the export directory + uint8_t *exportTarget =3D exportTable; + uint32_t exportRva =3D FindRVA(mapping, exportSect->getNumber()); + + uint32_t nameRva, ordinalBase, numberOfAddress, numberOfNames, address= Rva, + namePtrRva, ordinalTableRva; + int i; + + le32write_postinc(exportTarget, be32read(exportTarget)); + le32write_postinc(exportTarget, be32read(exportTarget)); + le16write_postinc(exportTarget, be16read(exportTarget)); + le16write_postinc(exportTarget, be16read(exportTarget)); + le32write_postinc(exportTarget, (nameRva =3D be32read(exportTarget))); + le32write_postinc(exportTarget, (ordinalBase =3D be32read(exportTarget= ))); + le32write_postinc(exportTarget, (numberOfAddress =3D be32read(exportTa= rget))); + le32write_postinc(exportTarget, (numberOfNames =3D be32read(exportTarg= et))); + le32write_postinc(exportTarget, (addressRva =3D be32read(exportTarget)= )); + le32write_postinc(exportTarget, (namePtrRva =3D be32read(exportTarget)= )); + le32write_postinc(exportTarget, (ordinalTableRva =3D be32read(exportTa= rget))); + = + // Address Table + exportTarget =3D exportTable + addressRva - exportRva; + for (i =3D 0; i < numberOfAddress; i++) + le32write_postinc(exportTarget, be32read(exportTarget)); + = + // Name table + exportTarget =3D exportTable + namePtrRva - exportRva; + for (i =3D 0; i < numberOfNames; i++) + le32write_postinc(exportTarget, be32read(exportTarget)); + + // Ordinal table + exportTarget =3D exportTable + ordinalTableRva - exportRva; + for (i =3D 0; i < numberOfAddress; i++) + le16write_postinc(exportTarget, be16read(exportTarget)); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e= xports.h?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,14 @@ +#ifndef COMPDVR_EXPORTS_H +#define COMPDVR_EXPORTS_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +void ExportFixup +(ElfObjectFile &eof, const std::vector<section_mapping_t> &mapping); + +#endif//COMPDVR_EXPORTS_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/h= eader.cpp?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp Fri Mar 7 07:53:55 2008 @@ -16,6 +16,7 @@ ElfObjectFile *eof) : imagebase(imagebase), sectionalign(sectionalign), + filealign(filealign), stackreserve(stackreserve), stackcommit(stackcommit), heapreserve(heapreserve), @@ -25,19 +26,15 @@ eof(eof) { data.resize(computeSize()); - createHeaderSection(); } = int ElfPeHeader::computeSize() const { - return sectionalign; /* We'll compute it for real later */ -} - -void ElfPeHeader::createHeaderSection() -{ - std::vector<section_mapping_t> sectionRvaSet; - uint32_t imageSize =3D getSectionRvas(sectionRvaSet); - + return roundup(0x80 + 0x200, filealign); /* We'll compute it for real = later */ +} + +void ElfPeHeader::createHeaderSection(const std::vector<section_mapping_t>= &sectionRvaSet, uint32_t imageSize) +{ data[0] =3D 'M'; data[1] =3D 'Z'; uint8_t *dataptr =3D &data[0x3c]; uint32_t coffHeaderSize, optHeaderSizeMember; @@ -88,7 +85,7 @@ le32pwrite_postinc(dataptr, getResourceInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getExceptionInfo()); le32pwrite_postinc(dataptr, getSecurityInfo()); - le32pwrite_postinc(dataptr, getRelocInfo()); + le32pwrite_postinc(dataptr, getRelocInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getDebugInfo()); le32pwrite_postinc(dataptr, getDescrInfo()); le32pwrite_postinc(dataptr, getMachInfo()); @@ -101,28 +98,37 @@ // size, but leaving out the other info. We write the section name // truncated into the name field and leave the section id in the // physical address bit + + uint32_t paddr =3D computeSize(); for (int i =3D 0; i < sectionRvaSet.size(); i++) { section_mapping_t mapping =3D sectionRvaSet[i]; const ElfObjectFile::Section *section =3D mapping.section; std::string name =3D section->getName(); uint32_t size =3D section->logicalSize(); + uint32_t psize =3D = + section->getType() =3D=3D SHT_NOBITS ? 0 : roundup(size, filealign); uint32_t rva =3D mapping.rva; for (int j =3D 0; j < 8; j++) { *dataptr++ =3D j < name.size() ? name[j] : '\000'; } + +#if 0 + printf("V %08x:%08x P %08x:%08x %s\n", + rva, size, paddr, psize, name.c_str()); +#endif + le32write_postinc(dataptr, size); le32write_postinc(dataptr, rva); - le32write_postinc(dataptr, size); - // Note: we put the index in the offset slot so we can find the - // real offset later in the loader - le32write_postinc(dataptr, sectionRvaSet[i].index); + le32write_postinc(dataptr, psize); + le32write_postinc(dataptr, paddr); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); // XXX Figure out the real flags le32write_postinc(dataptr, IMAGE_SCN_CNT_CODE); + paddr +=3D psize; } } = @@ -132,14 +138,17 @@ { uint32_t start =3D computeSize(); uint32_t limit =3D start; - for(int i =3D 0; i < eof->getNumSections(); i++) { + + rvas.clear(); + + for(int i =3D 1; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section &sect =3D eof->getSection(i); if(sect.getFlags() & SHF_ALLOC) { limit =3D roundup(start + sect.logicalSize(), sectionalign); #if 0 - fprintf(stderr, "rva[%02d:%s] =3D (%x %x %d)\n", - rvas.size(), sect.getName().c_str(), &sect, start, i); + fprintf(stderr, "rva[%02d:-%20s] =3D (%08x %08x %08x %d)\n", + rvas.size(), sect.getName().c_str(), start, sect.getStartRva(), sect.lo= gicalSize(), i); #endif rvas.push_back(section_mapping_t(&sect, start, i)); } @@ -198,9 +207,9 @@ return std::make_pair(0,0); } = -u32pair_t ElfPeHeader::getRelocInfo() const -{ - return std::make_pair(0,0); +u32pair_t ElfPeHeader::getRelocInfo(const std::vector<section_mapping_t> &= mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".reloc"); } = u32pair_t ElfPeHeader::getDebugInfo() const Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/h= eader.h?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.h Fri Mar 7 07:53:55 2008 @@ -6,18 +6,7 @@ #include "pedef.h" #include "util.h" #include "objectfile.h" - -typedef struct section_mapping_t { - const ElfObjectFile::Section *section; - uint32_t rva; - int index; - - section_mapping_t - (const ElfObjectFile::Section *sect, uint32_t rva, int index) : - section(sect), rva(rva), index(index) { } - section_mapping_t(const section_mapping_t &other) : - section(other.section), rva(other.rva), index(other.index) { } -} section_mapping_t; +#include "section.h" = class ElfPeHeader { public: @@ -34,10 +23,10 @@ bool dll, ElfObjectFile *eof); const ElfObjectFile::secdata_t &getData() const; + uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; + void createHeaderSection(const std::vector<section_mapping_t> &rvas, u= int32_t imageSize); = private: - void createHeaderSection(); - uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; uint32_t getEntryPoint(const std::vector<section_mapping_t> &rvas, con= st ElfObjectFile::Symbol *entry) const; int computeSize() const; int getExeFlags() const { return 0; } @@ -47,7 +36,7 @@ u32pair_t getResourceInfo(const std::vector<section_mapping_t> &rvas) = const; u32pair_t getExceptionInfo() const; u32pair_t getSecurityInfo() const; - u32pair_t getRelocInfo() const; + u32pair_t getRelocInfo(const std::vector<section_mapping_t> &rvas) con= st; u32pair_t getDebugInfo() const; u32pair_t getDescrInfo() const; u32pair_t getMachInfo() const; Added: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/i= mports.cpp?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,43 @@ +#include "imports.h" +#include "objectfile.h" +#include "section.h" + +void ImportFixup +(ElfObjectFile &eof, + const std::vector<section_mapping_t> &mapping) +{ + const ElfObjectFile::Section *importSect =3D eof.getNamedSection(".ida= ta"); + if (!importSect) return; + uint8_t *importTable =3D importSect->getSectionData(); + uint8_t *importTarget =3D importTable, *tableAddr, *hintName; + uint32_t importRva =3D FindRVA(mapping, importSect->getNumber()); + uint32_t tableRva, iatRva, hintNameEntry; + + do + { + le32write_postinc(importTarget, (tableRva =3D be32read(importTarge= t))); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, (iatRva =3D be32read(importTarget)= )); + + if (!tableRva) return; + + // Rewrite the import lookup table + tableAddr =3D importTable + tableRva - importRva; + while (hintNameEntry =3D be32read(tableAddr)) + { + le32write_postinc(tableAddr, hintNameEntry); + // Rewrite the hint/name element + //hintName =3D importTable + hintNameEntry - importRva; + //le16write(hintName, be16read(hintName)); + } + + // Do the second address table + tableAddr =3D importTable + iatRva - importRva; + while (hintNameEntry =3D be32read(tableAddr)) + { + le32write_postinc(tableAddr, hintNameEntry); + } + } while(1); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/i= mports.h?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,14 @@ +#ifndef COMPDVR_IMPORTS_H +#define COMPDVR_IMPORTS_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +void ImportFixup +(ElfObjectFile &eof, const std::vector<section_mapping_t> &mapping); + +#endif//COMPDVR_IMPORTS_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/o= bjectfile.cpp?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp Fri Mar 7 07:53:55 20= 08 @@ -3,43 +3,71 @@ #include "util.h" #include "objectfile.h" = -ElfObjectFile::ElfObjectFile(const std::string &filename) : fd(-1) +ElfObjectFile::ElfObjectFile(const std::string &filename) : fd(-1), filena= me(filename) { - Elf_Scn *s =3D 0; + init(); +} + +void ElfObjectFile::init() +{ Elf32_Ehdr *ehdr; - Section *sect; + elfHeader =3D NULL; + lastStr =3D NULL; + fd =3D open(filename.c_str(), O_RDWR, 0); if(fd >=3D 0) { - if(elf_version(EV_CURRENT) =3D=3D EV_NONE) { - // Old version - return; - } - elfHeader =3D elf_begin(fd, ELF_C_RDWR, (Elf*)0); - if(elf_kind(elfHeader) !=3D ELF_K_ELF) { - // Didn't get an elf object file + if(elf_version(EV_CURRENT) =3D=3D EV_NONE) { + // Old version + return; + } + elfHeader =3D elf_begin(fd, ELF_C_RDWR, (Elf*)0); + if(elf_kind(elfHeader) !=3D ELF_K_ELF) { + // Didn't get an elf object file elfHeader =3D NULL; - return; - } - ehdr =3D elf32_getehdr(elfHeader); - shnum =3D ehdr->e_shnum; - phnum =3D ehdr->e_phnum; - shstrndx =3D ehdr->e_shstrndx; - /* Populate section table */ - for(size_t i =3D 0; i < shnum; i++) - { - s =3D elf_nextscn(elfHeader, s); - if(!s) break; - sect =3D new Section(*this, i, s); - sections.push_back(sect); - sections_by_name.insert(std::make_pair(sect->getName(), sect)); - } + return; + } = - populateSymbolTable(); + ehdr =3D elf32_getehdr(elfHeader); + phnum =3D ehdr->e_phnum; + shstrndx =3D ehdr->e_shstrndx; + + populateSections(); + populateSymbolTable(); + } +} + +void ElfObjectFile::populateSections() +{ + Section *sect; + Elf32_Ehdr *ehdr; + Elf_Scn *s =3D 0; + + ehdr =3D elf32_getehdr(elfHeader); + shnum =3D ehdr->e_shnum; + = + /* ABS section */ + sections.clear(); + sections_by_name.clear(); + sections.push_back(new Section(*this, 0, NULL)); + = + /* Populate section table */ + for(size_t i =3D 1; i < shnum; i++) + { + s =3D elf_nextscn(elfHeader, s); + if(!s) break; + sect =3D new Section(*this, i, s); + sections.push_back(sect); + sections_by_name.insert(std::make_pair(sect->getName(), sect)); } } = ElfObjectFile::~ElfObjectFile() +{ + finalize(); +} + +void ElfObjectFile::finalize() { if(elfHeader) elf_end(elfHeader); if(fd >=3D 0) close(fd); @@ -55,7 +83,10 @@ Elf32_Sym *sym; Symbol *ourSym; = - for( i =3D 0; i < getNumSections(); i++ ) { + symbols.clear(); + symbols_by_name.clear(); + + for( i =3D 1; i < getNumSections(); i++ ) { type =3D getSection(i).getType(); link =3D getSection(i).getLink(); if( (type =3D=3D SHT_SYMTAB) || (type =3D=3D SHT_DYNSYM) ) { @@ -85,7 +116,7 @@ /* Create data for the new section */ Elf_Data *edata =3D elf_newdata(newsect), *strdata =3D elf_getdata(str= sect, 0), *newstrdata =3D elf_newdata(strsect); - edata->d_align =3D 0x1000; + edata->d_align =3D 1; edata->d_size =3D data.size(); edata->d_off =3D 0; edata->d_type =3D ELF_T_BYTE; @@ -93,10 +124,12 @@ edata->d_buf =3D malloc(edata->d_size); memcpy(edata->d_buf, &data[0], edata->d_size); /* Add the name of the new section to the string table */ - newstrdata->d_off =3D strdata->d_off + strdata->d_size; + if (!lastStr) lastStr =3D strdata; + newstrdata->d_off =3D lastStr->d_off + lastStr->d_size; newstrdata->d_size =3D name.size() + 1; newstrdata->d_align =3D 1; newstrdata->d_buf =3D (void *)name.c_str(); + lastStr =3D newstrdata; /* Finish the section */ shdr->sh_name =3D newstrdata->d_off; shdr->sh_type =3D type; Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/o= bjectfile.h?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h Fri Mar 7 07:53:55 2008 @@ -78,11 +78,15 @@ = uint8_t *getSectionData() const { if(!have_data) { - data =3D *elf_getdata(section, NULL); + data =3D *elf_getdata(section, NULL); have_data =3D true; } return (uint8_t *)data.d_buf; } + + void setDirty() const { + elf_flagscn(section, ELF_C_SET, ELF_F_DIRTY); + } = private: const ElfObjectFile *obj; @@ -109,18 +113,30 @@ const Section *getNamedSection(const std::string &name) const; const Symbol &getSymbol(int n) const { return *symbols[n]; } const Symbol *getNamedSymbol(const std::string &symname) const; + void update() = + { = + elf_flagelf(elfHeader, ELF_C_SET, ELF_F_DIRTY); + elf_update(elfHeader, ELF_C_WRITE); = + finalize(); + init(); + } = private: int fd; int shnum, phnum; int shstrndx; Elf *elfHeader; + Elf_Data *lastStr; + std::string filename; std::vector<Section*> sections; std::map<std::string, const Section *> sections_by_name; std::vector<Symbol*> symbols; std::map<std::string, const Symbol *> symbols_by_name; = + void init(); + void finalize(); void populateSymbolTable(); + void populateSections(); }; = #endif//COMPDVR_ELFOBJECT_H Added: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/r= eloc.cpp?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,192 @@ +#include "objectfile.h" +#include "reloc.h" +#include "section.h" +#include "util.h" +#include <assert.h> + +void AddReloc +(std::vector<uint8_t> &reloc, = + uint32_t imageBase, + uint32_t &relocAddrOff, + uint32_t newReloc, int type) +{ + size_t oldsize =3D reloc.size(), oddsize =3D oldsize & sizeof(uint16_t= ); + uint8_t *relptr; + if (relocAddrOff =3D=3D (uint32_t)-1) + { + reloc.resize(sizeof(uint32_t) * 2 + sizeof(uint16_t)); + relocAddrOff =3D 0; + *GetRelocTarget(reloc, relocAddrOff) =3D newReloc & ~0xfff; + relptr =3D &reloc[2 * sizeof(uint32_t)]; + } + else if (type !=3D -1 && ((newReloc & ~0xfff) !=3D *GetRelocTarget(rel= oc, relocAddrOff))) + { + reloc.resize(reloc.size() + 2 * sizeof(uint32_t) + sizeof(uint16_t= ) + oddsize); + relptr =3D &reloc[oldsize + oddsize]; + uint8_t *oldptr =3D (uint8_t*)GetRelocTarget(reloc, relocAddrOff); + le32write_postinc(oldptr, *GetRelocTarget(reloc, relocAddrOff) - imageBas= e); + le32write_postinc(oldptr, relptr - &reloc[0] - relocAddrOff); + relocAddrOff =3D relptr - &reloc[0]; + *GetRelocTarget(reloc, relocAddrOff) =3D newReloc & ~0xfff; + relptr +=3D sizeof(uint32_t); + le32write_postinc(relptr, 0); + } + else + { + reloc.resize(reloc.size() + sizeof(uint16_t)); + relptr =3D &reloc[oldsize]; + } + + le16write(relptr, type << 12 | newReloc & 0xfff); +} + +#define ADDR24_MASK 0xfc000003 + +void SingleReloc +(const ElfObjectFile &eof, + uint8_t *relptr, int relocsize, = + const std::vector<section_mapping_t> &rvas, + const ElfObjectFile::Section &symbols, + const ElfObjectFile::Section &target, + std::vector<uint8_t> &relocSect, + uint32_t imageBase, + uint32_t &relocAddr) +{ + int j; + Elf32_Rela reloc =3D { 0 }; + Elf32_Sym symbol; + uint8_t *symptr; + uint32_t S,A,P; + = + /* Get the reloc */ + memcpy(&reloc, relptr, relocsize); +#if 0 + printf("RELOC: offset %08x info %08x addend %08x [%02x %06x]\n", = + reloc.r_offset, reloc.r_info, reloc.r_addend, + ELF32_R_TYPE(reloc.r_info), ELF32_R_SYM(reloc.r_info)); +#endif + = + /* Get the symbol */ + symptr =3D &symbols.getSectionData() + [ELF32_R_SYM(reloc.r_info) * sizeof(symbol)]; + memcpy(&symbol, symptr, sizeof(symbol)); + + /* Compute addends */ + S =3D symbol.st_value - = + eof.getSection(symbol.st_shndx).getStartRva() + = + FindRVA(rvas, symbol.st_shndx) + = + imageBase; + A =3D reloc.r_addend; + P =3D reloc.r_offset + FindRVA(rvas, target.getNumber()) - target.getS= tartRva(); + //printf("start of target elf section %08x\n", target.getStartRva()); + +#if 0 + printf("SYMBOL: value %08x size %08x info %02x other %02x shndx %08x t= otal %08x\n", + symbol.st_value, + symbol.st_size, + symbol.st_info, + symbol.st_other, + symbol.st_shndx, + S); +#endif + + uint8_t *Target =3D TargetPtr(rvas, target, P); + uint8_t *tword =3D TargetPtr(rvas, target, P & ~3); + uint8_t oldBytes[sizeof(uint32_t)]; + memcpy(oldBytes, tword, sizeof(oldBytes)); + = + P +=3D imageBase; + + switch (ELF32_R_TYPE(reloc.r_info)) + { + case R_PPC_NONE: + break; + case R_PPC_ADDR32: + //printf("ADDR32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A); + AddReloc(relocSect, imageBase, relocAddr, P, 3); + break; + case R_PPC_REL32: + //printf("REL32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A - P); + break; + case R_PPC_UADDR32: /* Special: Treat as RVA */ + //printf("UADDR32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A - imageBase); + break; + case R_PPC_REL24: + //printf("REL24 S %08x A %08x P %08x\n", S, A, P); + //printf("New Offset: %08x to Addr %08x from %08x\n", S+A-P, S+A, = P); + be32write(Target, ((S+A-P) & ~ADDR24_MASK) | (be32read(Target) & A= DDR24_MASK)); + break; + case R_PPC_ADDR16_LO: + //printf("ADDR16_LO S %08x A %08x P %08x\n", S, A, P); + be16write(Target, S + A); + AddReloc(relocSect, imageBase, relocAddr, P, 2); + break; + case R_PPC_ADDR16_HA: + //printf("ADDR16_HA S %08x A %08x P %08x\n", S, A, P); + be16write(Target, (S + A + 0x8000) >> 16); + AddReloc(relocSect, imageBase, relocAddr, P, 4); + AddReloc(relocSect, imageBase, relocAddr, S + A, -1); + break; + default: + break; + } + + uint8_t newBytes[sizeof(uint32_t)]; + memcpy(newBytes, tword, sizeof(newBytes)); +#if 0 + printf("Reloc changed %08x [%02x %02x %02x %02x] --> [%02x %02x %02x %= 02x]\n", + P & ~3, + oldBytes[0], + oldBytes[1], + oldBytes[2], + oldBytes[3], + newBytes[0], + newBytes[1], + newBytes[2], + newBytes[3]); +#endif +} + +void SingleRelocSection +(const ElfObjectFile &obf, = + const ElfObjectFile::Section &section, + const std::vector<section_mapping_t> &rvas, + std::vector<uint8_t> &relocData, + uint32_t imageBase, + uint32_t &relocAddr) +{ + Elf32_Rela reloc =3D { }; + uint8_t *Target; + int numreloc, relstart, relsize, j; + uint8_t *sectionData =3D section.getSectionData(); + = + relsize =3D section.getType() =3D=3D SHT_RELA ? 12 : 8; + numreloc =3D section.logicalSize() / relsize; + const ElfObjectFile::Section &targetSection =3D obf.getSection(section= .getInfo()); + + /* Don't relocate non-program section */ + if (!(targetSection.getFlags() & SHF_ALLOC)) + return; + + targetSection.setDirty(); + + /* Get the symbol section */ + const ElfObjectFile::Section &symbolSection =3D obf.getSection(section= .getLink()); + + for(j =3D 0; j < numreloc; j++) + { + SingleReloc + (obf, + sectionData + j * relsize, = + relsize, + rvas, + symbolSection, + targetSection, + relocData, + imageBase, + relocAddr); + } +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/r= eloc.h?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,22 @@ +#ifndef _ELFPE_RELOC_H +#define _ELFPE_RELOC_H + +#include <vector> +#include "section.h" +#include "objectfile.h" + +void SingleRelocSection +(const ElfObjectFile &obf, + const ElfObjectFile::Section &section, + const std::vector<section_mapping_t> &rvas, + std::vector<uint8_t> &relocData, + uint32_t imageBase, + uint32_t &relocAddr); + +void AddReloc +(std::vector<uint8_t> &reloc, = + uint32_t imageBase, + uint32_t &relocAddrOff, + uint32_t newReloc, int type); + +#endif//_ELFPE_RELOC_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/section.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/s= ection.h?rev=3D32591&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/section.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/section.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,16 @@ +#ifndef COMPDVR_SECTION_H +#define COMPDVR_SECTION_H + +typedef struct section_mapping_t { + const ElfObjectFile::Section *section; + uint32_t rva; + int index; + = + section_mapping_t + (const ElfObjectFile::Section *sect, uint32_t rva, int index) : + section(sect), rva(rva), index(index) { } + section_mapping_t(const section_mapping_t &other) : + section(other.section), rva(other.rva), index(other.index) { } +} section_mapping_t; + +#endif//COMPDVR_SECTION_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/section.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/u= til.cpp?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp Fri Mar 7 07:53:55 2008 @@ -1,4 +1,5 @@ #include "util.h" +#include <assert.h> = uint32_t roundup(uint32_t value, int round) { @@ -34,7 +35,29 @@ le32write_postinc(dataptr, value.second); } = -uint16_t be16read(uint8_t *dataptr) +void be16write_postinc(uint8_t *&dataptr, uint16_t value) +{ + *dataptr++ =3D value >> 8; + *dataptr++ =3D value; +} + +void be16write(uint8_t *dataptr, uint16_t value) +{ + be16write_postinc(dataptr, value); +} + +void be32write_postinc(uint8_t *&dataptr, uint32_t value) +{ + be16write_postinc(dataptr, value >> 16); + be16write_postinc(dataptr, value); +} + +void be32write(uint8_t *dataptr, uint32_t value) +{ + be32write_postinc(dataptr, value); +} + +uint16_t be16read(uint8_t *dataptr) = { return dataptr[0] << 8 | dataptr[1]; } @@ -48,7 +71,7 @@ = uint32_t be32read(uint8_t *dataptr) { - return be16read(dataptr) << 16 | be16read(dataptr+2); + return (be16read(dataptr) << 16) | be16read(dataptr+2); } = uint32_t be32read_postinc(uint8_t *&dataptr) @@ -57,3 +80,35 @@ dataptr +=3D 4; return res; } + +uint32_t FindRVA(const std::vector<section_mapping_t> &mapping, int secnum) +{ + int i; + for (i =3D 0; i < mapping.size(); i++) + if (mapping[i].section->getNumber() =3D=3D secnum) return mapping[i].rva; + return 0; +} + +uint8_t *TargetPtr +(const std::vector<section_mapping_t> &mapping, = + const ElfObjectFile::Section &target, uint32_t va) +{ + uint32_t srva =3D FindRVA(mapping, target.getNumber()); + uint32_t off =3D va - srva; +#if 0 + printf + ("Relocating against VA %08x in section (%08x-%08x) %s\n", = + va, = + srva, = + srva + target.logicalSize(), = + target.getName().c_str()); +#endif + assert(off < target.logicalSize()); + return target.getSectionData() + off; +} + +uint32_t *GetRelocTarget(const std::vector<uint8_t> &reloc, uint32_t off) +{ + return (uint32_t *)(&reloc[0] + off); +} + Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/u= til.h?rev=3D32591&r1=3D32590&r2=3D32591&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-PPC/elfpe/util.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.h Fri Mar 7 07:53:55 2008 @@ -1,8 +1,11 @@ #ifndef COMPDVR_UTIL_H #define COMPDVR_UTIL_H = +#include <vector> #include <utility> #include <stdint.h> +#include "objectfile.h" +#include "section.h" = void le16write(uint8_t *dataptr, uint16_t value); void le16write_postinc(uint8_t *&dataptr, uint16_t value); @@ -12,6 +15,10 @@ uint16_t le16read_postinc(uint8_t *&dataptr); uint32_t le32read(uint8_t *dataptr); uint32_t le32read_postinc(uint8_t *&dataptr); +void be16write(uint8_t *dataptr, uint16_t value); +void be16write_postinc(uint8_t *&dataptr, uint16_t value); +void be32write(uint8_t *dataptr, uint32_t value); +void be32write_postinc(uint8_t *&dataptr, uint32_t value); uint16_t be16read(uint8_t *dataptr); uint16_t be16read_postinc(uint8_t *&dataptr); uint32_t be32read(uint8_t *dataptr); @@ -21,4 +28,10 @@ void le32pwrite(uint8_t *dataptr, const u32pair_t &pair); uint32_t roundup(uint32_t value, int round); = +uint32_t FindRVA(const std::vector<section_mapping_t> &mapping, int secnum= ); +uint8_t *TargetPtr +(const std::vector<section_mapping_t> &mapping, = + const ElfObjectFile::Section &target, uint32_t va); +uint32_t *GetRelocTarget(const std::vector<uint8_t> &reloc, uint32_t off); + #endif//COMPDVR_UTIL_H

1 0

[cwittich] 32590: put the newly added code in #ifdef _WIN32
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 17:57:24 2008 New Revision: 32590 URL: http://svn.reactos.org/svn/reactos?rev=3D32590&view=3Drev Log: put the newly added code in #ifdef _WIN32 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.c?rev=3D32590&r1=3D32589&r2=3D32590&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Thu Mar 6 17= :57:24 2008 @@ -125,9 +125,11 @@ static void failed(void) { char *e; +#ifdef _WIN32 STARTUPINFO si; PROCESS_INFORMATION pi; char* merged =3D build_command(orig_args->argv); +#endif = /* delete intermediate pre-processor file if needed */ if (i_tmpfile) { @@ -157,6 +159,7 @@ args_add_prefix(orig_args, p); } = +#ifdef _WIN32 ZeroMemory(&si, sizeof(STARTUPINFO)); ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); = @@ -174,6 +177,12 @@ CloseHandle( pi.hThread ); = exit(0); +#else + execv(orig_args->argv[0], orig_args->argv); + cc_log("execv returned (%s)!\n", strerror(errno)); + perror(orig_args->argv[0]); + exit(1); +#endif } = =

1 0

[cwittich] 32589: replace execv with CreateProcess because we have to wait for the process
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 17:54:08 2008 New Revision: 32589 URL: http://svn.reactos.org/svn/reactos?rev=3D32589&view=3Drev Log: replace execv with CreateProcess because we have to wait for the process Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.c?rev=3D32589&r1=3D32588&r2=3D32589&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Thu Mar 6 17= :54:08 2008 @@ -125,6 +125,9 @@ static void failed(void) { char *e; + STARTUPINFO si; + PROCESS_INFORMATION pi; + char* merged =3D build_command(orig_args->argv); = /* delete intermediate pre-processor file if needed */ if (i_tmpfile) { @@ -154,10 +157,23 @@ args_add_prefix(orig_args, p); } = - execv(orig_args->argv[0], orig_args->argv); - cc_log("execv returned (%s)!\n", strerror(errno)); - perror(orig_args->argv[0]); - exit(1); + ZeroMemory(&si, sizeof(STARTUPINFO)); + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + + si.cb =3D sizeof(STARTUPINFO); + + if(!CreateProcessA(orig_args->argv[0], merged, NULL, NULL, FALSE, 0, NULL= , NULL, &si, &pi)) + { + perror(orig_args->argv[0]); + exit(1); + } + + WaitForSingleObject( pi.hProcess, INFINITE ); + + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + + exit(0); } = =

1 0

[cwittich] 32588: fix some more warnings and errors
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 17:51:01 2008 New Revision: 32588 URL: http://svn.reactos.org/svn/reactos?rev=3D32588&view=3Drev Log: fix some more warnings and errors Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c (with= props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.h (with= props) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcp= roj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache-win32.vcproj?rev=3D32588&r1=3D32587&r2=3D32588&view=3D= diff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj (o= riginal) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj Th= u Mar 6 17:51:01 2008 @@ -203,6 +203,10 @@ > </File> <File + RelativePath=3D".\mkstemps.c" + > + </File> + <File RelativePath=3D".\snprintf.c" > </File> @@ -216,6 +220,10 @@ </File> <File RelativePath=3D".\util.c" + > + </File> + <File + RelativePath=3D".\win32-dirent.c" > </File> </Filter> @@ -240,6 +248,10 @@ RelativePath=3D".\mdfour.h" > </File> + <File + RelativePath=3D".\win32-dirent.h" + > + </File> </Filter> <Filter Name=3D"Ressourcendateien" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.h?rev=3D32588&r1=3D32587&r2=3D32588&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h Thu Mar 6 17= :51:01 2008 @@ -13,10 +13,45 @@ #include <sys/stat.h> #ifdef _WIN32 #include <windows.h> + #include <shlobj.h> #include <sys/locking.h> + #include <sys/utime.h> + #include <direct.h> + #include <io.h> + #include <process.h> + #include "getopt.h" + #include "win32-dirent.h" #define PATH_SEP WIN32_PATH_SEP #define PATH_SEP_CHAR WIN32_PATH_SEP_CHAR #define DEV_NULL "NUL" + #define read _read + #define open _open + #define close _close + #define access _access + #define unlink _unlink + #define umask _umask + #define strdup _strdup + #define putenv _putenv + #define lseek _lseek + #define write _write + #define getpid _getpid + #define execv _execv + #define dup _dup + #define utime _utime + #define unlink _unlink + #define mkdir(dirname, access) _mkdir(dirname) + #define x_realpath(a) strdup(a) + #define link(filename, linkname) CreateHardLinkA(linkname, filename, NULL) + #define PROT_READ 0x0001 + #define MAP_PRIVATE 0x02 + typedef int mode_t; + #ifndef S_ISREG + #define S_ISREG(m) ((m & _S_IFREG) =3D=3D _S_IFREG) + #endif + #ifndef S_ISDIR + #define S_ISDIR(m) (((m) & _S_IFDIR) =3D=3D _S_IFDIR) + #endif + #define lstat(x, y) stat(x, y) #else #include <unistd.h> #include <sys/wait.h> Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/getopt.c?rev=3D32588&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c Thu Mar 6 17= :51:01 2008 @@ -1,0 +1,122 @@ +/* + * Copyright (c) 1987 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURP= OSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STR= ICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY W= AY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Fri Jun 13 10:39:00 1997, tfelix(a)fred.net: + * Ported to Win32, changed index/rindex to strchr/strrchr + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] =3D "@(#)getopt.c 4.13 (Berkeley) 2/23/91"; +#endif /* LIBC_SCCS and not lint */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "getopt.h" + +/* + * get option letter from argument vector + */ +int opterr =3D 1, /* if error message should be printed */ + optind =3D 1, /* index into parent argv vector */ + optopt; /* character checked for validity */ +const char *optarg; /* argument associated with option */ + +#define BADCH (int)'?' +#define EMSG "" + +int +getopt(int nargc, char * const *nargv, const char *ostr) +{ + static const char *place =3D EMSG; /* option letter processing */ + register char *oli; /* option letter list index */ + char *p; + + if (!*place) { /* update scanning pointer */ + if (optind >=3D nargc || *(place =3D nargv[optind]) !=3D '-') { + place =3D EMSG; + return(EOF); + } + if (place[1] && *++place =3D=3D '-') { /* found "--" */ + ++optind; + place =3D EMSG; + return(EOF); + } + } /* option letter okay? */ + if ((optopt =3D (int)*place++) =3D=3D (int)':' || + !(oli =3D strchr(ostr, optopt))) { + /* + * if the user didn't specify '-' as an option, + * assume it means EOF. + */ + if (optopt =3D=3D (int)'-') + return(EOF); + if (!*place) + ++optind; + if (opterr) { + if (!(p =3D strrchr(*nargv, '/'))) + p =3D *nargv; + else + ++p; + (void)fprintf(stderr, "%s: illegal option -- %c\n", + p, optopt); + } + return(BADCH); + } + if (*++oli !=3D ':') { /* don't need argument */ + optarg =3D NULL; + if (!*place) + ++optind; + } + else { /* need an argument */ + if (*place) /* no white space */ + optarg =3D place; + else if (nargc <=3D ++optind) { /* no arg */ + place =3D EMSG; + if (!(p =3D strrchr(*nargv, '/'))) + p =3D *nargv; + else + ++p; + if (opterr) + (void)fprintf(stderr, + "%s: option requires an argument -- %c\n", + p, optopt); + return(BADCH); + } + else /* white space */ + optarg =3D nargv[optind]; + place =3D EMSG; + ++optind; + } + return(optopt); /* dump back option letter */ +} Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/getopt.h?rev=3D32588&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.h (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.h Thu Mar 6 17= :51:01 2008 @@ -1,0 +1,7 @@ +/* getopt.h */ + +extern const char *optarg; +extern int optind; + +int +getopt(int nargc, char * const *nargv, const char *ostr); Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/win32-dirent.c?rev=3D32588&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c Thu Mar= 6 17:51:01 2008 @@ -1,0 +1,126 @@ +/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +#include <windows.h> +#include <stdio.h> +#include <string.h> + +#include "win32-dirent.h" + +DIR * +opendir (const char * name) +{ + DIR *dir; + HANDLE hnd; + char *file; + WIN32_FIND_DATAA find; + + if (!name || !*name) = + return NULL; + file =3D malloc (strlen (name) + 3); + strcpy (file, name); + if (file[strlen (name) - 1] !=3D '/' && file[strlen (name) - 1] !=3D '\\= ') + strcat (file, "/*"); + else + strcat (file, "*"); + = + if ((hnd =3D FindFirstFileA (file, &find)) =3D=3D INVALID_HANDLE_VALUE) + { + free (file); + return NULL; + } + + dir =3D malloc (sizeof (DIR)); + dir->mask =3D file; + dir->fd =3D (int) hnd; + dir->data =3D malloc (sizeof (WIN32_FIND_DATA)); + dir->allocation =3D sizeof (WIN32_FIND_DATA); + dir->size =3D dir->allocation; + dir->filepos =3D 0; + memcpy (dir->data, &find, sizeof (WIN32_FIND_DATA)); + return dir; +} + +struct dirent * +readdir (DIR * dir) +{ + static struct dirent entry; + WIN32_FIND_DATAA *find; + + entry.d_ino =3D 0; + entry.d_type =3D 0; + find =3D (WIN32_FIND_DATAA *) dir->data; + + if (dir->filepos) + { + if (!FindNextFileA ((HANDLE) dir->fd, find)) + return NULL; + } + + entry.d_off =3D dir->filepos; + strncpy (entry.d_name, find->cFileName, sizeof (entry.d_name)); + entry.d_reclen =3D strlen (find->cFileName); + dir->filepos++; + return &entry; +} + +int = +closedir (DIR * dir) +{ + HANDLE hnd =3D (HANDLE) dir->fd; + free (dir->data); + free (dir->mask); + free (dir); + return FindClose (hnd) ? 0 : -1; +} + +void = +rewinddir (DIR * dir) +{ + HANDLE hnd =3D (HANDLE) dir->fd; + WIN32_FIND_DATAA *find =3D (WIN32_FIND_DATAA *) dir->data; + + FindClose (hnd); + hnd =3D FindFirstFileA (dir->mask, find); + dir->fd =3D (int) hnd; + dir->filepos =3D 0; +} + +void = +seekdir (DIR * dir, off_t offset) +{ + off_t n; + + rewinddir (dir); + for (n =3D 0; n < offset; n++) + { + if (FindNextFileA ((HANDLE) dir->fd, (WIN32_FIND_DATAA *) dir->data)) + dir->filepos++; + } +} + +off_t = +telldir (DIR * dir) +{ + return dir->filepos; +} + +int = +dirfd (DIR * dir) +{ + return dir->fd; +} Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/win32-dirent.h?rev=3D32588&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.h (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.h Thu Mar= 6 17:51:01 2008 @@ -1,0 +1,64 @@ +/* classes: h_files */ + +#ifndef SCM_WIN32_DIRENT_H +#define SCM_WIN32_DIRENT_H + +/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +/* Directory stream type. + The miscellaneous Unix `readdir' implementations read directory data + into a buffer and return `struct dirent *' pointers into it. */ + +#include <sys/types.h> + +struct dirstream +{ + int fd; /* File descriptor. */ + char *data; /* Directory block. */ + size_t allocation; /* Space allocated for the block. */ + size_t size; /* Total valid data in the block. */ + size_t offset; /* Current offset into the block. */ + off_t filepos; /* Position of next entry to read. */ + char *mask; /* Initial file mask. */ +}; + +struct dirent +{ + long d_ino; + off_t d_off; + unsigned short int d_reclen; + unsigned char d_type; + char d_name[256]; +}; + +#define d_fileno d_ino /* Backwards compatibility. */ + +/* This is the data type of directory stream objects. + The actual structure is opaque to users. */ + +typedef struct dirstream DIR; + +DIR * opendir (const char * name); +struct dirent * readdir (DIR * dir); +int closedir (DIR * dir); +void rewinddir (DIR * dir); +void seekdir (DIR * dir, off_t offset); +off_t telldir (DIR * dir); +int dirfd (DIR * dir); + +#endif /* SCM_WIN32_DIRENT_H */ Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[cwittich] 32587: apply patch from Christophe Gisquet <christophe dot gisquet at free.fr> with some modifications -don't use access with X_OK, it won't work on Vista http://lists.samba.org/archive/ccache/2006q3/000242.html
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 17:36:43 2008 New Revision: 32587 URL: http://svn.reactos.org/svn/reactos?rev=3D32587&view=3Drev Log: apply patch from Christophe Gisquet <christophe dot gisquet at free.fr> wit= h some modifications -don't use access with X_OK, it won't work on Vista http://lists.samba.org/archive/ccache/2006q3/000242.html Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/args.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c Thu Mar 6 17:3= 6:43 2008 @@ -38,7 +38,7 @@ void args_add(ARGS *args, const char *s) { args->argv =3D (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(ch= ar *)); - args->argv[args->argc] =3D x_strdup(s); + args->argv[args->argc] =3D x_quote_strdup(s); args->argc++; args->argv[args->argc] =3D NULL; } @@ -69,7 +69,7 @@ args->argv =3D (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(ch= ar *)); memmove(&args->argv[1], &args->argv[0], = (args->argc+1) * sizeof(args->argv[0])); - args->argv[0] =3D x_strdup(s); + args->argv[0] =3D x_quote_strdup(s); args->argc++; } = Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Thu Mar 6 17= :36:43 2008 @@ -87,6 +87,38 @@ {"ii", "ii"}, {NULL, NULL}}; = +static int first_is_meh(const char* first) +{ + const char* exe =3D strrchr(first, PATH_SEP_CHAR); + const size_t len =3D strlen(MYNAME); + + if (exe) exe++; + else exe=3Dfirst; + return (strlen(exe) >=3D len && strncmp(exe, MYNAME, len) =3D=3D 0 && + (exe[len]=3D=3D0 || strcmp(exe+len, ".exe")=3D=3D0) ); +} + +char *build_command(char **argv) +{ + char *cmd; + int i, length =3D 0; + + for(i =3D 0; argv[i]; i++) { + length++; + length +=3D (int)strlen(argv[i]); + } + + cmd =3D (char *)malloc(length); + strcpy(cmd, argv[0]); + + for(i =3D 1; argv[i]; i++) { + strcat(cmd, " "); + strcat(cmd, argv[i]); + } + + return cmd; +} + /* something went badly wrong - just execute the real compiler */ @@ -155,12 +187,15 @@ { char *path_stderr; char *tmp_stdout, *tmp_stderr, *tmp_hashname; - struct stat st1, st2; + struct stat st; int status; - - x_asprintf(&tmp_stdout, "%s/tmp.stdout.%s", temp_dir, tmp_string()); - x_asprintf(&tmp_stderr, "%s/tmp.stderr.%s", temp_dir, tmp_string()); - x_asprintf(&tmp_hashname, "%s/tmp.hash.%s.o", temp_dir, tmp_string()); + off_t size =3D 0; + + /* No quoting, unique arguments */ + x_asprintf(&tmp_stdout, "%s"PATH_SEP"tmp.stdout.%s", temp_dir, tmp_string= ()); + x_asprintf(&tmp_stderr, "%s"PATH_SEP"tmp.stderr.%s", temp_dir, tmp_string= ()); + /* Must be quoted as it will belong to a command-line */ + x_asprintf(&tmp_hashname, "%s"PATH_SEP"tmp.hash.%s.o", temp_dir, tmp_stri= ng()); = args_add(args, "-o"); args_add(args, tmp_hashname); @@ -181,7 +216,7 @@ status =3D execute(args->argv, tmp_stdout, tmp_stderr); args_pop(args, 3); = - if (stat(tmp_stdout, &st1) !=3D 0 || st1.st_size !=3D 0) { + if (stat(tmp_stdout, &st) !=3D 0 || st.st_size !=3D 0) { cc_log("compiler produced stdout for %s\n", output_file); stats_update(STATS_STDOUT); unlink(tmp_stdout); @@ -198,7 +233,7 @@ = fd =3D open(tmp_stderr, O_RDONLY | O_BINARY); if (fd !=3D -1) { - if (strcmp(output_file, "/dev/null") =3D=3D 0 || + if (strcmp(output_file, DEV_NULL) =3D=3D 0 || rename(tmp_hashname, output_file) =3D=3D 0 || errno =3D=3D ENOENT) { if (cpp_stderr) { /* we might have some stderr from cpp */ @@ -211,8 +246,7 @@ } } = - /* we can use a quick method of - getting the failed output */ + /* we can use a quick method of getting the failed output */ copy_fd(fd, 2); close(fd); unlink(tmp_stderr); @@ -228,19 +262,32 @@ failed(); } = + if (stat(tmp_hashname, &st) !=3D 0 || rename(tmp_hashname, hashname) != =3D 0) { + cc_log("failed to rename output: %s\n" + " '%s'\n" + " -> '%s': \n", + strerror(errno), tmp_hashname, hashname); + stats_update(STATS_ERROR); + failed(); + } + cc_log("Moved '%s' to '%s'\n", tmp_hashname, hashname); + size +=3D file_size(&st); + x_asprintf(&path_stderr, "%s.stderr", hashname); - - if (stat(tmp_stderr, &st1) !=3D 0 || - stat(tmp_hashname, &st2) !=3D 0 || - rename(tmp_hashname, hashname) !=3D 0 || - rename(tmp_stderr, path_stderr) !=3D 0) { - cc_log("failed to rename tmp files - %s\n", strerror(errno)); + if (stat(tmp_stderr, &st) !=3D 0 || rename(tmp_stderr, path_stderr) !=3D = 0) { + cc_log("failed to rename stderr: %s\n" + " '%s'\n" + " -> '%s': \n", + strerror(errno), tmp_stderr, path_stderr); stats_update(STATS_ERROR); failed(); } = + cc_log("Moved '%s' to '%s'\n", tmp_stderr, path_stderr); + size +=3D file_size(&st); + cc_log("Placed %s into cache\n", output_file); - stats_tocache(file_size(&st1) + file_size(&st2)); + stats_tocache(size); = free(tmp_hashname); free(tmp_stderr); @@ -331,8 +378,8 @@ hash_string(str_basename(args->argv[0])); } = - hash_int(st.st_size); - hash_int(st.st_mtime); + hash_int((int)st.st_size); + hash_int((int)st.st_mtime); = /* possibly hash the current working directory */ if (getenv("CCACHE_HASHDIR")) { @@ -356,11 +403,11 @@ input_base[10] =3D 0; } = - /* now the run */ - x_asprintf(&path_stdout, "%s/%s.tmp.%s.%s", temp_dir, - input_base, tmp_string(), = - i_extension); - x_asprintf(&path_stderr, "%s/tmp.cpp_stderr.%s", temp_dir, tmp_string()); + /* now the run - path_std* are unique args =3D> no quoting */ + x_asprintf(&path_stdout, "%s"PATH_SEP"%s.tmp.%s.%s", temp_dir, + input_base, tmp_string(), = + i_extension); + x_asprintf(&path_stderr, "%s"PATH_SEP"tmp.cpp_stderr.%s", temp_dir, tmp_s= tring()); = if (!direct_i_file) { /* run cpp on the input file to obtain the .i */ @@ -423,17 +470,18 @@ = /* we use a N level subdir for the cache path to reduce the impact on filesystems which are slow for large directories + Quoting not necessary because unique argument, or not used yet. */ s =3D hash_result(); - x_asprintf(&hash_dir, "%s/%c", cache_dir, s[0]); - x_asprintf(&stats_file, "%s/stats", hash_dir); + x_asprintf(&hash_dir, "%s"PATH_SEP"%c", cache_dir, s[0]); + x_asprintf(&stats_file, "%s"PATH_SEP"stats", hash_dir); for (i=3D1; i<nlevels; i++) { char *p; if (create_dir(hash_dir) !=3D 0) { cc_log("failed to create %s\n", hash_dir); failed(); } - x_asprintf(&p, "%s/%c", hash_dir, s[i]); + x_asprintf(&p, "%s"PATH_SEP"%c", hash_dir, s[i]); free(hash_dir); hash_dir =3D p; } @@ -441,7 +489,7 @@ cc_log("failed to create %s\n", hash_dir); failed(); } - x_asprintf(&hashname, "%s/%s", hash_dir, s+nlevels); + x_asprintf(&hashname, "%s"PATH_SEP"%s", hash_dir, s+nlevels); free(hash_dir); } = @@ -483,7 +531,7 @@ = utime(stderr_file, NULL); = - if (strcmp(output_file, "/dev/null") =3D=3D 0) { + if (strcmp(output_file, DEV_NULL) =3D=3D 0) { ret =3D 0; } else { unlink(output_file); @@ -562,10 +610,10 @@ base =3D str_basename(argv[0]); = /* we might be being invoked like "ccache gcc -c foo.c" */ - if (strcmp(base, MYNAME) =3D=3D 0) { + if (first_is_meh(argv[0])) { args_remove_first(orig_args); free(base); - if (strchr(argv[1],'/')) { + if (strchr(argv[1],PATH_SEP_CHAR)) { /* a full path was given */ return; } @@ -801,7 +849,7 @@ if (!output_file) { char *p; output_file =3D x_strdup(input_file); - if ((p =3D strrchr(output_file, '/'))) { + if ((p =3D strrchr(output_file, PATH_SEP_CHAR))) { output_file =3D p+1; } p =3D strrchr(output_file, '.'); @@ -815,7 +863,7 @@ } = /* cope with -o /dev/null */ - if (strcmp(output_file,"/dev/null") !=3D 0 && stat(output_file, &st) =3D= =3D 0 && !S_ISREG(st.st_mode)) { + if (strcmp(output_file, DEV_NULL) !=3D 0 && stat(output_file, &st) =3D=3D= 0 && !S_ISREG(st.st_mode)) { cc_log("Not a regular file %s\n", output_file); stats_update(STATS_DEVICE); failed(); @@ -934,14 +982,15 @@ = case 'F': v =3D atoi(optarg); - stats_set_limits(v, -1); + stats_set_limits((long)v, -1); printf("Set cache file limit to %u\n", (unsigned)v); break; = case 'M': v =3D value_units(optarg); - stats_set_limits(-1, v); + stats_set_limits(-1, (long) v); printf("Set cache size limit to %uk\n", (unsigned)v); + printf("not implemented"); break; = default: @@ -983,7 +1032,7 @@ = cache_dir =3D getenv("CCACHE_DIR"); if (!cache_dir) { - x_asprintf(&cache_dir, "%s/.ccache", get_home_directory()); + x_asprintf(&cache_dir, "%s"PATH_SEP".ccache", get_home_directory()); } = temp_dir =3D getenv("CCACHE_TEMPDIR"); @@ -1009,8 +1058,8 @@ = = /* check if we are being invoked as "ccache" */ - if (strlen(argv[0]) >=3D strlen(MYNAME) && - strcmp(argv[0] + strlen(argv[0]) - strlen(MYNAME), MYNAME) =3D=3D 0) { + if (first_is_meh(argv[0])) + { if (argc < 2) { usage(); exit(1); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.h?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h Thu Mar 6 17= :36:43 2008 @@ -1,23 +1,38 @@ #define CCACHE_VERSION "2.4" = #include "config.h" +#define USUAL_PATH_SEP_CHAR '/' +#define USUAL_PATH_SEP "/" +#define WIN32_PATH_SEP_CHAR '\\' +#define WIN32_PATH_SEP "\\" = #include <stdio.h> -#include <unistd.h> #include <stdlib.h> #include <errno.h> +#include <sys/types.h> #include <sys/stat.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/mman.h> -#include <sys/file.h> +#ifdef _WIN32 + #include <windows.h> + #include <sys/locking.h> + #define PATH_SEP WIN32_PATH_SEP + #define PATH_SEP_CHAR WIN32_PATH_SEP_CHAR + #define DEV_NULL "NUL" +#else + #include <unistd.h> + #include <sys/wait.h> + #include <sys/mman.h> + #include <sys/file.h> + #include <utime.h> + #include <dirent.h> + #define PATH_SEP USUAL_PATH_SEP + #define PATH_SEP_CHAR USUAL_PATH_SEP_CHAR + #define DEV_NULL "/dev/null" +#endif #include <fcntl.h> #include <time.h> #include <string.h> #include <ctype.h> -#include <utime.h> #include <stdarg.h> -#include <dirent.h> #include <limits.h> #ifdef HAVE_PWD_H #include <pwd.h> @@ -83,6 +98,7 @@ int create_dir(const char *dir); void x_asprintf(char **ptr, const char *format, ...); char *x_strdup(const char *s); +char *x_quote_strdup(const char* s); void *x_realloc(void *ptr, size_t size); void *x_malloc(size_t size); void traverse(const char *dir, void (*fn)(const char *, struct stat *)); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/cleanup.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c Thu Mar 6 1= 7:36:43 2008 @@ -50,7 +50,9 @@ { char *p; = +#ifndef WIN32 if (!S_ISREG(st->st_mode)) return; +#endif = p =3D str_basename(fname); if (strcmp(p, "stats") =3D=3D 0) { @@ -107,8 +109,8 @@ { unsigned i; = - size_threshold =3D maxsize * LIMIT_MULTIPLE; - files_threshold =3D maxfiles * LIMIT_MULTIPLE; + size_threshold =3D maxsize * (size_t) LIMIT_MULTIPLE; + files_threshold =3D maxfiles * (size_t) LIMIT_MULTIPLE; = num_files =3D 0; total_size =3D 0; @@ -143,8 +145,9 @@ int i; = for (i=3D0;i<=3D0xF;i++) { - x_asprintf(&dname, "%s/%1x", dir, i); - x_asprintf(&sfile, "%s/%1x/stats", dir, i); + /* No need to quote, unique argument */ + x_asprintf(&dname, "%s"PATH_SEP"%1x", dir, i); + x_asprintf(&sfile, "%s"PATH_SEP"%1x"PATH_SEP"stats", dir, i); = memset(counters, 0, sizeof(counters)); stats_read(sfile, counters); @@ -183,7 +186,7 @@ int i; = for (i=3D0;i<=3D0xF;i++) { - x_asprintf(&dname, "%s/%1x", dir, i); + x_asprintf(&dname, "%s"PATH_SEP"%1x", dir, i); traverse(dir, wipe_fn); free(dname); } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/execute.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c Thu Mar 6 1= 7:36:43 2008 @@ -27,6 +27,7 @@ const char *path_stdout, const char *path_stderr) { +#ifndef _WIN32 pid_t pid; int status; = @@ -64,8 +65,87 @@ } = return WEXITSTATUS(status); +#else /* Should be portable */ + int status =3D -2; + int fd, std_od =3D -1, std_ed =3D -1; + + unlink(path_stdout); + std_od =3D _dup(1); + fd =3D _open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 06= 66); + if (fd =3D=3D -1) { + status =3D STATUS_NOCACHE; + cc_log("stdout error: failed to open %s\n", path_stdout); + goto out; + } + /*std_od =3D */ _dup2(fd, 1); + _close(fd); + + unlink(path_stderr); + fd =3D _open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 06= 66); + std_ed =3D _dup(2); = + if (fd =3D=3D -1) { + status =3D STATUS_NOCACHE; + cc_log("stderr error: failed to open %s\n", path_stderr); + goto out; + } + /*std_ed =3D*/ _dup2(fd, 2); + _close(fd); + + /* Spawn process (_exec* familly doesn't return) */ + status =3D _spawnv(_P_WAIT, argv[0], argv); + + out: + cc_log("%s:\n stdout -> %s\n stderr -> %s\n process status=3D%i\n", + argv[0], path_stdout, path_stderr, status); + if (status =3D=3D -1) cc_log("Error %i: %s\n", errno, strerror(errno)); + + /* Restore descriptors */ + if (std_od !=3D -1) _dup2(std_od, 1); + if (std_ed !=3D -1) _dup2(std_ed, 2); = + _flushall(); + + return (status>0); +#endif } = + + +/* + Check that the executable exists +*/ +char is_exec_file(const char *fname, const char *exclude_name) +{ + struct stat st1, st2; + + if (access(fname, 0) =3D=3D 0 && +#ifndef _WIN32 /* Symlinks not used under windows */ + lstat(fname, &st1) =3D=3D 0 && +#endif + stat(fname, &st2) =3D=3D 0 && + S_ISREG(st2.st_mode)) { +#ifndef _WIN32 /* Symlinks not used under windows */ + /* if its a symlink then ensure it doesn't + point at something called exclude_name */ + if (S_ISLNK(st1.st_mode)) { + char *buf =3D x_realpath(fname); + if (buf) { + char *p =3D str_basename(buf); + if (strcmp(p, exclude_name) =3D=3D 0) { + /* its a link to "ccache" ! */ + free(p); + free(buf); + return -1; + } + free(buf); + free(p); + } + } +#endif = + /* found it! */ + return 1; + } + return -1; +} = /* find an executable by name in $PATH. Exclude any that are links to exclu= de_name = @@ -74,9 +154,9 @@ { char *path; char *tok; - struct stat st1, st2; - - if (*name =3D=3D '/') { + const char *sep =3D ":"; + + if (*name =3D=3D PATH_SEP_CHAR) { return x_strdup(name); } = @@ -91,39 +171,37 @@ = path =3D x_strdup(path); = + /* Determine path separator */ + if (strchr(path, ';')) sep =3D ";"; + /* search the path looking for the first compiler of the right name that isn't us */ - for (tok=3Dstrtok(path,":"); tok; tok =3D strtok(NULL, ":")) { + for (tok=3Dstrtok(path, sep); tok; tok =3D strtok(NULL, sep)) { char *fname; - x_asprintf(&fname, "%s/%s", tok, name); + x_asprintf(&fname, "%s"PATH_SEP"%s", tok, name); /* look for a normal executable file */ - if (access(fname, X_OK) =3D=3D 0 && - lstat(fname, &st1) =3D=3D 0 && - stat(fname, &st2) =3D=3D 0 && - S_ISREG(st2.st_mode)) { - /* if its a symlink then ensure it doesn't - point at something called exclude_name */ - if (S_ISLNK(st1.st_mode)) { - char *buf =3D x_realpath(fname); - if (buf) { - char *p =3D str_basename(buf); - if (strcmp(p, exclude_name) =3D=3D 0) { - /* its a link to "ccache" ! */ - free(p); - free(buf); - continue; - } - free(buf); - free(p); - } - } - - /* found it! */ + = + + if (is_exec_file(fname, exclude_name) > 0) + { free(path); return fname; } free(fname); - } - + + /* found it! */ +#ifdef _WIN32 /* Add .exe under win32 */ + x_asprintf(&fname, "%s"PATH_SEP"%s.exe", tok, name); + + /* look for a normal executable file */ + if (is_exec_file(fname, exclude_name) > 0) + { + free(path); + return fname; + } + free(fname); +#endif + } +free(path); return NULL; } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/hash.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c Thu Mar 6 17:3= 6:43 2008 @@ -35,7 +35,7 @@ = void hash_string(const char *s) { - hash_buffer(s, strlen(s)); + hash_buffer(s, (int)strlen(s)); } = void hash_int(int x) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/stats.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c Thu Mar 6 17:= 36:43 2008 @@ -126,7 +126,7 @@ = if (!stats_file) { if (!cache_dir) return; - x_asprintf(&stats_file, "%s/stats", cache_dir); + x_asprintf(&stats_file, "%s"PATH_SEP"stats", cache_dir); } = /* open safely to try to prevent symlink races */ @@ -215,9 +215,9 @@ char *fname; = if (dir =3D=3D -1) { - x_asprintf(&fname, "%s/stats", cache_dir); + x_asprintf(&fname, "%s"PATH_SEP"stats", cache_dir); } else { - x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); + x_asprintf(&fname, "%s"PATH_SEP"%1x"PATH_SEP"stats", cache_dir, dir); } = stats_read(fname, counters); @@ -259,12 +259,12 @@ char *fname; unsigned counters[STATS_END]; = - x_asprintf(&fname, "%s/stats", cache_dir); + x_asprintf(&fname, "%s"PATH_SEP"stats", cache_dir); unlink(fname); free(fname); = for (dir=3D0;dir<=3D0xF;dir++) { - x_asprintf(&fname, "%s/%1x/stats", cache_dir, dir); + x_asprintf(&fname, "%s"PATH_SEP"%1x"PATH_SEP"stats", cache_dir, dir); fd =3D safe_open(fname); if (fd =3D=3D -1) { free(fname); @@ -305,9 +305,9 @@ char *fname, *cdir; int fd; = - x_asprintf(&cdir, "%s/%1x", cache_dir, dir); + x_asprintf(&cdir, "%s"PATH_SEP"%1x", cache_dir, dir); create_dir(cdir); - x_asprintf(&fname, "%s/stats", cdir); + x_asprintf(&fname, "%s"PATH_SEP"stats", cdir); free(cdir); = memset(counters, 0, sizeof(counters)); @@ -336,7 +336,7 @@ char *stats_file; = create_dir(dir); - x_asprintf(&stats_file, "%s/stats", dir); + x_asprintf(&stats_file, "%s"PATH_SEP"stats", dir); = memset(counters, 0, sizeof(counters)); = Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/unify.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c Thu Mar 6 17:= 36:43 2008 @@ -209,7 +209,7 @@ q =3D p[ofs]; for (i=3D0;i<tokens[q].num_toks;i++) { unsigned char *s =3D (unsigned char *)tokens[q].toks[i]; - int len =3D strlen((char *)s); + int len =3D (int) strlen((char *)s); if (size >=3D ofs+len && memcmp(&p[ofs], s, len) =3D=3D 0) { int j; for (j=3D0;s[j];j++) { @@ -241,6 +241,7 @@ int fd; struct stat st; = char *map; + HANDLE view; = fd =3D open(fname, O_RDONLY|O_BINARY); if (fd =3D=3D -1 || fstat(fd, &st) !=3D 0) { @@ -249,6 +250,33 @@ return -1; } = +#ifdef _WIN32 + /* win32 equivalent of mmap is ViewMapOfFile, but malloc+read + may be better */ + view =3D CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL, + PAGE_READONLY|SEC_COMMIT, 0,0 , NULL); + if (NULL =3D=3D view) { + cc_log("Failed to create file mapping %s: %s\n", + fname, strerror(errno)); + stats_update(STATS_PREPROCESSOR); + return -1; + } + + map =3D MapViewOfFile(view, FILE_MAP_READ, 0, 0, st.st_size); + if (NULL =3D=3D map) { + cc_log("Failed to map view of file %s: %s\n", + fname, strerror(errno)); + stats_update(STATS_PREPROCESSOR); + return -1; + } + + /* pass it through the unifier */ + unify((unsigned char *)map, st.st_size); + + UnmapViewOfFile(map); + CloseHandle(view); + close(fd); +#else /* we use mmap() to make it easy to handle arbitrarily long lines in preprocessor output. I have seen lines of over 100k in length, so this is well worth it */ @@ -263,7 +291,7 @@ unify((unsigned char *)map, st.st_size); = munmap(map, st.st_size); - +#endif return 0; } = Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/util.c?rev=3D32587&r1=3D32586&r2=3D32587&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c Thu Mar 6 17:3= 6:43 2008 @@ -20,6 +20,22 @@ = static FILE *logfile; = +#ifdef _WIN32 +int fchmod(int fildes, mode_t mode) +{ + return 0; +} +#endif + +#ifndef HAVE_MKSTEMP +/* cheap and nasty mkstemp replacement */ +int mkstemp(char *template) +{ + _mktemp(template); + return open(template, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0600); +} +#endif + /* log a message to the CCACHE_LOGFILE location */ void cc_log(const char *format, ...) { @@ -155,6 +171,34 @@ } = /* + this is like strdup() but dies if the malloc fails and add quotes + around the argument if it contains spaces. +*/ +char* +x_quote_strdup(const char* s) +{ + /* Protect against args containing spaces in them - unicode-able ? */ + if (strchr(s, ' ') !=3D NULL) { + size_t len =3D strlen(s); /* at least 1 as it holds ' ' */ + char *new_arg =3D x_malloc(len+2*1+1); /* Make room for quoting */ + + /* Quote */ + new_arg[0] =3D '"'; + memcpy(new_arg+1, s, len); + new_arg[len+1] =3D '"'; + new_arg[len+2] =3D 0; + + /* Done */ + cc_log("Quoted %s\n", new_arg); + return new_arg; + } + else + return x_strdup(s); +} + + + +/* this is like strdup() but dies if the malloc fails */ char *x_strdup(const char *s) @@ -220,7 +264,7 @@ = if (strlen(de->d_name) =3D=3D 0) continue; = - x_asprintf(&fname, "%s/%s", dir, de->d_name); + x_asprintf(&fname, "%s"PATH_SEP"%s", dir, de->d_name); if (lstat(fname, &st)) { if (errno !=3D ENOENT) { perror(fname); @@ -244,7 +288,7 @@ /* return the base name of a file - caller frees */ char *str_basename(const char *s) { - char *p =3D strrchr(s, '/'); + char *p =3D strrchr(s, PATH_SEP_CHAR); if (p) { return x_strdup(p+1); } = @@ -257,7 +301,7 @@ { char *p; s =3D x_strdup(s); - p =3D strrchr(s, '/'); + p =3D strrchr(s, PATH_SEP_CHAR); if (p) { *p =3D 0; } = @@ -266,6 +310,9 @@ = int lock_fd(int fd) { +#ifdef _WIN32 + return _locking(fd, _LK_NBLCK, 1); +#else struct flock fl; int ret; = @@ -281,17 +328,23 @@ ret =3D fcntl(fd, F_SETLKW, &fl); } while (ret =3D=3D -1 && errno =3D=3D EINTR); return ret; -} +#endif +} + = /* return size on disk of a file */ size_t file_size(struct stat *st) { +#ifdef _WIN32 + return st->st_size; +#else size_t size =3D st->st_blocks * 512; if ((size_t)st->st_size > size) { /* probably a broken stat() call ... */ size =3D (st->st_size + 1023) & ~1023; } return size; +#endif } = = @@ -351,6 +404,7 @@ a sane realpath() function, trying to cope with stupid path limits and = a broken API */ +#ifndef WIN32 char *x_realpath(const char *path) { int maxlen; @@ -389,6 +443,7 @@ free(ret); return NULL; } +#endif = /* a getcwd that will returns an allocated buffer */ char *gnu_getcwd(void) @@ -397,7 +452,7 @@ = while (1) { char *buffer =3D (char *)x_malloc(size); - if (getcwd(buffer, size) =3D=3D buffer) { + if (_getcwd(buffer, size) =3D=3D buffer) { return buffer; } free(buffer); @@ -408,16 +463,6 @@ } } = -#ifndef HAVE_MKSTEMP -/* cheap and nasty mkstemp replacement */ -int mkstemp(char *template) -{ - mktemp(template); - return open(template, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600); -} -#endif - - /* create an empty file */ int create_empty_file(const char *fname) { @@ -436,7 +481,18 @@ */ const char *get_home_directory(void) { - const char *p =3D getenv("HOME"); + const char *p =3D NULL; + +#ifdef _WIN32 + static char szPath[MAX_PATH]; + + // "Documents and Settings\user\Application Data" is CSIDL_APPDATA + if(SHGetSpecialFolderPathA(NULL, szPath, CSIDL_PROFILE, FALSE)) + { + return szPath; + } +#endif + p =3D getenv("HOME"); if (p) { return p; }

1 0

[cwittich] 32586: add config.h and msvc project files
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 16:44:20 2008 New Revision: 32586 URL: http://svn.reactos.org/svn/reactos?rev=3D32586&view=3Drev Log: add config.h and msvc project files Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.sln (wi= th props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj = (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h (with props) Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache-win32.sln?rev=3D32586&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.sln (adde= d) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.sln Thu M= ar 6 16:44:20 2008 @@ -1,0 +1,20 @@ +=C3=AF=C2=BB=C2=BF +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "ccache-win32", "cca= che-win32.vcproj", "{B48041FE-6C42-46E0-B401-06E9439D614B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) =3D preSolution + Debug|Win32 =3D Debug|Win32 + Release|Win32 =3D Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) =3D postSolution + {B48041FE-6C42-46E0-B401-06E9439D614B}.Debug|Win32.ActiveCfg =3D Debug|W= in32 + {B48041FE-6C42-46E0-B401-06E9439D614B}.Debug|Win32.Build.0 =3D Debug|Win= 32 + {B48041FE-6C42-46E0-B401-06E9439D614B}.Release|Win32.ActiveCfg =3D Relea= se|Win32 + {B48041FE-6C42-46E0-B401-06E9439D614B}.Release|Win32.Build.0 =3D Release= |Win32 + EndGlobalSection + GlobalSection(SolutionProperties) =3D preSolution + HideSolutionNode =3D FALSE + EndGlobalSection +EndGlobal Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.s= ln ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache-win32.vcproj?rev=3D32586&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj (a= dded) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj Th= u Mar 6 16:44:20 2008 @@ -1,0 +1,253 @@ +<?xml version=3D"1.0" encoding=3D"Windows-1252"?> +<VisualStudioProject + ProjectType=3D"Visual C++" + Version=3D"8,00" + Name=3D"ccache" + ProjectGUID=3D"{B48041FE-6C42-46E0-B401-06E9439D614B}" + RootNamespace=3D"ccachewin32" + Keyword=3D"Win32Proj" + > + <Platforms> + <Platform + Name=3D"Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name=3D"Debug|Win32" + OutputDirectory=3D"." + IntermediateDirectory=3D"$(ConfigurationName)" + ConfigurationType=3D"1" + CharacterSet=3D"1" + > + <Tool + Name=3D"VCPreBuildEventTool" + /> + <Tool + Name=3D"VCCustomBuildTool" + /> + <Tool + Name=3D"VCXMLDataGeneratorTool" + /> + <Tool + Name=3D"VCWebServiceProxyGeneratorTool" + /> + <Tool + Name=3D"VCMIDLTool" + /> + <Tool + Name=3D"VCCLCompilerTool" + Optimization=3D"0" + PreprocessorDefinitions=3D"WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNIN= GS" + MinimalRebuild=3D"true" + BasicRuntimeChecks=3D"3" + RuntimeLibrary=3D"3" + UsePrecompiledHeader=3D"0" + WarningLevel=3D"3" + Detect64BitPortabilityProblems=3D"true" + DebugInformationFormat=3D"4" + /> + <Tool + Name=3D"VCManagedResourceCompilerTool" + /> + <Tool + Name=3D"VCResourceCompilerTool" + /> + <Tool + Name=3D"VCPreLinkEventTool" + /> + <Tool + Name=3D"VCLinkerTool" + LinkIncremental=3D"2" + GenerateDebugInformation=3D"true" + SubSystem=3D"1" + TargetMachine=3D"1" + /> + <Tool + Name=3D"VCALinkTool" + /> + <Tool + Name=3D"VCManifestTool" + /> + <Tool + Name=3D"VCXDCMakeTool" + /> + <Tool + Name=3D"VCBscMakeTool" + /> + <Tool + Name=3D"VCFxCopTool" + /> + <Tool + Name=3D"VCAppVerifierTool" + /> + <Tool + Name=3D"VCWebDeploymentTool" + /> + <Tool + Name=3D"VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name=3D"Release|Win32" + OutputDirectory=3D"C:\RosBE\4.1.3\bin" + IntermediateDirectory=3D"$(ConfigurationName)" + ConfigurationType=3D"1" + CharacterSet=3D"1" + WholeProgramOptimization=3D"1" + > + <Tool + Name=3D"VCPreBuildEventTool" + /> + <Tool + Name=3D"VCCustomBuildTool" + /> + <Tool + Name=3D"VCXMLDataGeneratorTool" + /> + <Tool + Name=3D"VCWebServiceProxyGeneratorTool" + /> + <Tool + Name=3D"VCMIDLTool" + /> + <Tool + Name=3D"VCCLCompilerTool" + PreprocessorDefinitions=3D"WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary=3D"2" + UsePrecompiledHeader=3D"0" + WarningLevel=3D"3" + Detect64BitPortabilityProblems=3D"true" + DebugInformationFormat=3D"3" + /> + <Tool + Name=3D"VCManagedResourceCompilerTool" + /> + <Tool + Name=3D"VCResourceCompilerTool" + /> + <Tool + Name=3D"VCPreLinkEventTool" + /> + <Tool + Name=3D"VCLinkerTool" + LinkIncremental=3D"1" + GenerateDebugInformation=3D"true" + SubSystem=3D"1" + OptimizeReferences=3D"2" + EnableCOMDATFolding=3D"2" + TargetMachine=3D"1" + /> + <Tool + Name=3D"VCALinkTool" + /> + <Tool + Name=3D"VCManifestTool" + /> + <Tool + Name=3D"VCXDCMakeTool" + /> + <Tool + Name=3D"VCBscMakeTool" + /> + <Tool + Name=3D"VCFxCopTool" + /> + <Tool + Name=3D"VCAppVerifierTool" + /> + <Tool + Name=3D"VCWebDeploymentTool" + /> + <Tool + Name=3D"VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name=3D"Quelldateien" + Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=3D".\args.c" + > + </File> + <File + RelativePath=3D".\ccache.c" + > + </File> + <File + RelativePath=3D".\cleanup.c" + > + </File> + <File + RelativePath=3D".\execute.c" + > + </File> + <File + RelativePath=3D".\getopt.c" + > + </File> + <File + RelativePath=3D".\hash.c" + > + </File> + <File + RelativePath=3D".\mdfour.c" + > + </File> + <File + RelativePath=3D".\snprintf.c" + > + </File> + <File + RelativePath=3D".\stats.c" + > + </File> + <File + RelativePath=3D".\unify.c" + > + </File> + <File + RelativePath=3D".\util.c" + > + </File> + </Filter> + <Filter + Name=3D"Headerdateien" + Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=3D".\ccache.h" + > + </File> + <File + RelativePath=3D".\config.h" + > + </File> + <File + RelativePath=3D".\getopt.h" + > + </File> + <File + RelativePath=3D".\mdfour.h" + > + </File> + </Filter> + <Filter + Name=3D"Ressourcendateien" + Filter=3D"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff= ;tif;png;wav" + UniqueIdentifier=3D"{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.v= cproj ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/config.h?rev=3D32586&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h Thu Mar 6 16= :44:20 2008 @@ -1,0 +1,4 @@ + +#define HAVE_STRING_H +#define HAVE_STDLIB_H +#define HAVE_CTYPE_H Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[cwittich] 32585: add ccache sources
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Thu Mar 6 16:29:42 2008 New Revision: 32585 URL: http://svn.reactos.org/svn/reactos?rev=3D32585&view=3Drev Log: add ccache sources Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/.cvsignore (with pro= ps) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/COPYING (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile.in (with pr= ops) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/README (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.1 (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.yo (with prop= s) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c (with prop= s) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h.in (with pr= ops) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/configure (with prop= s) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/configure.in (with p= rops) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c (with prop= s) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/install-sh (with pro= ps) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/mdfour.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/mdfour.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/packaging/ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/packaging/README (wi= th props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/packaging/ccache.spec = (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c (with pro= ps) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/test.sh (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/web/ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/web/ccache-man.html = (with props) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/web/index.html (with= props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/.cvsignore?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/COPYING?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/Makefile.in?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/README?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/args.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/args.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.1?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.h?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.yo URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/ccache.yo?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/cleanup.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h.in URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/config.h.in?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/configure URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/configure?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/configure.in?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/execute.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/hash.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/install-sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/install-sh?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/mdfour.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/mdfour.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/mdfour.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/mdfour.h?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/packaging/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/packaging/README?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/packaging/ccache.sp= ec URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/packaging/ccache.spec?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/snprintf.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/stats.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/stats.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/test.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/test.sh?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/unify.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/unify.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/util.c?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/web/ccache-man.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/web/ccache-man.html?rev=3D32585&view=3Dauto Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/web/index.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/ccache-2.4/web/index.html?rev=3D32585&view=3Dauto

1 0

[gedmurphy] 32584: add missing files
by gedmurphy＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: gedmurphy Date: Thu Mar 6 16:01:00 2008 New Revision: 32584 URL: http://svn.reactos.org/svn/reactos?rev=3D32584&view=3Drev Log: add missing files Added: trunk/tools/RosTE/GUI/DebugForm.Designer.cs trunk/tools/RosTE/GUI/DebugForm.cs trunk/tools/RosTE/GUI/DebugForm.resx Added: trunk/tools/RosTE/GUI/DebugForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DebugForm.Des= igner.cs?rev=3D32584&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosTE/GUI/DebugForm.Designer.cs (added) +++ trunk/tools/RosTE/GUI/DebugForm.Designer.cs Thu Mar 6 16:01:00 2008 @@ -1,0 +1,88 @@ +namespace RosTEGUI +{ + partial class DebugForm + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components =3D null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name=3D"disposing">true if managed resources should be = disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components !=3D null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.errorText =3D new System.Windows.Forms.TextBox(); + this.errorCloseBtn =3D new System.Windows.Forms.Button(); + this.errorCopyBtn =3D new System.Windows.Forms.Button(); + this.SuspendLayout(); + // = + // errorText + // = + this.errorText.Location =3D new System.Drawing.Point(12, 12); + this.errorText.Multiline =3D true; + this.errorText.Name =3D "errorText"; + this.errorText.ReadOnly =3D true; + this.errorText.Size =3D new System.Drawing.Size(436, 244); + this.errorText.TabIndex =3D 0; + // = + // errorCloseBtn + // = + this.errorCloseBtn.Location =3D new System.Drawing.Point(373, = 262); + this.errorCloseBtn.Name =3D "errorCloseBtn"; + this.errorCloseBtn.Size =3D new System.Drawing.Size(75, 23); + this.errorCloseBtn.TabIndex =3D 1; + this.errorCloseBtn.Text =3D "Close"; + this.errorCloseBtn.UseVisualStyleBackColor =3D true; + this.errorCloseBtn.Click +=3D new System.EventHandler(this.err= orCloseBtn_Click); + // = + // errorCopyBtn + // = + this.errorCopyBtn.Location =3D new System.Drawing.Point(12, 26= 2); + this.errorCopyBtn.Name =3D "errorCopyBtn"; + this.errorCopyBtn.Size =3D new System.Drawing.Size(75, 23); + this.errorCopyBtn.TabIndex =3D 2; + this.errorCopyBtn.Text =3D "Copy"; + this.errorCopyBtn.UseVisualStyleBackColor =3D true; + this.errorCopyBtn.Click +=3D new System.EventHandler(this.erro= rCopyBtn_Click); + // = + // DebugForm + // = + this.AutoScaleDimensions =3D new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode =3D System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize =3D new System.Drawing.Size(460, 290); + this.Controls.Add(this.errorCopyBtn); + this.Controls.Add(this.errorCloseBtn); + this.Controls.Add(this.errorText); + this.MaximizeBox =3D false; + this.Name =3D "DebugForm"; + this.ShowIcon =3D false; + this.Text =3D "Debug"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox errorText; + private System.Windows.Forms.Button errorCloseBtn; + private System.Windows.Forms.Button errorCopyBtn; + } +} Added: trunk/tools/RosTE/GUI/DebugForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DebugForm.cs?= rev=3D32584&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosTE/GUI/DebugForm.cs (added) +++ trunk/tools/RosTE/GUI/DebugForm.cs Thu Mar 6 16:01:00 2008 @@ -1,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class DebugForm : Form + { + public DebugForm() + { + InitializeComponent(); + } + + public void AddMessage(string message, string exception, string tr= ace) + { + errorText.Text =3D message + " : " + exception + "\n\t" + trac= e; + } + + private void errorCloseBtn_Click(object sender, EventArgs e) + { + Debug.DoDebug =3D false; + Close(); + } + + private void errorCopyBtn_Click(object sender, EventArgs e) + { + Clipboard.SetText(errorText.Text); + } + } + + public static class Debug + { + static DebugForm df =3D null; + static bool doDebug =3D false; + + public static bool DoDebug + { + set { doDebug =3D value; } + get { return doDebug; } + } + + public static void TurnDebuggingOn() + { + if (df =3D=3D null) + { + df =3D new DebugForm(); + df.Show(); + } + + DoDebug =3D true; + } + + public static void TurnDebuggingOff() + { + if (df !=3D null) + { + df.Close(); + df =3D null; + } + + DoDebug =3D false; + } + + public static void LogMessage(string message) + { + LogMessage(message, null, null, false); + } + + public static void LogMessage(string message, string exception) + { + LogMessage(message, exception, null, false); + } + + public static void LogMessage(string message, string exception, st= ring trace) + { + LogMessage(message, exception, trace, false); + } + + public static void LogMessage(string message, string exception, st= ring trace, bool bForce) + { + if (df =3D=3D null && bForce) + { + df =3D new DebugForm(); + df.Show(); + df.AddMessage(message, exception, trace); + } + + if (DoDebug) + df.AddMessage(message, null, null); + } + } +} Added: trunk/tools/RosTE/GUI/DebugForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DebugForm.res= x?rev=3D32584&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosTE/GUI/DebugForm.resx (added) +++ trunk/tools/RosTE/GUI/DebugForm.resx Thu Mar 6 16:01:00 2008 @@ -1,0 +1,120 @@ +<?xml version=3D"1.0" encoding=3D"utf-8"?> +<root> +  + <xsd:schema id=3D"root" xmlns=3D"" xmlns:xsd=3D"http://www.w3.org/2001/X= MLSchema" xmlns:msdata=3D"urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace=3D"http://www.w3.org/XML/1998/namespace" /> + <xsd:element name=3D"root" msdata:IsDataSet=3D"true"> + <xsd:complexType> + <xsd:choice maxOccurs=3D"unbounded"> + <xsd:element name=3D"metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name=3D"value" type=3D"xsd:string" minOccurs= =3D"0" /> + </xsd:sequence> + <xsd:attribute name=3D"name" use=3D"required" type=3D"xsd:st= ring" /> + <xsd:attribute name=3D"type" type=3D"xsd:string" /> + <xsd:attribute name=3D"mimetype" type=3D"xsd:string" /> + <xsd:attribute ref=3D"xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name=3D"assembly"> + <xsd:complexType> + <xsd:attribute name=3D"alias" type=3D"xsd:string" /> + <xsd:attribute name=3D"name" type=3D"xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name=3D"data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name=3D"value" type=3D"xsd:string" minOccurs= =3D"0" msdata:Ordinal=3D"1" /> + <xsd:element name=3D"comment" type=3D"xsd:string" minOccur= s=3D"0" msdata:Ordinal=3D"2" /> + </xsd:sequence> + <xsd:attribute name=3D"name" type=3D"xsd:string" use=3D"requ= ired" msdata:Ordinal=3D"1" /> + <xsd:attribute name=3D"type" type=3D"xsd:string" msdata:Ordi= nal=3D"3" /> + <xsd:attribute name=3D"mimetype" type=3D"xsd:string" msdata:= Ordinal=3D"4" /> + <xsd:attribute ref=3D"xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name=3D"resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name=3D"value" type=3D"xsd:string" minOccurs= =3D"0" msdata:Ordinal=3D"1" /> + </xsd:sequence> + <xsd:attribute name=3D"name" type=3D"xsd:string" use=3D"requ= ired" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name=3D"resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name=3D"version"> + <value>2.0</value> + </resheader> + <resheader name=3D"reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Vers= ion=3D2.0.0.0, Culture=3Dneutral, PublicKeyToken=3Db77a5c561934e089</value> + </resheader> + <resheader name=3D"writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Vers= ion=3D2.0.0.0, Culture=3Dneutral, PublicKeyToken=3Db77a5c561934e089</value> + </resheader> +</root>

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