Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[hpoussin] 42575: [rbuild] Remove distinction between Iso/IsoRegTest, and LiveIso/LiveIsoRegTest module types Better dependency tracking for iso module type
by hpoussin＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: hpoussin Date: Mon Aug 10 00:03:04 2009 New Revision: 42575 URL: http://svn.reactos.org/svn/reactos?rev=42575&view=rev Log: [rbuild] Remove distinction between Iso/IsoRegTest, and LiveIso/LiveIsoRegTest module types Better dependency tracking for iso module type Modified: trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bootcdregtest" type="isoregtest" output="ReactOS-RegTest.iso"> +<module name="bootcdregtest" type="iso" output="ReactOS-RegTest.iso"> <bootsector>isobtrt</bootsector> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> </module> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -11,7 +11,7 @@ <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesft.inf">hivesft_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesys.inf">hivesys_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="unattend.inf.sample">unattend.inf</cdfile> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> Modified: trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -1,5 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="livecdregtest" type="liveisoregtest" output="ReactOS-LiveCD-RegTest.iso"> +<module name="livecdregtest" type="liveiso" output="ReactOS-LiveCD-RegTest.iso"> <bootsector>isobtrt</bootsector> </module> Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -317,9 +317,7 @@ Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { std::string Cbp_file = CbpFileName ( module ); fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); @@ -384,8 +382,6 @@ { case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: return; default: break; Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -98,9 +98,7 @@ { Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -59,8 +59,6 @@ { HostFalse, "", "", "" }, // Win32SCR { HostFalse, "", "", "" }, // IdlHeader { HostFalse, "", "", "" }, // IdlInterface - { HostFalse, "", "", "" }, // IsoRegTest - { HostFalse, "", "", "" }, // LiveIsoRegTest { HostFalse, "", "", "" }, // EmbeddedTypeLib { HostFalse, "", "", "" }, // ElfExecutable { HostFalse, "", "", "" }, // RpcProxy @@ -544,10 +542,6 @@ return false; if ( module.type == LiveIso ) return false; - if ( module.type == IsoRegTest ) - return false; - if ( module.type == LiveIsoRegTest ) - return false; if ( module.type == Test ) return false; if ( module.type == Alias ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -232,12 +232,6 @@ handler = new MingwIsoModuleHandler ( module ); break; case LiveIso: - handler = new MingwLiveIsoModuleHandler ( module ); - break; - case IsoRegTest: - handler = new MingwIsoModuleHandler ( module ); - break; - case LiveIsoRegTest: handler = new MingwLiveIsoModuleHandler ( module ); break; case Test: @@ -2973,7 +2967,8 @@ void MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( - const string& bootcdDirectory ) + const string& bootcdDirectory, + vector<FileLocation>& destinations ) { for ( std::map<std::string, Module*>::const_iterator p = module.project.modules.begin (); p != module.project.modules.end (); ++ p ) { @@ -2987,14 +2982,16 @@ ? bootcdDirectory + sSep + m.bootstrap->base : bootcdDirectory, m.bootstrap->nameoncd ); - OutputCopyCommand ( *m.output, targetFile ); + OutputCopyCommandSingle ( *m.output, targetFile ); + destinations.push_back ( targetFile ); } } } void MingwIsoModuleHandler::OutputCdfileCopyCommands ( - const string& bootcdDirectory ) + const string& bootcdDirectory, + std::vector<FileLocation>& destinations ) { for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { @@ -3004,7 +3001,19 @@ ? bootcdDirectory + sSep + cdfile.target->relative_path : bootcdDirectory, cdfile.target->name ); - OutputCopyCommand ( *cdfile.source, targetFile ); + OutputCopyCommandSingle ( *cdfile.source, targetFile ); + destinations.push_back ( targetFile ); + } + for ( size_t i = 0; i < module.cdfiles.size (); i++ ) + { + const CDFile& cdfile = *module.cdfiles[i]; + FileLocation targetFile ( OutputDirectory, + cdfile.target->relative_path.length () > 0 + ? bootcdDirectory + sSep + cdfile.target->relative_path + : bootcdDirectory, + cdfile.target->name ); + OutputCopyCommandSingle ( *cdfile.source, targetFile ); + destinations.push_back ( targetFile ); } } @@ -3092,25 +3101,13 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { fprintf ( fMakefile, "# ISO MODULE TARGET\n" ); - string bootcdDirectory = "cd"; + string bootcdDirectory = module.name; FileLocation bootcd ( OutputDirectory, bootcdDirectory, "" ); FileLocation bootcdReactos ( OutputDirectory, bootcdDirectory + sSep + Environment::GetCdOutputPath (), "" ); - vector<FileLocation> vSourceFiles, vCdFiles; - vector<FileLocation> vCdDirectories; - - // unattend.inf - FileLocation srcunattend ( SourceDirectory, - "boot" + sSep + "bootdata" + sSep + "bootcdregtest", - "unattend.inf" ); - FileLocation tarunattend ( bootcdReactos.directory, - bootcdReactos.relative_path, - "unattend.inf" ); - if (module.type == IsoRegTest) - vSourceFiles.push_back ( srcunattend ); // bootsector const Module* bootModule = module.bootSector->bootSectorModule; @@ -3124,7 +3121,6 @@ } const FileLocation *isoboot = bootModule->output; - vSourceFiles.push_back ( *isoboot ); // prepare reactos.dff and reactos.inf FileLocation reactosDff ( SourceDirectory, @@ -3134,31 +3130,18 @@ bootcdReactos.relative_path, "reactos.inf" ); - vSourceFiles.push_back ( reactosDff ); - /* We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. Iso/LiveIso outputs are generated in code base root */ string IsoName = module.output->name; - string sourceFiles = v2s ( backend, vSourceFiles, 5 ); - - // fill cdrom - GetCdDirectories ( vCdDirectories, bootcdDirectory ); - GetCdFiles ( vCdFiles ); - string cdDirectories = "";//v2s ( vCdDirectories, 5 ); - string cdFiles = v2s ( backend, vCdFiles, 5 ); - - fprintf ( fMakefile, ".PHONY: %s\n\n", - module.name.c_str ()); - fprintf ( fMakefile, - "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n", + fprintf ( fMakefile, ".PHONY: %s_CABINET\n\n", + module.name.c_str () ); + fprintf ( fMakefile, "%s_CABINET: all $(CABMAN_TARGET) %s | %s\n", module.name.c_str (), - backend->GetFullName ( *isoboot ).c_str (), - sourceFiles.c_str (), - cdFiles.c_str (), - cdDirectories.c_str () ); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), @@ -3169,13 +3152,29 @@ backend->GetFullName ( reactosInf ).c_str (), backend->GetFullPath ( bootcdReactos ).c_str ()); fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", + "\t-@${rm} %s 2>$(NUL)\n\n", backend->GetFullName ( reactosInf ).c_str () ); - OutputBootstrapfileCopyCommands ( bootcdDirectory ); - OutputCdfileCopyCommands ( bootcdDirectory ); - - if (module.type == IsoRegTest) - OutputCopyCommand ( srcunattend, tarunattend ); + + std::vector<FileLocation> sourceFiles; + OutputBootstrapfileCopyCommands ( bootcdDirectory, sourceFiles ); + OutputCdfileCopyCommands ( bootcdDirectory, sourceFiles ); + + fprintf( fMakefile, + "\n%s_OBJS := %s\n\n", + module.name.c_str (), + v2s ( backend, sourceFiles, 5 ).c_str () ); + + fprintf ( fMakefile, ".PHONY: %s\n\n", + module.name.c_str ()); + fprintf ( fMakefile, + "%s: $(%s_OBJS) %s_CABINET %s $(CDMAKE_TARGET) | %s\n", + module.name.c_str (), + module.name.c_str (), + module.name.c_str (), + backend->GetFullName ( *isoboot ).c_str (), + backend->GetFullPath ( FileLocation ( OutputDirectory, + bootcdDirectory, + "" ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -323,8 +323,10 @@ void GetBootstrapCdFiles ( std::vector<FileLocation>& out ) const; void GetNonModuleCdFiles ( std::vector<FileLocation>& out ) const; void GetCdFiles ( std::vector<FileLocation>& out ) const; - void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory ); - void OutputCdfileCopyCommands ( const std::string& bootcdDirectory ); + void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory, + std::vector<FileLocation>& destinations ); + void OutputCdfileCopyCommands ( const std::string& bootcdDirectory, + std::vector<FileLocation>& destinations ); }; Modified: trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/versi… ============================================================================== --- trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -96,9 +96,7 @@ { Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { Module& module = *p->second; Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -63,8 +63,6 @@ case ObjectLibrary: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case Test: case RpcServer: case RpcClient: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -525,6 +525,8 @@ delete linkerFlags[i]; for ( i = 0; i < stubbedComponents.size(); i++ ) delete stubbedComponents[i]; + for ( i = 0; i < cdfiles.size (); i++ ) + delete cdfiles[i]; if ( linkerScript ) delete linkerScript; if ( pch ) @@ -917,6 +919,12 @@ autoRegister = new AutoRegister ( project, this, e ); subs_invalid = true; } + else if ( e.name == "cdfile" ) + { + CDFile* cdfile = new CDFile ( project, e, subpath ); + cdfiles.push_back ( cdfile ); + subs_invalid = true; + } if ( subs_invalid && e.subElements.size() > 0 ) { throw XMLInvalidBuildFileException ( @@ -924,6 +932,8 @@ "<%s> cannot have sub-elements", e.name.c_str() ); } + for ( size_t i = 0; i < cdfiles.size (); i++ ) + cdfiles[i]->ProcessXML (); for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subdirectory, subpath, parseContext ); parseContext.compilationUnit = pOldCompilationUnit; @@ -972,10 +982,6 @@ return Iso; if ( attribute.value == "liveiso" ) return LiveIso; - if ( attribute.value == "isoregtest" ) - return IsoRegTest; - if ( attribute.value == "liveisoregtest" ) - return LiveIsoRegTest; if ( attribute.value == "test" ) return Test; if ( attribute.value == "rpcserver" ) @@ -1026,8 +1032,6 @@ case BootProgram: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case ElfExecutable: case Cabinet: return OutputDirectory; @@ -1089,8 +1093,6 @@ return ".o"; case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: return ".iso"; case Test: return ".exe"; @@ -1149,8 +1151,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1202,8 +1202,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1259,8 +1257,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1317,8 +1313,6 @@ case BootProgram: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1762,9 +1756,7 @@ Bootsector::IsSupportedModuleType ( ModuleType type ) { if ( type == Iso || - type == LiveIso || - type == IsoRegTest || - type == LiveIsoRegTest ) + type == LiveIso ) { return true; } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -315,8 +315,6 @@ Win32SCR, IdlHeader, IdlInterface, - IsoRegTest, - LiveIsoRegTest, EmbeddedTypeLib, ElfExecutable, RpcProxy, @@ -392,6 +390,7 @@ std::vector<CompilerFlag*> compilerFlags; std::vector<LinkerFlag*> linkerFlags; std::vector<StubbedComponent*> stubbedComponents; + std::vector<CDFile*> cdfiles; LinkerScript* linkerScript; PchFile* pch; bool cplusplus;

1 0

[pschweitzer] 42574: Fixed various badly sync files. Reduce warnings, etc...
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Sun Aug 9 23:41:20 2009 New Revision: 42574 URL: http://svn.reactos.org/svn/reactos?rev=42574&view=rev Log: Fixed various badly sync files. Reduce warnings, etc... Modified: branches/pierre-fsd/Makefile branches/pierre-fsd/ReactOS-arm.rbuild branches/pierre-fsd/ReactOS-ppc.rbuild branches/pierre-fsd/config-arm.template.rbuild branches/pierre-fsd/config-ppc.template.rbuild branches/pierre-fsd/config.template.rbuild branches/pierre-fsd/tools/buildno/buildno.cpp Modified: branches/pierre-fsd/Makefile URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/Makefile?rev=42574&r… ============================================================================== --- branches/pierre-fsd/Makefile [iso-8859-1] (original) +++ branches/pierre-fsd/Makefile [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -38,7 +38,7 @@ # This can require several minutes to complete. If you only need to check # dependencies for a single or few modules then you can use the # module_depends targets instead. This target can also repair a damaged or -# missing makefile-{ROS_ARCH}.auto if needed. +# missing makefile-${ROS_ARCH}.auto if needed. # # module_depends # These targets do a dependency check of individual modules. Replace module @@ -127,7 +127,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile.auto +# Alternate name of makefile-${ROS_ARCH}.auto # # ROS_BUILDENGINE # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) @@ -160,7 +160,11 @@ endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile.auto + ifeq ($(ARCH),i386) + ROS_AUTOMAKE=makefile.auto + else + ROS_AUTOMAKE=makefile-$(ARCH).auto + endif endif all: $(ROS_AUTOMAKE) Modified: branches/pierre-fsd/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-arm.rbuild?r… ============================================================================== --- branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-arm.rbuild"> <xi:fallback> <xi:include href="config-arm.template.rbuild" /> @@ -66,6 +66,7 @@ <compilerflag>-O3</compilerflag> </if> + <define name="__MSVCRT__"/> <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> <linkerflag>--strip-debug</linkerflag> @@ -115,9 +116,18 @@ <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> </directory> + <directory name="nt"> + <xi:include href="lib/sdk/nt/nt.rbuild" /> + </directory> <directory name="wdmguid"> <xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" /> </directory> + </directory> + <directory name="ntdllsys"> + <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> + </directory> + <directory name="smlib"> + <xi:include href="lib/smlib/smlib.rbuild" /> </directory> </directory> <directory name="include"> @@ -154,8 +164,8 @@ </directory> </directory> <directory name="filesystems"> - <directory name="cdfs"> - <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" /> + <directory name="fastfat"> + <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> </directory> </directory> <directory name="base"> @@ -166,5 +176,17 @@ <xi:include href="drivers/base/bootvid/bootvid.rbuild" /> </directory> </directory> - </directory> + </directory> + <directory name="dll"> + <directory name="ntdll"> + <xi:include href="dll/ntdll/ntdll.rbuild" /> + </directory> + </directory> + <directory name="base"> + <directory name="system"> + <directory name="smss"> + <xi:include href="base/system/smss/smss.rbuild" /> + </directory> + </directory> + </directory> </project> Modified: branches/pierre-fsd/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-ppc.rbuild?r… ============================================================================== --- branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" /> Modified: branches/pierre-fsd/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-arm.template.… ============================================================================== --- branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -85,4 +85,10 @@ --> <property name="_WINKD_" value="0" /> + +<property name="_ELF_" value="0" /> + </group> Modified: branches/pierre-fsd/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-ppc.template.… ============================================================================== --- branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -65,4 +65,10 @@ --> <property name="NSWPAT" value="0" /> + +<property name="_ELF_" value="0" /> + </group> Modified: branches/pierre-fsd/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config.template.rbui… ============================================================================== --- branches/pierre-fsd/config.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -90,6 +90,12 @@ <property name="_WINKD_" value="0" />  +<property name="_ELF_" value="0" /> + + <property name="BUILD_MP" value="1" /> Modified: branches/pierre-fsd/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/buildno/buildn… ============================================================================== --- branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -33,11 +33,11 @@ #define FALSE 0 #define TRUE 1 -static char * argv0 = ""; +static const char * argv0 = ""; static char * filename = NULL; static char * build_tag = NULL; -int count_wide_string( wchar_t *str ) +int count_wide_string( const wchar_t *str ) { int i; for( i = 0; str[i]; i++ )

1 0

[fireball] 42573: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk.
by fireball＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: fireball Date: Sun Aug 9 22:23:50 2009 New Revision: 42573 URL: http://svn.reactos.org/svn/reactos?rev=42573&view=rev Log: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk. Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h branches/arwinss/reactos/include/reactos/wine/windef.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/psdk/commctrl.h branches/arwinss/reactos/include/reactos/wine/winbase16.h branches/arwinss/reactos/include/reactos/wine/windef16.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghe… ============================================================================== --- branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -31,7 +31,6 @@ #define WIN32_NO_STATUS #include "dbghelp_private.h" #include "winternl.h" -#include <exception.h> #include "wine/winbase16.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -14,10 +14,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winuser16.h" #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> +#include "winuser16.h" #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h" Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co… ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -3749,6 +3749,11 @@ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) +#define ListView_SetCheckState(hwndLV, i, bCheck) \ + { LVITEM _LVi; _LVi.state = INDEXTOSTATEIMAGEMASK((bCheck)?2:1); _LVi.stateMask = LVIS_STATEIMAGEMASK; \ + SNDMSG(hwndLV, LVM_SETITEMSTATE, (WPARAM)(UINT)(i), (LPARAM)(LPLVITEM)&_LVi);} +#define ListView_GetCheckState(hwndLV, i) \ + (((UINT)SNDMSG((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) >> 12) - 1) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \ Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */ Modified: branches/arwinss/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -165,6 +165,8 @@ DWORD dwAllocCount; } WINDEBUGINFO16, *LPWINDEBUGINFO16; +/* definitions specific to Wine 16-bit relaying support */ + /* 32-bit stack layout after __wine_call_to_16() */ typedef struct _STACK32FRAME { @@ -202,6 +204,19 @@ WORD cs; /* 2e */ } STACK16FRAME; +/* argument type flags for relay debugging */ +enum arg_types +{ + ARG_NONE = 0, /* indicates end of arg list */ + ARG_WORD, /* unsigned word */ + ARG_SWORD, /* signed word */ + ARG_LONG, /* long or segmented pointer */ + ARG_PTR, /* linear pointer */ + ARG_STR, /* linear pointer to null-terminated string */ + ARG_SEGSTR, /* segmented pointer to null-terminated string */ + ARG_VARARG /* start of varargs */ +}; + #include <poppack.h> #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) @@ -301,6 +316,13 @@ #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT) + + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; /* undocumented functions */ WORD WINAPI AllocCStoDSAlias16(WORD); Removed: branches/arwinss/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef.h (removed) @@ -1,1 +1,0 @@ -#include "../../psdk/windef.h" Modified: branches/arwinss/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -28,6 +28,9 @@ #endif #include <windef.h> #include <winbase.h> +#ifndef _NTNDK_ +#include <exception.h> // ROS Hack +#endif /* Standard data types */ typedef unsigned short BOOL16;

1 0

[pschweitzer] 42572: Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Sun Aug 9 21:46:27 2009 New Revision: 42572 URL: http://svn.reactos.org/svn/reactos?rev=42572&view=rev Log: Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild Modified: branches/pierre-fsd/dll/ntdll/ntdll.rbuild branches/pierre-fsd/tools/winebuild/build.h branches/pierre-fsd/tools/winebuild/parser.c branches/pierre-fsd/tools/winebuild/spec32.c Modified: branches/pierre-fsd/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/ntdll/ntdll.rbui… ============================================================================== --- branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -6,7 +6,7 @@ </module> <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes"> <bootstrap installbase="$(CDOUTPUT)/system32" /> - <importlibrary definition="def/ntdll.def" /> + <importlibrary definition="def/ntdll_$(ARCH).def" /> <include base="ntdll">include</include> <include base="ntdll" root="intermediate"></include> <include base="ReactOS">include/reactos/subsys</include> Modified: branches/pierre-fsd/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/buil… ============================================================================== --- branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -40,6 +40,7 @@ TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ + TYPE_FASTCALL, /* fastcall function (Win32) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; Modified: branches/pierre-fsd/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/pars… ============================================================================== --- branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -57,6 +57,7 @@ "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ + "fastcall", /* TYPE_FASTCALL */ "extern" /* TYPE_EXTERN */ }; @@ -513,6 +514,7 @@ case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_FASTCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: Modified: branches/pierre-fsd/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/spec… ============================================================================== --- branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -624,9 +624,6 @@ if (!(odp->flags & FLAG_PRIVATE)) total++; - - output( " %s", name ); - switch(odp->type) { case TYPE_EXTERN: @@ -635,12 +632,14 @@ case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ + output( " %s", name ); if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); break; case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); + output( " %s", name ); if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { @@ -677,6 +676,7 @@ } case TYPE_STUB: { + output( " %s", name ); if (!kill_at) { const char *check = name + strlen(name);

1 0

[gschneider] 42571: Revert r42536 for build server diagnosis
by gschneider＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: gschneider Date: Sun Aug 9 21:30:35 2009 New Revision: 42571 URL: http://svn.reactos.org/svn/reactos?rev=42571&view=rev Log: Revert r42536 for build server diagnosis Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] Sun Aug 9 21:30:35 2009 @@ -627,7 +627,7 @@ DWORD dwErr; dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); + cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, NULL, 0, NULL, NULL); bRet = cchAscii > 0; @@ -641,7 +641,7 @@ if(bRet) { bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); + cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); bRet = cchAscii > 0 && !bInvalidChars;

1 0

[pschweitzer] 42570: Fixed rbuild build
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Sun Aug 9 20:19:42 2009 New Revision: 42570 URL: http://svn.reactos.org/svn/reactos?rev=42570&view=rev Log: Fixed rbuild build Modified: branches/pierre-fsd/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/pierre-fsd/tools/rbuild/backend/mingw/mingw.cpp branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.cpp branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.h branches/pierre-fsd/tools/rbuild/backend/msbuild/msbuild.cpp branches/pierre-fsd/tools/rbuild/backend/msvc/msvcmaker.cpp branches/pierre-fsd/tools/rbuild/backend/msvc/vcprojmaker.cpp branches/pierre-fsd/tools/rbuild/module.cpp branches/pierre-fsd/tools/rbuild/project.cpp branches/pierre-fsd/tools/rbuild/rbuild.h branches/pierre-fsd/tools/rbuild/testsupportcode.cpp Modified: branches/pierre-fsd/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -423,16 +423,6 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); - for ( i = 0; i < data.ifs.size(); i++ ) - { - const Property* property = _lookup_property( module, data.ifs[i]->property ); - if ( property != NULL ) - { - if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || - data.ifs[i]->value != property->value && data.ifs[i]->negated) - ifs_list.push_back ( &data.ifs[i]->data ); - } - } const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { Modified: branches/pierre-fsd/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -245,25 +245,6 @@ if ( compilationUnit.GetFiles ().size () != 1 ) return false; } - // intentionally make a copy so that we can append more work in - // the middle of processing without having to go recursive - vector<If*> v = module.non_if_data.ifs; - for ( i = 0; i < v.size (); i++ ) - { - size_t j; - If& rIf = *v[i]; - // check for sub-ifs to add to list - const vector<If*>& ifs = rIf.data.ifs; - for ( j = 0; j < ifs.size (); j++ ) - v.push_back ( ifs[j] ); - const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; - for ( j = 0; j < compilationUnits.size (); j++ ) - { - CompilationUnit& compilationUnit = *compilationUnits[j]; - if ( compilationUnit.GetFiles ().size () != 1 ) - return false; - } - } return true; } @@ -446,27 +427,6 @@ GenerateProjectCFlagsMacro ( assignmentOperation, data ); } - - for ( i = 0; i < data.ifs.size(); i++ ) - { - const If& rIf = *data.ifs[i]; - if ( rIf.data.defines.size() - || rIf.data.includes.size() - || rIf.data.ifs.size() ) - { - fprintf ( - fMakefile, - "ifeq (\"$(%s)\",\"%s\")\n", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateGlobalCFlagsAndProperties ( - "+=", - rIf.data ); - fprintf ( - fMakefile, - "endif\n\n" ); - } - } } void @@ -536,32 +496,10 @@ const char* assignmentOperation, IfableData& data ) const { - size_t i; - if ( data.compilerFlags.size() ) { GenerateProjectGccOptionsMacro ( assignmentOperation, data ); - } - - for ( i = 0; i < data.ifs.size(); i++ ) - { - If& rIf = *data.ifs[i]; - if ( rIf.data.compilerFlags.size() - || rIf.data.ifs.size() ) - { - fprintf ( - fMakefile, - "ifeq (\"$(%s)\",\"%s\")\n", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateProjectGccOptions ( - "+=", - rIf.data ); - fprintf ( - fMakefile, - "endif\n\n" ); - } } } @@ -1329,7 +1267,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ROS_ARCH) boot%cbootdata%chiveinst_$(ROS_ARCH).inf\n", + "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile, Modified: branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -165,15 +165,8 @@ MingwModuleHandler* handler; switch ( module.type ) { - case BuildTool: - handler = new MingwBuildToolModuleHandler ( module ); - break; case StaticLibrary: - handler = new MingwStaticLibraryModuleHandler ( module ); - break; case HostStaticLibrary: - handler = new MingwHostStaticLibraryModuleHandler ( module ); - break; case ObjectLibrary: case RpcServer: case RpcClient: @@ -184,6 +177,9 @@ case EmbeddedTypeLib: case BootSector: handler = new MingwModuleHandler( module ); + break; + case BuildTool: + handler = new MingwBuildToolModuleHandler ( module ); break; case Kernel: handler = new MingwKernelModuleHandler ( module ); @@ -233,29 +229,11 @@ case Test: handler = new MingwTestModuleHandler ( module ); break; - case RpcServer: - handler = new MingwRpcServerModuleHandler ( module ); - break; - case RpcClient: - handler = new MingwRpcClientModuleHandler ( module ); - break; - case RpcProxy: - handler = new MingwRpcProxyModuleHandler ( module ); - break; case Alias: handler = new MingwAliasModuleHandler ( module ); break; - case MessageHeader: - handler = new MingwMessageHeaderModuleHandler (module); - break; - case IdlHeader: - handler = new MingwIdlHeaderModuleHandler ( module ); - break; case Cabinet: handler = new MingwCabinetModuleHandler ( module ); - break; - case EmbeddedTypeLib: - handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; case ElfExecutable: handler = new MingwElfExecutableModuleHandler ( module ); @@ -308,13 +286,6 @@ return new FileLocation ( IntermediateDirectory, module.output->relative_path, ReplaceExtension ( module.name, ".temp.a" ) ); -} - -bool -MingwModuleHandler::IsGeneratedFile ( const File& file ) const -{ - string extension = GetExtension ( file.file ); - return ( extension == ".spec" || extension == ".SPEC" ); } /*static*/ bool @@ -839,34 +810,6 @@ deps.c_str() ); } } - - const vector<If*>& ifs = data.ifs; - for ( i = 0; i < ifs.size(); i++ ) - { - If& rIf = *ifs[i]; - if ( rIf.data.defines.size() - || rIf.data.includes.size() - || rIf.data.libraries.size() - || rIf.data.compilationUnits.size() - || rIf.data.compilerFlags.size() - || rIf.data.ifs.size() ) - { - fprintf ( - fMakefile, - "%s (\"$(%s)\",\"%s\")\n", - rIf.negated ? "ifneq" : "ifeq", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateMacros ( - "+=", - rIf.data, - NULL, - used_defs ); - fprintf ( - fMakefile, - "endif\n\n" ); - } - } } void @@ -883,7 +826,6 @@ void MingwModuleHandler::GenerateSourceMacros ( - const char* assignmentOperation, const IfableData& data ) { size_t i; @@ -895,9 +837,8 @@ { fprintf ( fMakefile, - "%s %s", - sourcesMacro.c_str (), - assignmentOperation ); + "%s =", + sourcesMacro.c_str () ); for ( i = 0; i < compilationUnits.size(); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; @@ -911,32 +852,6 @@ fprintf ( fMakefile, "\n" ); } - const vector<If*>& ifs = data.ifs; - for ( i = 0; i < ifs.size(); i++ ) - { - If& rIf = *ifs[i]; - if ( rIf.data.defines.size() - || rIf.data.includes.size() - || rIf.data.libraries.size() - || rIf.data.compilationUnits.size() - || rIf.data.compilerFlags.size() - || rIf.data.ifs.size() ) - { - fprintf ( - fMakefile, - "%s (\"$(%s)\",\"%s\")\n", - rIf.negated ? "ifneq" : "ifeq", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateSourceMacros ( - "+=", - rIf.data ); - fprintf ( - fMakefile, - "endif\n\n" ); - } - } - vector<CompilationUnit*> sourceCompilationUnits; GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) @@ -953,10 +868,10 @@ void MingwModuleHandler::GenerateObjectMacros ( - const char* assignmentOperation, const IfableData& data ) { size_t i; + const char* assignmentOperation = "="; const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; vector<const FileLocation *> headers; @@ -973,11 +888,12 @@ const FileLocation& compilationName = compilationUnit.GetFilename (); const FileLocation *object_file = GetObjectFilename ( &compilationName, module ); fprintf ( fMakefile, - "%s := %s $(%s)\n", + "%s := %s\n", objectsMacro.c_str(), - backend->GetFullName ( *object_file ).c_str (), - objectsMacro.c_str() ); + backend->GetFullName ( *object_file ).c_str () ); delete object_file; + assignmentOperation = "+="; + break; } } fprintf ( @@ -1068,32 +984,6 @@ delete mcresources[i]; } fprintf ( fMakefile, "\n" ); - } - - const vector<If*>& ifs = data.ifs; - for ( i = 0; i < ifs.size(); i++ ) - { - If& rIf = *ifs[i]; - if ( rIf.data.defines.size() - || rIf.data.includes.size() - || rIf.data.libraries.size() - || rIf.data.compilationUnits.size() - || rIf.data.compilerFlags.size() - || rIf.data.ifs.size() ) - { - fprintf ( - fMakefile, - "%s (\"$(%s)\",\"%s\")\n", - rIf.negated ? "ifneq" : "ifeq", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateObjectMacros ( - "+=", - rIf.data ); - fprintf ( - fMakefile, - "endif\n\n" ); - } } vector<CompilationUnit*> sourceCompilationUnits; @@ -1849,12 +1739,6 @@ "\n" ); } - const vector<If*>& ifs = data.ifs; - for ( i = 0; i < ifs.size(); i++ ) - { - GenerateObjectFileTargets ( ifs[i]->data ); - } - vector<CompilationUnit*> sourceCompilationUnits; GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) @@ -2035,9 +1919,7 @@ { sourcesMacro = ssprintf ( "%s_SOURCES", module.name.c_str ()); - GenerateSourceMacros ( - "=", - module.non_if_data ); + GenerateSourceMacros ( module.non_if_data ); // future references to the macro will be to get its values sourcesMacro = ssprintf ("$(%s)", sourcesMacro.c_str ()); @@ -2048,9 +1930,7 @@ { objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); - GenerateObjectMacros ( - "=", - module.non_if_data ); + GenerateObjectMacros ( module.non_if_data ); // future references to the macro will be to get its values objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); @@ -2798,84 +2678,11 @@ } -MingwStaticLibraryModuleHandler::MingwStaticLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwStaticLibraryModuleHandler::Process () -{ - GenerateStaticLibraryModuleTarget (); -} - -void -MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget () -{ - GenerateRules (); -} - - -MingwHostStaticLibraryModuleHandler::MingwHostStaticLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwHostStaticLibraryModuleHandler::Process () -{ - GenerateHostStaticLibraryModuleTarget (); -} - -void -MingwHostStaticLibraryModuleHandler::GenerateHostStaticLibraryModuleTarget () -{ - GenerateRules (); -} - - -MingwObjectLibraryModuleHandler::MingwObjectLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwObjectLibraryModuleHandler::Process () -{ - GenerateObjectLibraryModuleTarget (); -} - -void -MingwObjectLibraryModuleHandler::GenerateObjectLibraryModuleTarget () -{ - GenerateRules (); -} - - MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) { -} - -MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwEmbeddedTypeLibModuleHandler::Process () -{ - GenerateRules (); } @@ -3728,7 +3535,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst.inf\n", + "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), cSep, cSep, cSep, cSep ); } @@ -3844,48 +3651,6 @@ } -MingwRpcServerModuleHandler::MingwRpcServerModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcServerModuleHandler::Process () -{ - GenerateRules (); -} - - -MingwRpcClientModuleHandler::MingwRpcClientModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcClientModuleHandler::Process () -{ - GenerateRules (); -} - - -MingwRpcProxyModuleHandler::MingwRpcProxyModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcProxyModuleHandler::Process () -{ - GenerateRules (); -} - - MingwAliasModuleHandler::MingwAliasModuleHandler ( const Module& module_ ) @@ -3898,31 +3663,6 @@ { } -MingwMessageHeaderModuleHandler::MingwMessageHeaderModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwMessageHeaderModuleHandler::Process () -{ - GenerateRules (); -} - -MingwIdlHeaderModuleHandler::MingwIdlHeaderModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwIdlHeaderModuleHandler::Process () -{ - GenerateRules (); -} MingwCabinetModuleHandler::MingwCabinetModuleHandler ( const Module& module_ ) Modified: branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -72,9 +72,8 @@ static MingwModuleHandler* InstanciateHandler ( const Module& module_, MingwBackend* backend_ ); - virtual HostType DefaultHost() = 0; void GeneratePreconditionDependencies (); - virtual void Process () = 0; + virtual void Process () { GenerateRules (); } void GenerateInvocations () const; void GenerateCleanTarget () const; void GenerateInstallTarget () const; @@ -90,7 +89,6 @@ std::string GetBasename ( const std::string& filename ) const; std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const; const FileLocation* GetModuleArchiveFilename () const; - bool IsGeneratedFile ( const File& file ) const; std::string GetImportLibraryDependency ( const Module& importedModule ); void GetTargets ( const Module& dependencyModule, string_list& targets ); @@ -136,10 +134,8 @@ const IfableData& data, const std::vector<LinkerFlag*>* linkerFlags, std::set<const Define *>& used_defs ); - void GenerateSourceMacros ( const char* assignmentOperation, - const IfableData& data ); - void GenerateObjectMacros ( const char* assignmentOperation, - const IfableData& data ); + void GenerateSourceMacros ( const IfableData& data ); + void GenerateObjectMacros ( const IfableData& data ); const FileLocation* GetPrecompiledHeaderFilename () const; const FileLocation* GetDlldataFilename () const; void GenerateGccCommand ( const FileLocation* sourceFile, @@ -195,7 +191,6 @@ { public: MingwBuildToolModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostTrue; } virtual void Process (); private: void GenerateBuildToolModuleTarget (); @@ -206,51 +201,16 @@ { public: MingwKernelModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateKernelModuleTarget (); }; -class MingwStaticLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwStaticLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -private: - void GenerateStaticLibraryModuleTarget (); -}; - - -class MingwHostStaticLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwHostStaticLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostTrue; } - virtual void Process (); -private: - void GenerateHostStaticLibraryModuleTarget (); -}; - - -class MingwObjectLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwObjectLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -private: - void GenerateObjectLibraryModuleTarget (); -}; - - class MingwKernelModeDLLModuleHandler : public MingwModuleHandler { public: MingwKernelModeDLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -262,7 +222,6 @@ { public: MingwNativeDLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -274,7 +233,6 @@ { public: MingwNativeCUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -286,7 +244,6 @@ { public: MingwWin32DLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -298,7 +255,6 @@ { public: MingwWin32OCXModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -310,7 +266,6 @@ { public: MingwWin32CUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -322,7 +277,6 @@ { public: MingwWin32GUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -334,7 +288,6 @@ { public: MingwBootLoaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateBootLoaderModuleTarget (); @@ -345,7 +298,6 @@ { public: MingwBootProgramModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string GetProgTextAddrMacro (); private: @@ -357,7 +309,6 @@ { public: MingwIsoModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateIsoModuleTarget (); @@ -376,7 +327,6 @@ { public: MingwLiveIsoModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateLiveIsoModuleTarget (); @@ -395,7 +345,6 @@ { public: MingwTestModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); protected: virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); @@ -403,54 +352,10 @@ void GenerateTestModuleTarget (); }; - -class MingwRpcServerModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcServerModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - - -class MingwRpcClientModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcClientModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - - -class MingwRpcProxyModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcProxyModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwMessageHeaderModuleHandler : public MingwModuleHandler -{ -public: - MingwMessageHeaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - class MingwAliasModuleHandler : public MingwModuleHandler { public: MingwAliasModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwIdlHeaderModuleHandler : public MingwModuleHandler -{ -public: - MingwIdlHeaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; @@ -458,15 +363,6 @@ { public: MingwCabinetModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler -{ -public: - MingwEmbeddedTypeLibModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; @@ -474,7 +370,6 @@ { public: MingwElfExecutableModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; Modified: branches/pierre-fsd/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/msbuild/msbuild.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/msbuild/msbuild.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -100,16 +100,6 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); - for ( i = 0; i < data.ifs.size(); i++ ) - { - const Property* property = _lookup_property( module, data.ifs[i]->property ); - if ( property != NULL ) - { - if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || - data.ifs[i]->value != property->value && data.ifs[i]->negated) - ifs_list.push_back ( &data.ifs[i]->data ); - } - } const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { Modified: branches/pierre-fsd/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -95,9 +95,6 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); - // TODO FIXME - refactor needed - we're discarding if conditions - for ( i = 0; i < data.ifs.size(); i++ ) - ifs_list.push_back ( &data.ifs[i]->data ); const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { Modified: branches/pierre-fsd/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/backend… ============================================================================== --- branches/pierre-fsd/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -147,16 +147,6 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); - for ( i = 0; i < data.ifs.size(); i++ ) - { - const Property* property = _lookup_property( module, data.ifs[i]->property ); - if ( property != NULL ) - { - if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || - data.ifs[i]->value != property->value && data.ifs[i]->negated) - ifs_list.push_back ( &data.ifs[i]->data ); - } - } const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { Modified: branches/pierre-fsd/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/module.… ============================================================================== --- branches/pierre-fsd/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/module.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Casper S. Hornstrup + * Copyright (C) 2008 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -210,8 +211,6 @@ delete compilerFlags[i]; for ( i = 0; i < modules.size(); i++ ) delete modules[i]; - for ( i = 0; i < ifs.size (); i++ ) - delete ifs[i]; for ( i = 0; i < compilationUnits.size (); i++ ) delete compilationUnits[i]; } @@ -229,8 +228,6 @@ p->second->ProcessXML (); for ( i = 0; i < compilerFlags.size(); i++ ) compilerFlags[i]->ProcessXML (); - for ( i = 0; i < ifs.size (); i++ ) - ifs[i]->ProcessXML (); for ( i = 0; i < compilationUnits.size (); i++ ) compilationUnits[i]->ProcessXML (); } @@ -604,7 +601,6 @@ const string& relative_path, ParseContext& parseContext ) { - If* pOldIf = parseContext.ifData; CompilationUnit* pOldCompilationUnit = parseContext.compilationUnit; bool subs_invalid = false; string subpath ( relative_path ); @@ -650,46 +646,35 @@ else { CompilationUnit* pCompilationUnit = new CompilationUnit ( pFile ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + string ext = ToLower ( GetExtension ( e.value ) ); + if ( ext == ".idl" ) + { + // put .idl files at the start of the module + non_if_data.compilationUnits.insert ( + non_if_data.compilationUnits.begin(), + pCompilationUnit ); + } + else if ( ext == ".asm" || ext == ".s" ) + { + // put .asm files at the end of the module + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + non_if_data.asmFiles++; + } else { - string ext = ToLower ( GetExtension ( e.value ) ); - if ( ext == ".idl" ) - { - // put .idl files at the start of the module - non_if_data.compilationUnits.insert ( - non_if_data.compilationUnits.begin(), - pCompilationUnit ); - } - else if ( ext == ".asm" || ext == ".s" ) - { - // put .asm files at the end of the module - non_if_data.compilationUnits.push_back ( pCompilationUnit ); - non_if_data.asmFiles++; - } - else - { - // put other files in the middle - non_if_data.compilationUnits.insert ( - non_if_data.compilationUnits.end() - non_if_data.asmFiles, - pCompilationUnit ); - } + // put other files in the middle + non_if_data.compilationUnits.insert ( + non_if_data.compilationUnits.end() - non_if_data.asmFiles, + pCompilationUnit ); } } - if ( parseContext.ifData ) - parseContext.ifData->data.files.push_back ( pFile ); - else - non_if_data.files.push_back ( pFile ); + non_if_data.files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) { Library* pLibrary = new Library ( e, *this, e.value ); - if ( parseContext.ifData ) - parseContext.ifData->data.libraries.push_back ( pLibrary ); - else - non_if_data.libraries.push_back ( pLibrary ); + non_if_data.libraries.push_back ( pLibrary ); subs_invalid = true; } else if ( e.name == "directory" ) @@ -716,73 +701,37 @@ else if ( e.name == "include" ) { Include* include = new Include ( project, &e, this ); - if ( parseContext.ifData ) - parseContext.ifData->data.includes.push_back ( include ); - else - non_if_data.includes.push_back ( include ); + non_if_data.includes.push_back ( include ); subs_invalid = true; } else if ( e.name == "define" ) { Define* pDefine = new Define ( project, this, e ); - if ( parseContext.ifData ) - parseContext.ifData->data.defines.push_back ( pDefine ); - else - non_if_data.defines.push_back ( pDefine ); + non_if_data.defines.push_back ( pDefine ); subs_invalid = true; } else if ( e.name == "metadata" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<metadata> is not a valid sub-element of <if>" ); - } metadata = new Metadata ( e, *this ); subs_invalid = false; } else if ( e.name == "invoke" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<invoke> is not a valid sub-element of <if>" ); - } invocations.push_back ( new Invoke ( e, *this ) ); subs_invalid = false; } else if ( e.name == "dependency" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<dependency> is not a valid sub-element of <if>" ); - } dependencies.push_back ( new Dependency ( e, *this ) ); subs_invalid = true; } else if ( e.name == "bootsector" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<bootsector> is not a valid sub-element of <if>" ); - } bootSector = new Bootsector ( e, this ); subs_invalid = true; } else if ( e.name == "importlibrary" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<importlibrary> is not a valid sub-element of <if>" ); - } if ( importLibrary ) { throw XMLInvalidBuildFileException ( @@ -792,7 +741,7 @@ SetImportLibrary ( new ImportLibrary ( project, e, this ) ); subs_invalid = true; } - else if ( e.name == "if" ) + else if ( e.name == "if" || e.name == "ifnot" ) { const XMLAttribute* name; name = e.GetAttribute ( "property", true ); @@ -826,22 +775,10 @@ } subs_invalid = false; } - else if ( e.name == "ifnot" ) - { - parseContext.ifData = new If ( e, project, this, true ); - if ( pOldIf ) - pOldIf->data.ifs.push_back ( parseContext.ifData ); - else - non_if_data.ifs.push_back ( parseContext.ifData ); - subs_invalid = false; - } else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); - else - non_if_data.compilerFlags.push_back ( pCompilerFlag ); + non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; } else if ( e.name == "linkerflag" ) @@ -851,12 +788,6 @@ } else if ( e.name == "linkerscript" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<linkerscript> is not a valid sub-element of <if>" ); - } if ( linkerScript ) { throw XMLInvalidBuildFileException ( @@ -896,12 +827,6 @@ } else if ( e.name == "pch" ) { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<pch> is not a valid sub-element of <if>" ); - } if ( pch ) { throw XMLInvalidBuildFileException ( @@ -928,10 +853,7 @@ if ( project.configuration.CompilationUnitsEnabled ) { CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); - else - non_if_data.compilationUnits.push_back ( pCompilationUnit ); + non_if_data.compilationUnits.push_back ( pCompilationUnit ); parseContext.compilationUnit = pCompilationUnit; } subs_invalid = false; @@ -957,7 +879,6 @@ } for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subdirectory, subpath, parseContext ); - parseContext.ifData = pOldIf; parseContext.compilationUnit = pOldCompilationUnit; } @@ -1155,14 +1076,17 @@ case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: + if (Environment::GetArch() == "arm") return "DriverEntry"; return "DriverEntry@8"; case NativeDLL: - return "DllMainCRTStartup@12"; + if (Environment::GetArch() == "arm") return "DllMainCRTStartup"; + return "DllMainCRTStartup@12"; case NativeCUI: if (Environment::GetArch() == "arm") return "NtProcessStartup"; return "NtProcessStartup@4"; case Win32DLL: case Win32OCX: + if (Environment::GetArch() == "arm") return "DllMain"; return "DllMain@12"; case Win32CUI: case Test: @@ -1432,11 +1356,6 @@ if ( compilationUnit->HasFileWithExtension ( extension ) ) return true; } - for ( i = 0; i < data.ifs.size (); i++ ) - { - if ( HasFileWithExtension ( data.ifs[i]->data, extension ) ) - return true; - } return false; } @@ -1937,34 +1856,6 @@ } -If::If ( const XMLElement& node_, - const Project& project_, - const Module* module_, - const bool negated_ ) - : node(node_), project(project_), module(module_), negated(negated_) -{ - const XMLAttribute* att; - - att = node.GetAttribute ( "property", true ); - assert(att); - property = att->value; - - att = node.GetAttribute ( "value", true ); - assert(att); - value = att->value; -} - -If::~If () -{ -} - -void -If::ProcessXML() -{ - -} - - Property::Property ( const XMLElement& node_, const Project& project_, const Module* module_ ) Modified: branches/pierre-fsd/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/project… ============================================================================== --- branches/pierre-fsd/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/project.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Casper S. Hornstrup + * Copyright (C) 2008 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -93,8 +94,7 @@ } ParseContext::ParseContext () - : ifData (NULL), - compilationUnit (NULL) + : compilationUnit (NULL) { } @@ -315,27 +315,6 @@ non_if_data.ExtractModules( modules ); - for ( i = 0; i < non_if_data.ifs.size (); i++ ) - { - const Property *property = - LookupProperty( non_if_data.ifs[i]->property ); - - if( !property ) continue; - - bool conditionTrue = - (non_if_data.ifs[i]->negated && - (property->value != non_if_data.ifs[i]->value)) || - (property->value == non_if_data.ifs[i]->value); - if ( conditionTrue ) - non_if_data.ifs[i]->data.ExtractModules( modules ); - else - { - If * if_data = non_if_data.ifs[i]; - non_if_data.ifs.erase ( non_if_data.ifs.begin () + i ); - delete if_data; - i--; - } - } for ( i = 0; i < linkerFlags.size (); i++ ) linkerFlags[i]->ProcessXML (); for( std::map<std::string, Module*>::const_iterator p = modules.begin(); p != modules.end(); ++ p ) @@ -352,7 +331,6 @@ ParseContext& parseContext ) { bool subs_invalid = false; - If* pOldIf = parseContext.ifData; string subpath(path); if ( e.name == "module" ) @@ -364,10 +342,7 @@ "module name conflict: '%s' (originally defined at %s)", module->name.c_str(), module->node.location.c_str() ); - if ( parseContext.ifData ) - parseContext.ifData->data.modules.push_back( module ); - else - non_if_data.modules.push_back ( module ); + non_if_data.modules.push_back ( module ); return; // defer processing until later } else if ( e.name == "cdfile" ) @@ -415,10 +390,7 @@ else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( *this, e ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); - else - non_if_data.compilerFlags.push_back ( pCompilerFlag ); + non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; } else if ( e.name == "linkerflag" ) @@ -426,7 +398,7 @@ linkerFlags.push_back ( new LinkerFlag ( *this, e ) ); subs_invalid = true; } - else if ( e.name == "if" ) + else if ( e.name == "if" || e.name == "ifnot" ) { const XMLAttribute* name; name = e.GetAttribute ( "property", true ); @@ -460,15 +432,6 @@ } subs_invalid = false; } - else if ( e.name == "ifnot" ) - { - parseContext.ifData = new If ( e, *this, NULL, true ); - if ( pOldIf ) - pOldIf->data.ifs.push_back ( parseContext.ifData ); - else - non_if_data.ifs.push_back ( parseContext.ifData ); - subs_invalid = false; - } else if ( e.name == "property" ) { Property* property = new Property ( e, *this, NULL ); @@ -483,8 +446,6 @@ } for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); - - parseContext.ifData = pOldIf; } Module* Modified: branches/pierre-fsd/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/rbuild.… ============================================================================== --- branches/pierre-fsd/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/rbuild.h [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -83,7 +83,6 @@ class InvokeFile; class Dependency; class ImportLibrary; -class If; class CompilerFlag; class LinkerFlag; class LinkerScript; @@ -204,7 +203,6 @@ class ParseContext { public: - If* ifData; CompilationUnit* compilationUnit; ParseContext (); }; @@ -221,7 +219,6 @@ std::map<std::string, Property*> properties; std::vector<Module*> modules; std::vector<CompilerFlag*> compilerFlags; - std::vector<If*> ifs; int asmFiles; // number of .asm files in compilationUnits IfableData(); @@ -262,6 +259,7 @@ const Module* LocateModule ( const std::string& name ) const; const std::string& GetProjectFilename () const; std::string ResolveProperties ( const std::string& s ) const; + const Property* LookupProperty ( const std::string& name ) const; private: std::string ResolveNextProperty ( const std::string& s ) const; void ReadXml (); @@ -307,10 +305,10 @@ ElfExecutable, RpcProxy, HostStaticLibrary, - TypeDontCare, Cabinet, KeyboardLayout, - MessageHeader + MessageHeader, + TypeDontCare, // always at the end }; enum HostType @@ -611,26 +609,6 @@ }; -class If -{ -public: - const XMLElement& node; - const Project& project; - const Module* module; - const bool negated; - std::string property, value; - IfableData data; - - If ( const XMLElement& node_, - const Project& project_, - const Module* module_, - const bool negated_ = false ); - ~If(); - - void ProcessXML(); -}; - - class CompilerFlag { public: Modified: branches/pierre-fsd/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/rbuild/testsup… ============================================================================== --- branches/pierre-fsd/tools/rbuild/testsupportcode.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/rbuild/testsupportcode.cpp [iso-8859-1] Sun Aug 9 20:19:42 2009 @@ -312,27 +312,6 @@ if ( !compilationUnits[i]->IsGeneratedFile () && IsTestFile ( filename ) ) list.push_back ( filename ); } - // intentionally make a copy so that we can append more work in - // the middle of processing without having to go recursive - vector<If*> v = module.non_if_data.ifs; - for ( i = 0; i < v.size (); i++ ) - { - size_t j; - If& rIf = *v[i]; - // check for sub-ifs to add to list - const vector<If*>& ifs = rIf.data.ifs; - for ( j = 0; j < ifs.size (); j++ ) - v.push_back ( ifs[j] ); - const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; - for ( j = 0; j < compilationUnits.size (); j++ ) - { - CompilationUnit& compilationUnit = *compilationUnits[j]; - const FileLocation& sourceFileLocation = compilationUnits[j]->GetFilename (); - string filename = sourceFileLocation.relative_path + sSep + sourceFileLocation.name; - if ( !compilationUnit.IsGeneratedFile () && IsTestFile ( filename ) ) - list.push_back ( filename ); - } - } } char*

1 0

[dgorbachev] 42569: Do not call CcUnpinData() with NULL PtrBCB.
by dgorbachev＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: dgorbachev Date: Sun Aug 9 19:26:10 2009 New Revision: 42569 URL: http://svn.reactos.org/svn/reactos?rev=42569&view=rev Log: Do not call CcUnpinData() with NULL PtrBCB. Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] Sun Aug 9 19:26:10 2009 @@ -1410,8 +1410,12 @@ } } - CcUnpinData( PtrBCB ); - PtrBCB = NULL; + // FIXME + if( PtrBCB ) + { + CcUnpinData( PtrBCB ); + PtrBCB = NULL; + } return InodeNo; }

1 0

[cwittich] 42568: always wait after killing a vm
by cwittich＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: cwittich Date: Sun Aug 9 19:25:27 2009 New Revision: 42568 URL: http://svn.reactos.org/svn/reactos?rev=42568&view=rev Log: always wait after killing a vm Modified: trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=42568&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Sun Aug 9 19:25:27 2009 @@ -178,6 +178,7 @@ /* SysregPrintf("Error: Virtual Machine is already running.\n"); goto cleanup; */ system("virsh destroy ReactOS"); + usleep(1000); } /* If the HD image already exists, delete it */ @@ -228,7 +229,7 @@ virDomainUndefine(vDom); virDomainFree(vDom); - sleep(1); + usleep(1000); /* If we have a checkpoint to reach for success, assume that the application used for running the tests (probably "rosautotest")

1 0

[cwittich] 42567: wait after killing the vm to give libvirt a chance to release resources
by cwittich＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: cwittich Date: Sun Aug 9 18:50:16 2009 New Revision: 42567 URL: http://svn.reactos.org/svn/reactos?rev=42567&view=rev Log: wait after killing the vm to give libvirt a chance to release resources Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=42567&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sun Aug 9 18:50:16 2009 @@ -160,7 +160,7 @@ } /* Output the line, raddr2line the included addresses if necessary */ - if (ResolveAddressFromFile(Raddr2LineBuffer, BUFFER_SIZE, Buffer)) + if ((KdbgHit == 1) && (ResolveAddressFromFile(Raddr2LineBuffer, BUFFER_SIZE, Buffer))) printf("%s", Raddr2LineBuffer); else printf("%s", Buffer); Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=42567&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Sun Aug 9 18:50:16 2009 @@ -228,6 +228,8 @@ virDomainUndefine(vDom); virDomainFree(vDom); + sleep(1); + /* If we have a checkpoint to reach for success, assume that the application used for running the tests (probably "rosautotest") continues with the next test after a VM restart. */

1 0

[dgorbachev] 42566: Fix IDT limit.
by dgorbachev＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: dgorbachev Date: Sun Aug 9 16:40:05 2009 New Revision: 42566 URL: http://svn.reactos.org/svn/reactos?rev=42566&view=rev Log: Fix IDT limit. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] Sun Aug 9 16:40:05 2009 @@ -27,91 +27,91 @@ .p2align 2 /* force 4-byte alignment */ EXTERN(i386idt) /* Exception 0 - Divide By Zero */ - .word i386DivideByZero /* Offset 0 - 15 */ + .word i386DivideByZero /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Flags, Zero Byte */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 1 - Debug Exception */ - .word i386DebugException /* Offset 0 - 15 */ + .word i386DebugException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 2 - NMI */ - .word i386NMIException /* Offset 0 - 15 */ + .word i386NMIException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 3 - Breakpoint (INT 3) */ - .word i386Breakpoint /* Offset 0 - 15 */ + .word i386Breakpoint /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 4 - Overflow (INTO with EFLAGS[OF] set) */ - .word i386Overflow /* Offset 0 - 15 */ + .word i386Overflow /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 5 - Bound Exception */ - .word i386BoundException /* Offset 0 - 15 */ + .word i386BoundException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 6 - Invalid Opcode */ - .word i386InvalidOpcode /* Offset 0 - 15 */ + .word i386InvalidOpcode /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 7 - FPU Not Available */ - .word i386FPUNotAvailable /* Offset 0 - 15 */ + .word i386FPUNotAvailable /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 8 - Double Fault */ - .word i386DoubleFault /* Offset 0 - 15 */ + .word i386DoubleFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 9 - Coprocessor Segment Overrun */ - .word i386CoprocessorSegment /* Offset 0 - 15 */ + .word i386CoprocessorSegment /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 10 (0x0A) - Invalid TSS */ - .word i386InvalidTSS /* Offset 0 - 15 */ + .word i386InvalidTSS /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 11 (0x0B) - Segment Not Present */ - .word i386SegmentNotPresent /* Offset 0 - 15 */ + .word i386SegmentNotPresent /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 12 (0x0C) - Stack Exception */ - .word i386StackException /* Offset 0 - 15 */ + .word i386StackException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 13 (0x0D) - General Protection Fault */ - .word i386GeneralProtectionFault /* Offset 0 - 15 */ + .word i386GeneralProtectionFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 14 (0x0E) - Page Fault */ - .word i386PageFault /* Offset 0 - 15 */ + .word i386PageFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ @@ -123,19 +123,19 @@ .word 0x0000 /* Offset 16 - 31 */ /* Exception 16 (0x10) - Coprocessor Error */ - .word i386CoprocessorError /* Offset 0 - 15 */ + .word i386CoprocessorError /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 17 (0x11) - Alignment Check */ - .word i386AlignmentCheck /* Offset 0 - 15 */ + .word i386AlignmentCheck /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 18 (0x12) - Machine Check */ - .word i386MachineCheck /* Offset 0 - 15 */ + .word i386MachineCheck /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ @@ -220,5 +220,5 @@ /* IDT table pointer */ EXTERN(i386idtptr) - .word (i386idtptr-i386idt) /* Limit */ + .word (i386idtptr - i386idt - 1) /* Limit */ .long i386idt /* Base Address */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sun Aug 9 16:40:05 2009 @@ -912,7 +912,7 @@ // // Copy the old IDT - RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit); + RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit + 1); // Mask interrupts //asm("cli\n"); // they are already masked before enabling paged mode

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009