Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[weiden] 30021: Fix abusing the heap by using strdupW instead of _wcsdup

by weiden＠svn.reactos.org

Author: weiden Date: Wed Oct 31 21:14:16 2007 New Revision: 30021 URL: http://svn.reactos.org/svn/reactos?rev=30021&view=rev Log: Fix abusing the heap by using strdupW instead of _wcsdup Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Wed Oct 31 21:14:16 2007 @@ -392,7 +392,7 @@ if( SUCCEEDED( r ) ) { HeapFree(GetProcessHeap(), 0, This->sLinkPath); - This->sLinkPath = _wcsdup(pszFileName); + This->sLinkPath = strdupW(pszFileName); r = IPersistStream_Load(StreamThis, stm); ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath); IStream_Release( stm );

16 years, 11 months

[weiden] 30020: Don't call SHBrowseForFolder() with random pointers

by weiden＠svn.reactos.org

Author: weiden Date: Wed Oct 31 20:13:52 2007 New Revision: 30020 URL: http://svn.reactos.org/svn/reactos?rev=30020&view=rev Log: Don't call SHBrowseForFolder() with random pointers Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c Wed Oct 31 20:13:52 2007 @@ -88,6 +88,7 @@ switch(LOWORD(wParam)) { case IDC_SHORTCUT_BROWSE: + ZeroMemory(&brws, sizeof(brws)); brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath;

16 years, 11 months

[gedmurphy] 30019: remove a sneaky little bugger

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Oct 31 19:27:40 2007 New Revision: 30019 URL: http://svn.reactos.org/svn/reactos?rev=30019&view=rev Log: remove a sneaky little bugger Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Wed Oct 31 19:27:40 2007 @@ -111,7 +111,7 @@ UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; ProbeForRead(pUnsafeBits, cjBits, 1); } - DPRINT1("calling IntGdiCreateBitmap 1\n"); + if (0 == Width || 0 == Height) { hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL);

16 years, 11 months

[gedmurphy] 30018: - Fix param checking and don't send negative values in the SIZEL struct of IntCreateBitmap. - Fixes displaying of menu bitmaps in apps such as abiword

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Oct 31 19:22:59 2007 New Revision: 30018 URL: http://svn.reactos.org/svn/reactos?rev=30018&view=rev Log: - Fix param checking and don't send negative values in the SIZEL struct of IntCreateBitmap. - Fixes displaying of menu bitmaps in apps such as abiword Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Wed Oct 31 19:22:59 2007 @@ -48,7 +48,7 @@ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - if (BitsPixel == 0 || Width < 1 || Height < 1) + if (BitsPixel == 0 || Width < 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -58,7 +58,7 @@ WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); Size.cx = Width; - Size.cy = Height; + Size.cy = abs(Height); /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, @@ -111,7 +111,15 @@ UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; ProbeForRead(pUnsafeBits, cjBits, 1); } - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + DPRINT1("calling IntGdiCreateBitmap 1\n"); + if (0 == Width || 0 == Height) + { + hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + } + else + { + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + } } _SEH_HANDLE {

16 years, 11 months

[mpiulachs] 30017: - First steps to install aplication shorcuts during setup using setupapi and syssetup.inf - Autogenerate CREDITS file in intermediate folder (for now) - More work on authors/contributors - Various other fixes PS: Add your information to contributors.rbuild , don't be shy!

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Oct 31 18:54:27 2007 New Revision: 30017 URL: http://svn.reactos.org/svn/reactos?rev=30017&view=rev Log: - First steps to install aplication shorcuts during setup using setupapi and syssetup.inf - Autogenerate CREDITS file in intermediate folder (for now) - More work on authors/contributors - Various other fixes PS: Add your information to contributors.rbuild , don't be shy! Added: branches/rbuild/reactos/base/applications/notepad/setup/ branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf (with props) Modified: branches/rbuild/reactos/base/applications/notepad/notepad.rbuild branches/rbuild/reactos/contributors.rbuild branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h branches/rbuild/reactos/tools/rbuild/linkerscript.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp Modified: branches/rbuild/reactos/base/applications/notepad/notepad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/notepad/notepad.rbuild (original) +++ branches/rbuild/reactos/base/applications/notepad/notepad.rbuild Wed Oct 31 18:54:27 2007 @@ -17,4 +17,5 @@ <file>settings.c</file> <file>rsrc.rc</file> <pch>notepad.h</pch> + <installcomponent>setup/notepad.inf</installcomponent> </module> Added: branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf (added) +++ branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf Wed Oct 31 18:54:27 2007 @@ -1,0 +1,123 @@ +;Sample INF file to create a desktop shortcut to the notepad.exe file + +[Version] +Signature = "$Windows NT$" + +[DefaultInstall] +ProfileItems = NotepadDesktopItemAdd + +[NotepadDesktopItemAdd] +Name = %NOTEPAD_NAME%, 0x0000008, 16409 +CmdLine = 24,"%SystemRoot%\system32\","notepad.exe" +InfoTip = %NOTEPAD_DESC% +WorkingDir = 24,"%HOMEDRIVE%%HOMEPATH%" + +; Localizable Strings + +[Strings] +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0401] ; Arabic +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0403] ; Catalan +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Permet crear i editar documents de text simples." + +[Strings.0404] ; Chinese (Traditional) +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0804] ; Chinese (Simplified) +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0405] ; Czech +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0406] ; Danish +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0413] ; Dutch +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0409] ; English +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.040B] ; Finnish +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.040C] ; French +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0407] ; German +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0408] ; Greek +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.040D] ; Hebrew +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.040E] ; Hungerian +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0410] ; Italian +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0411] ; Japanese +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0412] ; Korean +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0814] ; Norwegian +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0415] ; Polish +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0416] ; Portugese +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.0419] ; Russian +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.041B] ; Slovak +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.040A] ; Spanish +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Crea y editar documents de texto con formateo básico." + +[Strings.041D] ; Swedish +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.041E] ; Thai +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." + +[Strings.041F] ; Turkish (Turkce) +NOTEPAD_NAME = "Notepad" +NOTEPAD_DESC = "Creates and edits text files using basic text formatting." Propchange: branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (original) +++ branches/rbuild/reactos/contributors.rbuild Wed Oct 31 18:54:27 2007 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <contributor firstname="Aleksey" lastname="Bragin" alias="fireball" /> + <contributor firstname="Colin" lastname="Finck" alias="cfinck" /> + <contributor firstname="Eric" lastname="Kohl" alias="ekohl" /> <contributor firstname="Marc" lastname="Piulachs" mail="marc.piulachs(a)codexchange.net" alias="mpiulachs" country="Spain" city="Barcelona" /> - <contributor firstname="Colin" lastname="Finck" alias="cfinck" /> - <contributor firstname="Aleksey" lastname="Bragin" alias="fireball" /> - <contributor firstname="Eric" lastname="Kohl" alias="ekohl" /> </group> Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Oct 31 18:54:27 2007 @@ -346,6 +346,7 @@ GenerateModulesResources(); GenerateModulesManifests(); GenerateProxyMakefiles (); + GenerateCreditsFile(); CheckAutomaticDependencies (); CloseMakefile (); } @@ -743,6 +744,15 @@ printf ( "done\n" ); } +void +MingwBackend::GenerateCreditsFile () +{ + printf ( "Generating credits...." ); + CreditsGenerator creditsGenerator ( ProjectNode ); + creditsGenerator.Generate (); + printf ( "done\n" ); +} + string MingwBackend::GetProxyMakefileTree () const { Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Wed Oct 31 18:54:27 2007 @@ -86,6 +86,7 @@ void GenerateSysSetup (); void GenerateModulesResources(); void GenerateModulesManifests(); + void GenerateCreditsFile (); std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/lin… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Wed Oct 31 18:54:27 2007 @@ -59,3 +59,20 @@ AutoManifest::ProcessXML() { } + +InstallComponent::InstallComponent ( const XMLElement& node_, + const Module& module_, + const FileLocation& file_ ) + : node(node_), module(module_), file(file_) +{ +} + +void +InstallComponent::ProcessXML() +{ + const XMLAttribute* att = node.GetAttribute ( "section", false ); + if ( att != NULL ) + section = att->value; + else + section = "DefaultInstall"; +} Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Wed Oct 31 18:54:27 2007 @@ -249,7 +249,8 @@ cplusplus (false), host (HostDefault), autoManifest (NULL), - autoResource (NULL) + autoResource (NULL), + installComponent (NULL) { if ( node.name != "module" ) throw InvalidOperationException ( __FILE__, @@ -528,6 +529,8 @@ delete linkerFlags[i]; for ( i = 0; i < stubbedComponents.size(); i++ ) delete stubbedComponents[i]; + //if ( installComponent ) + // delete installComponent; if ( linkerScript ) delete linkerScript; if ( pch ) @@ -575,6 +578,8 @@ for ( i = 0; i < stubbedComponents.size(); i++ ) stubbedComponents[i]->ProcessXML(); non_if_data.ProcessXML(); + if ( installComponent ) + installComponent->ProcessXML(); if ( linkerScript ) linkerScript->ProcessXML(); if ( pch ) @@ -898,6 +903,30 @@ localizations.push_back ( localization ); subs_invalid = true; + } + else if ( e.name == "installcomponent" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<installcomponent> is not a valid sub-element of <if>" ); + } + size_t pos = e.value.find_last_of ( "/\\" ); + if ( pos == string::npos ) + { + installComponent = new InstallComponent ( + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); + } + else + { + string dir = e.value.substr ( 0, pos ); + string name = e.value.substr ( pos + 1); + installComponent = new InstallComponent ( + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); + } + + subs_invalid = false; } else if ( e.name == "linkerscript" ) { @@ -1671,6 +1700,50 @@ { } +Contributor::Contributor ( const XMLElement& _node) + : node (_node) +{ + ProcessXML(); +} + +void +Contributor::ProcessXML() +{ + const XMLAttribute* att = node.GetAttribute ( "alias", true ); + assert(att); + alias = att->value; + + att = node.GetAttribute ( "firstname", true ); + if (att != NULL) + firstName = att->value; + else + firstName = ""; + + att = node.GetAttribute ( "lastname", true ); + if (att != NULL) + lastName = att->value; + else + lastName = ""; + + att = node.GetAttribute ( "mail", false ); + if (att != NULL) + mail = att->value; + else + mail = ""; + + att = node.GetAttribute ( "city", false ); + if (att != NULL) + city = att->value; + else + city = ""; + + att = node.GetAttribute ( "country", false ); + if (att != NULL) + country = att->value; + else + country = ""; +} + /* AuthorRole Author::GetAuthorRole ( const string& location, const XMLAttribute& attribute ) @@ -1695,6 +1768,7 @@ ProcessXML (); } +/* Author::Author ( const XMLElement& _node , const Module& module_) : node (_node), module(module_) , role (Developer) { @@ -1703,7 +1777,7 @@ //role = GetAuthorRole(_node.location , *att); ProcessXML (); -} +}*/ void Author::ProcessXML() Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Wed Oct 31 18:54:27 2007 @@ -91,3 +91,52 @@ free ( buf ); } + + +CreditsGenerator::CreditsGenerator ( const Project& project ) + : project ( project ) +{ +} + +CreditsGenerator::~CreditsGenerator () +{ +} + +void +CreditsGenerator::Generate () +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); + + for ( size_t i = 0; i < project.contributors.size (); i++ ) + { + Contributor& contributor = *project.contributors[i]; + + s = s + sprintf ( s, "\t%s %s (%s)\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str() , + contributor.alias.c_str()); + + s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); + + if (strlen(contributor.city.c_str()) > 0 && + strlen(contributor.country.c_str()) > 0) + { + s = s + sprintf ( s, "\t\t%s,%s\n\n" , + contributor.city.c_str() , + contributor.country.c_str()); + } + } + + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + + free ( buf ); +} Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Wed Oct 31 18:54:27 2007 @@ -489,6 +489,12 @@ languages.push_back ( language ); subs_invalid = true; } + else if ( e.name == "contributor" ) + { + Contributor* contributor = new Contributor ( e ); + contributors.push_back ( contributor ); + subs_invalid = true; + } else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Wed Oct 31 18:54:27 2007 @@ -107,13 +107,16 @@ class AutoRegister; class ModulesResourceGenerator; class ModulesResourceGenerator; +class CreditsGenerator; class SourceFileTest; class Metadata; class Language; +class Contributor; class Localization; class Author; class AutoManifest; class AutoResource; +class InstallComponent; typedef std::map<std::string,Directory*> directory_map; @@ -262,6 +265,7 @@ std::vector<InstallFile*> installfiles; std::vector<Module*> modules; std::vector<Language*> languages; + std::vector<Contributor*> contributors; IfableData non_if_data; ArchitectureType GetArchitectureType ( const std::string& location, const XMLAttribute& attribute ); @@ -394,6 +398,7 @@ FileLocation *install; AutoManifest* autoManifest; AutoResource* autoResource; + InstallComponent* installComponent; Module ( const Project& project, const XMLElement& moduleNode, @@ -633,6 +638,22 @@ void ProcessXML (); }; +class Contributor +{ +public: + const XMLElement& node; + std::string alias; + std::string firstName; + std::string lastName; + std::string mail; + std::string city; + std::string country; + + Contributor ( const XMLElement& _node); + + void ProcessXML (); +}; + class Author { public: @@ -641,13 +662,10 @@ std::string alias; AuthorRole role; - Author ( const XMLElement& _node, const Module& module ); + //Author ( const XMLElement& _node, const Module& module); Author ( const XMLElement& _node, const Module& module, AuthorRole role ); void ProcessXML (); -//private: -// AuthorRole GetAuthorRole ( const std::string& location, -// const XMLAttribute& attribute ); }; class Localization @@ -737,6 +755,21 @@ const Module& module, const FileLocation& file ); ~LinkerScript (); + void ProcessXML(); +}; + +class InstallComponent +{ +public: + const XMLElement& node; + const Module& module; + FileLocation file; + std::string section; + + InstallComponent ( const XMLElement& node, + const Module& module, + const FileLocation& file ); + ~InstallComponent (); void ProcessXML(); }; @@ -1070,7 +1103,9 @@ private: std::string GetDirectoryId ( const Module& module ); std::string GetFlags ( const Module& module ); - void Generate ( HINF inf, + void GenerateAutoRegister ( HINF inf, + const Module& module ); + void GenerateInstallComponent ( HINF inf, const Module& module ); }; @@ -1094,6 +1129,16 @@ void Generate (); private: void WriteManifestFile ( Module& module ); +}; + +class CreditsGenerator +{ +public: + const Project& project; + CreditsGenerator ( const Project& project ); + ~CreditsGenerator (); + void Generate (); +private: }; extern void Modified: branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/sys… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp Wed Oct 31 18:54:27 2007 @@ -48,7 +48,14 @@ { const Module& module = *project.modules[i]; if ( module.autoRegister != NULL ) - Generate ( inf, module ); + GenerateAutoRegister ( inf, module ); + } + + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + const Module& module = *project.modules[i]; + if ( module.installComponent != NULL ) + GenerateInstallComponent ( inf, module ); } if ( 0 != InfHostWriteFile ( inf, syssetup.c_str (), "" ) ) @@ -89,7 +96,7 @@ } void -SysSetupGenerator::Generate ( HINF inf, +SysSetupGenerator::GenerateAutoRegister ( HINF inf, const Module& module ) { PINFCONTEXT context; @@ -115,3 +122,29 @@ InfHostFreeContext ( context ); } + + +void +SysSetupGenerator::GenerateInstallComponent ( HINF inf, + const Module& module ) +{ + PINFCONTEXT context; + + if ( 0 != InfHostFindOrAddSection ( inf, "Infs.Always", &context ) ) + { + throw new Exception ( ".inf section 'Infs.Always' not found" ); + InfHostCloseFile ( inf ); + } + + if ( 0 != InfHostAddLine ( context, NULL ) || + 0 != InfHostAddField ( context, module.installComponent->file.name.c_str()) || + 0 != InfHostAddField ( context, module.installComponent->section.c_str())) + { + InfHostFreeContext ( context ); + InfHostCloseFile ( inf ); + throw InvalidOperationException ( __FILE__, + __LINE__ ); + } + + InfHostFreeContext ( context ); +}

16 years, 11 months

[hpoussin] 30016: Remove LIST_ITEM structure, and replace it by well-known LIST_ENTRY Do according changes in callers Fix a bug in IniGetSectionSettingNameSize/IniGetSectionSettingValueSize, which were expecting memory to be allocated contiguously

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 31 18:31:46 2007 New Revision: 30016 URL: http://svn.reactos.org/svn/reactos?rev=30016&view=rev Log: Remove LIST_ITEM structure, and replace it by well-known LIST_ENTRY Do according changes in callers Fix a bug in IniGetSectionSettingNameSize/IniGetSectionSettingValueSize, which were expecting memory to be allocated contiguously Removed: trunk/reactos/boot/freeldr/freeldr/rtl/list.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/cache.h trunk/reactos/boot/freeldr/freeldr/include/inifile.h trunk/reactos/boot/freeldr/freeldr/include/rtl.h trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c Wed Oct 31 18:31:46 2007 @@ -33,37 +33,33 @@ if (!FsOpenBootVolume()) { - printf("Error opening boot partition for file access.\n"); - MachConsGetCh(); + UiMessageBoxCritical("Error opening boot partition for file access."); return; } if (!IniFileInitialize()) { - printf("Press any key to reboot.\n"); - MachConsGetCh(); + UiMessageBoxCritical("Error initializing .ini file"); return; } if (!IniOpenSection("FreeLoader", &SectionId)) { - printf("Section [FreeLoader] not found in freeldr.ini.\n"); - MachConsGetCh(); + UiMessageBoxCritical("Section [FreeLoader] not found in freeldr.ini."); return; } TimeOut = GetTimeOut(); if (!UiInitialize(TimeOut)) { - printf("Press any key to reboot.\n"); - MachConsGetCh(); + UiMessageBoxCritical("Unable to initialize UI."); return; } if (!InitOperatingSystemList(&OperatingSystemSectionNames, &OperatingSystemDisplayNames, &OperatingSystemCount)) { - UiMessageBox("Press ENTER to reboot.\n"); + UiMessageBox("Press ENTER to reboot."); goto reboot; } @@ -89,7 +85,7 @@ // Show the operating system list menu if (!UiDisplayMenu(OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, TimeOut, &SelectedOperatingSystem, FALSE, MainBootMenuKeyPressFilter)) { - UiMessageBox("Press ENTER to reboot.\n"); + UiMessageBox("Press ENTER to reboot."); goto reboot; } @@ -98,7 +94,7 @@ // Try to open the operating system section in the .ini file if (!IniOpenSection(OperatingSystemSectionNames[SelectedOperatingSystem], &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemSectionNames[SelectedOperatingSystem]); + sprintf(SettingName, "Section [%s] not found in freeldr.ini.", OperatingSystemSectionNames[SelectedOperatingSystem]); UiMessageBox(SettingName); continue; } @@ -106,7 +102,7 @@ // Try to read the boot type if (!IniReadSettingByName(SectionId, "BootType", SettingValue, sizeof(SettingValue))) { - sprintf(SettingName, "BootType= line not found in section [%s] in freeldr.ini.\n", OperatingSystemSectionNames[SelectedOperatingSystem]); + sprintf(SettingName, "BootType= line not found in section [%s] in freeldr.ini.", OperatingSystemSectionNames[SelectedOperatingSystem]); UiMessageBox(SettingName); continue; } Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Wed Oct 31 18:31:46 2007 @@ -57,14 +57,14 @@ // // Make sure the block list has entries before I start searching it. // - if (!RtlListIsEmpty((PLIST_ITEM)CacheDrive->CacheBlockHead)) + if (!IsListEmpty(&CacheDrive->CacheBlockHead)) { // // Search the list and find the BIOS drive number // - CacheBlock = CacheDrive->CacheBlockHead; - - while (CacheBlock != NULL) + CacheBlock = CONTAINING_RECORD(CacheDrive->CacheBlockHead.Flink, CACHE_BLOCK, ListEntry); + + while (&CacheBlock->ListEntry != &CacheDrive->CacheBlockHead) { // // We found the block, so return it @@ -79,7 +79,7 @@ return CacheBlock; } - CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock); + CacheBlock = CONTAINING_RECORD(CacheBlock->ListEntry.Flink, CACHE_BLOCK, ListEntry); } } @@ -125,14 +125,7 @@ RtlCopyMemory(CacheBlock->BlockData, (PVOID)DISKREADBUFFER, CacheDrive->BlockSize * CacheDrive->BytesPerSector); // Add it to our list of blocks managed by the cache - if (CacheDrive->CacheBlockHead == NULL) - { - CacheDrive->CacheBlockHead = CacheBlock; - } - else - { - RtlListInsertTail((PLIST_ITEM)CacheDrive->CacheBlockHead, (PLIST_ITEM)CacheBlock); - } + InsertTailList(&CacheDrive->CacheBlockHead, &CacheBlock->ListEntry); // Update the cache data CacheBlockCount++; @@ -152,28 +145,20 @@ // Get a pointer to the last item in the block list // that isn't forced to be in the cache and remove // it from the list - CacheBlockToFree = (PCACHE_BLOCK)RtlListGetTail((PLIST_ITEM)CacheDrive->CacheBlockHead); - while (CacheBlockToFree != NULL && CacheBlockToFree->LockedInCache == TRUE) - { - CacheBlockToFree = (PCACHE_BLOCK)RtlListGetPrevious((PLIST_ITEM)CacheBlockToFree); + CacheBlockToFree = CONTAINING_RECORD(CacheDrive->CacheBlockHead.Blink, CACHE_BLOCK, ListEntry); + while (&CacheBlockToFree->ListEntry != &CacheDrive->CacheBlockHead && CacheBlockToFree->LockedInCache == TRUE) + { + CacheBlockToFree = CONTAINING_RECORD(CacheBlockToFree->ListEntry.Blink, CACHE_BLOCK, ListEntry); } // No blocks left in cache that can be freed // so just return - if (CacheBlockToFree == NULL) + if (IsListEmpty(&CacheDrive->CacheBlockHead)) { return FALSE; } - // - // If we are freeing the head of the list then update it's pointer - // - if (CacheBlockToFree == CacheDrive->CacheBlockHead) - { - CacheDrive->CacheBlockHead = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlockToFree); - } - - RtlListRemoveEntry((PLIST_ITEM)CacheBlockToFree); + RemoveEntryList(&CacheBlockToFree->ListEntry); // Free the block memory and the block structure MmFreeMemory(CacheBlockToFree->BlockData); @@ -213,10 +198,9 @@ DbgPrint((DPRINT_CACHE, "CacheSizeLimit: %d.\n", CacheSizeLimit)); DbgPrint((DPRINT_CACHE, "CacheSizeCurrent: %d.\n", CacheSizeCurrent)); DbgPrint((DPRINT_CACHE, "CacheBlockCount: %d.\n", CacheBlockCount)); - DbgPrint((DPRINT_CACHE, "Dumping %d cache blocks.\n", RtlListCountEntries((PLIST_ITEM)CacheDrive->CacheBlockHead))); - - CacheBlock = CacheDrive->CacheBlockHead; - while (CacheBlock != NULL) + + CacheBlock = CONTAINING_RECORD(CacheDrive->CacheBlockHead.Flink, CACHE_BLOCK, ListEntry); + while (&CacheBlock->ListEntry != &CacheDrive->CacheBlockHead) { DbgPrint((DPRINT_CACHE, "Cache Block: CacheBlock: 0x%x\n", CacheBlock)); DbgPrint((DPRINT_CACHE, "Cache Block: Block Number: %d\n", CacheBlock->BlockNumber)); @@ -229,7 +213,7 @@ BugCheck((DPRINT_CACHE, "What the heck?!?\n")); } - CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock); + CacheBlock = CONTAINING_RECORD(CacheBlock->ListEntry.Flink, CACHE_BLOCK, ListEntry); } } @@ -239,15 +223,12 @@ DbgPrint((DPRINT_CACHE, "CacheInternalOptimizeBlockList()\n")); // Don't do this if this block is already at the head of the list - if (CacheBlock != CacheDrive->CacheBlockHead) + if (&CacheBlock->ListEntry != CacheDrive->CacheBlockHead.Flink) { // Remove this item from the block list - RtlListRemoveEntry((PLIST_ITEM)CacheBlock); + RemoveEntryList(&CacheBlock->ListEntry); // Re-insert it at the head of the list - RtlListInsertHead((PLIST_ITEM)CacheDrive->CacheBlockHead, (PLIST_ITEM)CacheBlock); - - // Update the head pointer - CacheDrive->CacheBlockHead = CacheBlock; - } -} + InsertHeadList(&CacheDrive->CacheBlockHead, &CacheBlock->ListEntry); + } +} Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Wed Oct 31 18:31:46 2007 @@ -64,19 +64,20 @@ // // Loop through and free the cache blocks // - while (CacheManagerDrive.CacheBlockHead != NULL) - { - NextCacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheManagerDrive.CacheBlockHead); - - MmFreeMemory(CacheManagerDrive.CacheBlockHead->BlockData); - MmFreeMemory(CacheManagerDrive.CacheBlockHead); - - CacheManagerDrive.CacheBlockHead = NextCacheBlock; + while (!IsListEmpty(&CacheManagerDrive.CacheBlockHead)) + { + NextCacheBlock = CONTAINING_RECORD(RemoveHeadList(&CacheManagerDrive.CacheBlockHead), + CACHE_BLOCK, + ListEntry); + + MmFreeMemory(NextCacheBlock->BlockData); + MmFreeMemory(NextCacheBlock); } } // Initialize the structure RtlZeroMemory(&CacheManagerDrive, sizeof(CACHE_DRIVE)); + InitializeListHead(&CacheManagerDrive.CacheBlockHead); CacheManagerDrive.DriveNumber = DriveNumber; if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Wed Oct 31 18:31:46 2007 @@ -51,7 +51,6 @@ </directory> <directory name="rtl"> <file>libsupp.c</file> - <file>list.c</file> </directory> <directory name="ui"> <file>gui.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/include/cache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/cache.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/cache.h Wed Oct 31 18:31:46 2007 @@ -32,7 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////// typedef struct { - LIST_ITEM ListEntry; // Doubly linked list synchronization member + LIST_ENTRY ListEntry; // Doubly linked list synchronization member ULONG BlockNumber; // Track index for CHS, 64k block index for LBA BOOLEAN LockedInCache; // Indicates that this block is locked in cache memory @@ -55,7 +55,7 @@ ULONG BytesPerSector; ULONG BlockSize; // Block size (in sectors) - PCACHE_BLOCK CacheBlockHead; + LIST_ENTRY CacheBlockHead; // Contains CACHE_BLOCK structures } CACHE_DRIVE, *PCACHE_DRIVE; Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/inifile.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/inifile.h Wed Oct 31 18:31:46 2007 @@ -29,7 +29,7 @@ // Name=Value typedef struct { - LIST_ITEM ListEntry; + LIST_ENTRY ListEntry; PCHAR ItemName; PCHAR ItemValue; @@ -42,14 +42,15 @@ // one INI_SECTION_ITEM for each line in the section typedef struct { - LIST_ITEM ListEntry; + LIST_ENTRY ListEntry; PCHAR SectionName; ULONG SectionItemCount; - PINI_SECTION_ITEM SectionItemList; + LIST_ENTRY SectionItemList; // Contains PINI_SECTION_ITEM structures } INI_SECTION, *PINI_SECTION; -extern PINI_SECTION IniFileSectionListHead; +extern LIST_ENTRY IniFileSectionListHead; +extern BOOLEAN IniFileSectionInitialized; extern ULONG IniFileSectionCount; extern ULONG IniFileSettingCount; Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h Wed Oct 31 18:31:46 2007 @@ -29,34 +29,4 @@ void delay(unsigned msec); void sound(int freq); -/////////////////////////////////////////////////////////////////////////////////////// -// -// List Functions -// -/////////////////////////////////////////////////////////////////////////////////////// - -typedef struct _LIST_ITEM -{ - struct _LIST_ITEM* ListPrev; - struct _LIST_ITEM* ListNext; - -} LIST_ITEM, *PLIST_ITEM; - -VOID RtlListInitializeHead(PLIST_ITEM ListHead); // Initializes a doubly linked list -VOID RtlListInsertHead(PLIST_ITEM ListHead, PLIST_ITEM Entry); // Inserts an entry at the head of the list -VOID RtlListInsertTail(PLIST_ITEM ListHead, PLIST_ITEM Entry); // Inserts an entry at the tail of the list -PLIST_ITEM RtlListRemoveHead(PLIST_ITEM ListHead); // Removes the entry at the head of the list -PLIST_ITEM RtlListRemoveTail(PLIST_ITEM ListHead); // Removes the entry at the tail of the list -PLIST_ITEM RtlListGetHead(PLIST_ITEM ListHead); // Returns the entry at the head of the list -PLIST_ITEM RtlListGetTail(PLIST_ITEM ListHead); // Returns the entry at the tail of the list -BOOLEAN RtlListIsEmpty(PLIST_ITEM ListHead); // Indicates whether a doubly linked list is empty -ULONG RtlListCountEntries(PLIST_ITEM ListHead); // Counts the entries in a doubly linked list -PLIST_ITEM RtlListGetPrevious(PLIST_ITEM ListEntry); // Returns the previous item in the list -PLIST_ITEM RtlListGetNext(PLIST_ITEM ListEntry); // Returns the next item in the list -PLIST_ITEM RtlListRemoveEntry(PLIST_ITEM ListEntry); // Removes the entry from the list -VOID RtlListInsertEntry(PLIST_ITEM InsertAfter, PLIST_ITEM ListEntry); // Inserts a new list entry right after the specified one -VOID RtlListMoveEntryPrevious(PLIST_ITEM ListEntry); // Moves the list entry to before the previous entry -VOID RtlListMoveEntryNext(PLIST_ITEM ListEntry); // Moves the list entry to after the next entry - - #endif // defined __STDLIB_H Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Wed Oct 31 18:31:46 2007 @@ -31,8 +31,7 @@ if (Freeldr_Ini == NULL) { - printf("Error opening freeldr.ini or file not found.\n"); - printf("You need to re-install FreeLoader.\n"); + UiMessageBoxCritical("Error opening freeldr.ini or file not found.\nYou need to re-install FreeLoader."); return FALSE; } @@ -43,7 +42,7 @@ // If we are out of memory then return FALSE if (FreeLoaderIniFileData == NULL) { - printf("Out of memory while loading freeldr.ini.\n"); + UiMessageBoxCritical("Out of memory while loading freeldr.ini."); FsCloseFile(Freeldr_Ini); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Wed Oct 31 18:31:46 2007 @@ -26,12 +26,12 @@ DbgPrint((DPRINT_INIFILE, "IniOpenSection() SectionName = %s\n", SectionName)); - if (!IniFileSectionListHead) + if (!IniFileSectionInitialized) return FALSE; // Loop through each section and find the one they want - Section = (PINI_SECTION)RtlListGetHead((PLIST_ITEM)IniFileSectionListHead); - while (Section != NULL) + Section = CONTAINING_RECORD(IniFileSectionListHead.Flink, INI_SECTION, ListEntry); + while (&Section->ListEntry != &IniFileSectionListHead) { // Compare against the section name if (_stricmp(SectionName, Section->SectionName) == 0) @@ -43,7 +43,7 @@ } // Get the next section in the list - Section = (PINI_SECTION)RtlListGetNext((PLIST_ITEM)Section); + Section = CONTAINING_RECORD(Section->ListEntry.Flink, INI_SECTION, ListEntry); } DbgPrint((DPRINT_INIFILE, "IniOpenSection() Section not found.\n")); @@ -61,68 +61,87 @@ return Section->SectionItemCount; } -ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex) -{ - PINI_SECTION Section = (PINI_SECTION)SectionId; - - // Return the size of the string plus 1 for the null-terminator - return (strlen(Section->SectionItemList[SettingIndex].ItemName) + 1); -} - -ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex) -{ - PINI_SECTION Section = (PINI_SECTION)SectionId; - - // Return the size of the string plus 1 for the null-terminator - return (strlen(Section->SectionItemList[SettingIndex].ItemValue) + 1); -} - -BOOLEAN IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize) +PINI_SECTION_ITEM IniGetSettingByNumber(ULONG SectionId, ULONG SettingNumber) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; - ULONG RealSettingNumber = SettingNumber; - DbgPrint((DPRINT_INIFILE, ".001 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - - DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() SectionId = 0x%x\n", SectionId)); // Loop through each section item and find the one they want - DbgPrint((DPRINT_INIFILE, ".01 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - SectionItem = (PINI_SECTION_ITEM)RtlListGetHead((PLIST_ITEM)Section->SectionItemList); - while (SectionItem != NULL) - { - DbgPrint((DPRINT_INIFILE, ".1 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + SectionItem = CONTAINING_RECORD(Section->SectionItemList.Flink, INI_SECTION_ITEM, ListEntry); + while (&SectionItem->ListEntry != &Section->SectionItemList) + { // Check to see if this is the setting they want if (SettingNumber == 0) { - DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting number %d found.\n", RealSettingNumber)); - DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting name = %s\n", SectionItem->ItemName)); - DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting value = %s\n", SectionItem->ItemValue)); - - DbgPrint((DPRINT_INIFILE, "1 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - DbgPrint((DPRINT_INIFILE, "2 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingName, SectionItem->ItemName, NameSize - 1); - SettingName[NameSize - 1] = '\0'; - DbgPrint((DPRINT_INIFILE, "3 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingValue, SectionItem->ItemValue, ValueSize - 1); - SettingValue[ValueSize - 1] = '\0'; - DbgPrint((DPRINT_INIFILE, "4 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - DbgDumpBuffer(DPRINT_INIFILE, SettingName, NameSize); - DbgDumpBuffer(DPRINT_INIFILE, SettingValue, ValueSize); - - return TRUE; + return SectionItem; } // Nope, keep going SettingNumber--; // Get the next section item in the list - SectionItem = (PINI_SECTION_ITEM)RtlListGetNext((PLIST_ITEM)SectionItem); - } - - DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting number %d not found.\n", RealSettingNumber)); - - return FALSE; + SectionItem = CONTAINING_RECORD(SectionItem->ListEntry.Flink, INI_SECTION_ITEM, ListEntry); + } + return NULL; +} + +ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex) +{ + PINI_SECTION_ITEM SectionItem; + + // Retrieve requested setting + SectionItem = IniGetSettingByNumber(SectionId, SettingIndex); + if (!SectionItem) + return 0; + + // Return the size of the string plus 1 for the null-terminator + return (strlen(SectionItem->ItemName) + 1); +} + +ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex) +{ + PINI_SECTION_ITEM SectionItem; + + // Retrieve requested setting + SectionItem = IniGetSettingByNumber(SectionId, SettingIndex); + if (!SectionItem) + return 0; + + // Return the size of the string plus 1 for the null-terminator + return (strlen(SectionItem->ItemValue) + 1); +} + +BOOLEAN IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize) +{ + PINI_SECTION_ITEM SectionItem; + DbgPrint((DPRINT_INIFILE, ".001 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + + DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() SectionId = 0x%x\n", SectionId)); + + // Retrieve requested setting + SectionItem = IniGetSettingByNumber(SectionId, SettingNumber); + if (!SectionItem) + { + DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting number %d not found.\n", SettingNumber)); + return FALSE; + } + + DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting number %d found.\n", SettingNumber)); + DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting name = %s\n", SectionItem->ItemName)); + DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting value = %s\n", SectionItem->ItemValue)); + + DbgPrint((DPRINT_INIFILE, "1 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + DbgPrint((DPRINT_INIFILE, "2 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + strncpy(SettingName, SectionItem->ItemName, NameSize - 1); + SettingName[NameSize - 1] = '\0'; + DbgPrint((DPRINT_INIFILE, "3 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + strncpy(SettingValue, SectionItem->ItemValue, ValueSize - 1); + SettingValue[ValueSize - 1] = '\0'; + DbgPrint((DPRINT_INIFILE, "4 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); + DbgDumpBuffer(DPRINT_INIFILE, SettingName, NameSize); + DbgDumpBuffer(DPRINT_INIFILE, SettingValue, ValueSize); + + return TRUE; } BOOLEAN IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize) @@ -133,8 +152,8 @@ DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() SectionId = 0x%x\n", SectionId)); // Loop through each section item and find the one they want - SectionItem = (PINI_SECTION_ITEM)RtlListGetHead((PLIST_ITEM)Section->SectionItemList); - while (SectionItem != NULL) + SectionItem = CONTAINING_RECORD(Section->SectionItemList.Flink, INI_SECTION_ITEM, ListEntry); + while (&SectionItem->ListEntry != &Section->SectionItemList) { // Check to see if this is the setting they want if (_stricmp(SettingName, SectionItem->ItemName) == 0) @@ -149,7 +168,7 @@ } // Get the next section item in the list - SectionItem = (PINI_SECTION_ITEM)RtlListGetNext((PLIST_ITEM)SectionItem); + SectionItem = CONTAINING_RECORD(SectionItem->ListEntry.Flink, INI_SECTION_ITEM, ListEntry); } DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting \'%s\' not found.\n", SettingName)); @@ -183,14 +202,7 @@ // Add it to the section list head IniFileSectionCount++; - if (IniFileSectionListHead == NULL) - { - IniFileSectionListHead = Section; - } - else - { - RtlListInsertTail((PLIST_ITEM)IniFileSectionListHead, (PLIST_ITEM)Section); - } + InsertHeadList(&IniFileSectionListHead, &Section->ListEntry); *SectionId = (ULONG)Section; @@ -233,14 +245,7 @@ // Add it to the current section Section->SectionItemCount++; - if (Section->SectionItemList == NULL) - { - Section->SectionItemList = SectionItem; - } - else - { - RtlListInsertTail((PLIST_ITEM)Section->SectionItemList, (PLIST_ITEM)SectionItem); - } + InsertTailList(&Section->SectionItemList, &SectionItem->ListEntry); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Wed Oct 31 18:31:46 2007 @@ -20,7 +20,8 @@ #include <freeldr.h> #include <debug.h> -PINI_SECTION IniFileSectionListHead = NULL; +LIST_ENTRY IniFileSectionListHead; +BOOLEAN IniFileSectionInitialized = FALSE; ULONG IniFileSectionCount = 0; ULONG IniFileSettingCount = 0; @@ -37,6 +38,12 @@ DbgPrint((DPRINT_INIFILE, "IniParseFile() IniFileSize: %d\n", IniFileSize)); + if (!IniFileSectionInitialized) + { + InitializeListHead(&IniFileSectionListHead); + IniFileSectionInitialized = TRUE; + } + // Start with an 80-byte buffer IniFileLineSize = 80; IniFileLine = MmAllocateMemory(IniFileLineSize); @@ -97,17 +104,11 @@ // Get the section name IniExtractSectionName(CurrentSection->SectionName, IniFileLine, LineLength); + InitializeListHead(&CurrentSection->SectionItemList); // Add it to the section list head IniFileSectionCount++; - if (IniFileSectionListHead == NULL) - { - IniFileSectionListHead = CurrentSection; - } - else - { - RtlListInsertTail((PLIST_ITEM)IniFileSectionListHead, (PLIST_ITEM)CurrentSection); - } + InsertTailList(&IniFileSectionListHead, &CurrentSection->ListEntry); CurrentLineNumber++; continue; @@ -162,14 +163,7 @@ // Add it to the current section IniFileSettingCount++; CurrentSection->SectionItemCount++; - if (CurrentSection->SectionItemList == NULL) - { - CurrentSection->SectionItemList = CurrentItem; - } - else - { - RtlListInsertTail((PLIST_ITEM)CurrentSection->SectionItemList, (PLIST_ITEM)CurrentItem); - } + InsertTailList(&CurrentSection->SectionItemList, &CurrentItem->ListEntry); CurrentLineNumber++; continue; Removed: trunk/reactos/boot/freeldr/freeldr/rtl/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/list.c (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/list.c (removed) @@ -1,176 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <freeldr.h> - -VOID RtlListInitializeHead(PLIST_ITEM ListHead) -{ - ListHead->ListPrev = NULL; - ListHead->ListNext = NULL; -} - -VOID RtlListInsertHead(PLIST_ITEM ListHead, PLIST_ITEM Entry) -{ - ListHead = RtlListGetHead(ListHead); - ListHead->ListPrev = Entry; - Entry->ListNext = ListHead; - Entry->ListPrev = NULL; -} - -VOID RtlListInsertTail(PLIST_ITEM ListHead, PLIST_ITEM Entry) -{ - ListHead = RtlListGetTail(ListHead); - ListHead->ListNext = Entry; - Entry->ListNext = NULL; - Entry->ListPrev = ListHead; -} - -PLIST_ITEM RtlListRemoveHead(PLIST_ITEM ListHead) -{ - PLIST_ITEM OldListHead = RtlListGetHead(ListHead); - - ListHead = ListHead->ListNext; - ListHead->ListPrev = NULL; - - return OldListHead; -} - -PLIST_ITEM RtlListRemoveTail(PLIST_ITEM ListHead) -{ - PLIST_ITEM ListTail; - - ListTail = RtlListGetTail(ListHead); - ListHead = ListTail->ListPrev; - ListHead->ListNext = NULL; - - return ListTail; -} - -PLIST_ITEM RtlListGetHead(PLIST_ITEM ListHead) -{ - while (ListHead->ListPrev != NULL) - { - ListHead = ListHead->ListPrev; - } - - return ListHead; -} - -PLIST_ITEM RtlListGetTail(PLIST_ITEM ListHead) -{ - while (ListHead->ListNext != NULL) - { - ListHead = ListHead->ListNext; - } - - return ListHead; -} - -BOOLEAN RtlListIsEmpty(PLIST_ITEM ListHead) -{ - if (ListHead == NULL) - { - return TRUE; - } - - return (ListHead->ListNext == NULL); -} - -ULONG RtlListCountEntries(PLIST_ITEM ListHead) -{ - ULONG Count = 0; - - while (ListHead != NULL) - { - Count++; - ListHead = ListHead->ListNext; - } - - return Count; -} - -PLIST_ITEM RtlListGetPrevious(PLIST_ITEM ListEntry) -{ - return ListEntry->ListPrev; -} - -PLIST_ITEM RtlListGetNext(PLIST_ITEM ListEntry) -{ - return ListEntry->ListNext; -} - -PLIST_ITEM RtlListRemoveEntry(PLIST_ITEM ListEntry) -{ - PLIST_ITEM ListNext = RtlListGetNext(ListEntry); - PLIST_ITEM ListPrev = RtlListGetPrevious(ListEntry); - - if (ListPrev != NULL) - { - ListPrev->ListNext = ListNext; - } - - if (ListNext != NULL) - { - ListNext->ListPrev = ListPrev; - } - - return ListNext; -} - -VOID RtlListInsertEntry(PLIST_ITEM InsertAfter, PLIST_ITEM ListEntry) -{ - PLIST_ITEM ListNext = RtlListGetNext(InsertAfter); - - InsertAfter->ListNext = ListEntry; - ListEntry->ListPrev = InsertAfter; - ListEntry->ListNext = ListNext; -} - -VOID RtlListMoveEntryPrevious(PLIST_ITEM ListEntry) -{ - PLIST_ITEM ListPrev = RtlListGetPrevious(ListEntry); - - if (ListPrev == NULL) - { - return; - } - - // - // Move the previous entry after this one - // - RtlListRemoveEntry(ListPrev); - RtlListInsertEntry(ListEntry, ListPrev); -} - -VOID RtlListMoveEntryNext(PLIST_ITEM ListEntry) -{ - PLIST_ITEM ListNext = RtlListGetNext(ListEntry); - - if (ListNext == NULL) - { - return; - } - - // - // Move this entry after the next entry - // - RtlListRemoveEntry(ListEntry); - RtlListInsertEntry(ListNext, ListEntry); -} -

16 years, 11 months

[peterw] 30015: - Make options.exe use APPDATA. - Move the functionality of scut.cmd into a .c file (and use APPDATA for srclist.txt). - Give rosbe-gcc-env.cmd the ability to initialize a GCC without the rest of the scripts. - Changed the options.exe icon to one that fits better with an "options" tool. - options.exe will live in the Tools directory now. - Move Root\srclist.txt to Tools\srclist.txt. - Other miscellaneous cleanup.

by peterw＠svn.reactos.org

Author: peterw Date: Wed Oct 31 18:15:29 2007 New Revision: 30015 URL: http://svn.reactos.org/svn/reactos?rev=30015&view=rev Log: - Make options.exe use APPDATA. - Move the functionality of scut.cmd into a .c file (and use APPDATA for srclist.txt). - Give rosbe-gcc-env.cmd the ability to initialize a GCC without the rest of the scripts. - Changed the options.exe icon to one that fits better with an "options" tool. - options.exe will live in the Tools directory now. - Move Root\srclist.txt to Tools\srclist.txt. - Other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/config/options.ico (with props) trunk/tools/RosBE-Windows/Tools/scut.c (with props) trunk/tools/RosBE-Windows/Tools/srclist.txt - copied, changed from r29979, trunk/tools/RosBE-Windows/Root/srclist.txt Removed: trunk/tools/RosBE-Windows/Root/srclist.txt trunk/tools/RosBE-Windows/Tools/config/reactos.ico Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/chkslash.c trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/options.rc trunk/tools/RosBE-Windows/Tools/makefile trunk/tools/RosBE-Windows/Tools/tee.c Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Wed Oct 31 18:15:29 2007 @@ -24,7 +24,7 @@ echo *** aborting build. Please check for changes and *** echo *** update your config.rbuild. *** echo. - goto :EOB + goto :EOC ) ) @@ -54,7 +54,7 @@ if defined _ROSBE_OBJPATH ( if not exist "%_ROSBE_OBJPATH%\." ( echo ERROR: The path specified doesn't seem to exist. - goto :EOB + goto :EOC ) else ( set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% ) @@ -62,7 +62,7 @@ if defined _ROSBE_OUTPATH ( if not exist "%_ROSBE_OUTPATH%\." ( echo ERROR: The path specified doesn't seem to exist. - goto :EOB + goto :EOC ) else ( set ROS_OUTPUT=%_ROSBE_OUTPATH% set ROS_TEMPORARY=%_ROSBE_OUTPATH% @@ -116,15 +116,15 @@ "%_ROSBE_MINGWMAKE%" %* ) ) -goto :EOB +goto :EOC :BUILDMULTI :: :: Get the number of CPUs in the system so we know how many jobs to execute. :: To modify the number used alter the options used with cpucount: :: No Option - Number of CPUs. -:: -x1 - Number of CPUs, Plus 1. -:: -x2 - Number of CPUs, Doubled. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. :: set CPUCOUNT= for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i @@ -143,7 +143,7 @@ ) ) -:EOB +:EOC :: :: Highlight the fact that building has ended. :: Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Wed Oct 31 18:15:29 2007 @@ -51,19 +51,18 @@ ) if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut [OPTIONS] - List, Define, Edit, Remove, Switch and Default to - echo Shortcutted Source-Directories. + echo scut [OPTIONS] - List, add, edit, remove, switch and default to + echo shortcutted ReactOS source directories. ) if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - echo ssvn [OPTIONS] - Create, Update or Clean-up your ReactOS Source - echo Tree or show the Revision Number of the Offline - echo Tree and Online HEAD Revision. + echo ssvn [OPTIONS] - Create, update or clean-up your ReactOS source + echo tree or show the revision number of the local + echo and online trees. ) if exist "%_ROSBE_BASEDIR%\options.cmd" ( - echo options - Starts options.exe and restarts RosBE to make - echo the changes effective at the end. + echo options - Starts the RosBE configurator. ) echo. @@ -121,12 +120,12 @@ if exist "%_ROSBE_BASEDIR%\Config.cmd" ( if /i "%1" == "config" ( echo Usage: config [OPTIONS] - echo Creates a Configuration File, which tells RosBE how to build the Tree. + echo Creates a configuration file, which tells RosBE how to build the tree. echo. - echo delete - Deletes the created configuration File and so sets back + echo delete - Deletes the created configuration file and so sets back echo to default settings. - echo update - Deletes the old created configuration File and updats - echo with a new, default one. + echo update - Deletes the old created configuration file and updates + echo it with a new, default one. goto :EOC ) ) @@ -154,45 +153,28 @@ ) if exist "%_ROSBE_BASEDIR%\scut.cmd" ( if /i "%1" == "scut" ( - echo Usage: scut [OPTIONS] - echo Defines, Edits, Removes, Switches and Defaults to Shortcutted Source - echo Directories. scut started without a parameter or with the name of a - echo Shortcut as parameter sets this Shortcut active. - echo. - echo list - Lists all Shortcuts. - echo Optional: "path" as second parameter lists the Paths, too. - echo add - Adds a Shortcut. - echo Optional: "Shortcut" "Directory" as second and third parameter - echo rem - Removes a shortcut. - echo Optional: "Shortcut" as second parameter - echo edit - Edits a shortcut. - echo Optional: "Shortcut" "Directory" as second and third parameter - echo def - Chooses Default Shortcut which is enabled on - echo every start of RosBE. "Default" is the Source - echo Directory as you know it from previous Versions + "%_ROSBE_BASEDIR%\Tools\scut.exe" --help goto :EOC ) ) if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( if /i "%1" == "ssvn" ( echo Usage: ssvn [OPTIONS] - echo Creates, Updates or cleans up your ReactOS Source Tree or shows the - echo Revision Number of the Offline Tree and Online HEAD Revision. + echo Creates, updates or cleans up your ReactOS source tree or shows the + echo revision number of the local and online trees. echo. - echo update - Updates to HEAD Revision or to a specific one when + echo update - Updates to HEAD revision or to a specific one when echo second parameter specifies one. - echo create - Creates a new ReactOS Source Tree. - echo cleanup - Cleans up and fixes errors in the Source Tree. - echo status - Shows Actual offline Revision Number and online HEAD - echo Revision Number. + echo create - Creates a new ReactOS source tree. + echo cleanup - Cleans up and fixes errors in the source tree. + echo status - Show the current local and online revision numbers. goto :EOC ) ) if exist "%_ROSBE_BASEDIR%\options.cmd" ( if /i "%1" == "options" ( echo Usage: options - echo Starts RosBE Configurator and restarts RosBE afterwards to make the - echo changes effective at the end. + echo Starts the RosBE configurator. goto :EOC ) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Oct 31 18:15:29 2007 @@ -34,8 +34,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( - call "%_ROSBE_BASEDIR%\rosbe-options.cmd" +if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" ) title ReactOS Build Environment %_ROSBE_VERSION% @@ -52,7 +52,7 @@ if not "%1" == "" ( cls echo Unknown parameter specified. Exiting. - goto :ExitRosBE + goto :EOC ) cls @@ -61,12 +61,11 @@ :EndCommandParse :: -:: Load the Base Directory from the Shortcut-txt and set it as new -:: Source Directory and add PATH for Tools Folder. +:: Load the base directory from srclist.txt and set it as the +:: new source directory. :: if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo. - call "%_ROSBE_BASEDIR%\scut.cmd" run + call "%_ROSBE_BASEDIR%\scut.cmd" ) :: @@ -83,14 +82,17 @@ call :LOADDOSKEYMACROS :: -:: Look if the Source Folder is empty. If so, ask for using "ssvn create". +:: Look if the ReactOS source directory is empty. If so, +:: inform the user and mention 'ssvn create' (only if ssvn is installed). :: -dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul -if errorlevel 1 ( - echo No ReactOS Source detected. Please use "ssvn create" to download it. +if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( + dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul + if errorlevel 1 ( + echo No ReactOS source detected. Please use "ssvn create" to download it. + ) ) -goto :ExitRosBE +goto :EOC :: :: Display the banner and set up the environment for the GCC 4.x.x build @@ -127,4 +129,4 @@ if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) goto :EOF -:ExitRosBE +:EOC Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Wed Oct 31 18:15:29 2007 @@ -13,12 +13,10 @@ :: :: Run options.exe :: -if exist "%_ROSBE_BASEDIR%\options.exe" ( - pushd %_ROSBE_BASEDIR% - call options.exe - popd - if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( - call "%_ROSBE_BASEDIR%\rosbe-options.cmd" +if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( + call "%_ROSBE_BASEDIR%\Tools\options.exe" + if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" ) ) else ( echo ERROR: options.exe was not found. Modified: trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/rosbe-gcc… ============================================================================== --- trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd Wed Oct 31 18:15:29 2007 @@ -8,6 +8,18 @@ :: :: @echo off + +:: +:: Check if we are running within the RosBE, and if not +:: initialize GCC for the current directory. +:: +if not defined _ROSBE_MINGWPATH ( + if /i "%1" == "oldmode" ( + set _ROSBE_OLDMODE="" + ) + set _ROSBE_MINGWPATH=%CD% + set _ROSBE_ORIGINALPATH=%PATH% +) :: :: Set up the GCC 4.x.x build environment. Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Wed Oct 31 18:15:29 2007 @@ -9,11 +9,11 @@ @echo off :: -:: Receive the first Parameter and decide what to do. +:: Receive the first parameter and decide what to do. :: if "%1" == "" ( echo No parameter specified. Try 'help [COMMAND]'. - goto :ExitSVN + goto :EOC ) :: :: These two are directly parsed to svn. @@ -25,65 +25,65 @@ ) else ( svn update ) -goto :ExitSVN +goto :EOC ) if /i "%1" == "cleanup" ( title Cleaning... svn cleanup - goto :ExitSVN + goto :EOC ) :: -:: Check if the Folder is empty. If not, output an error. +:: Check if the folder is empty. If not, output an error. :: if /i "%1" == "create" ( title Creating... if exist ".svn\." ( - echo ERROR: Folder already cotains a Reposority. Exiting - goto :ExitSVN + echo ERROR: Folder already cotains a reposority. + goto :EOC ) - dir /b 2>nul|findstr "." >nul + dir /b 2>nul | findstr "." >nul if errorlevel 1 ( svn checkout svn://svn.reactos.org/reactos/trunk/reactos . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) - goto :ExitSVN + goto :EOC ) :: -:: Output the rev of your and the Online Tree and tell the User if -:: its Up to Date or not. +:: Output the revision of the local and online trees and tell the user if +:: its up to date or not. :: if /i "%1" == "status" ( title Status for /f "usebackq tokens=2" %%i in (`"svn info | find "Revision:""`) do set OFFSVN=%%i for /f "usebackq tokens=2" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j call :UP - goto :ExitSVN + goto :EOC ) if not "%1" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. - goto :ExitSVN + echo Unknown parameter specified. Try 'help ssvn'. + goto :EOC ) :UP -echo Recent Offline Revision: %OFFSVN% +echo Local Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% echo. if %OFFSVN% lss %ONSVN% ( - echo Your Tree is not Up to date. Do you want to update it? + echo Your tree is not up to date. Do you want to update it? goto :UP2 ) if %OFFSVN% equ %ONSVN% ( - echo Your Tree is Up to date. - goto :ExitSVN + echo Your tree is up to date. + goto :EOC ) :UP2 -set /p XY="(yes), (no)" +set /p XY="Please enter 'yes' or 'no': " if /i "%XY%"=="yes" %_ROSBE_BASEDIR%\ssvn update -if /i "%XY%"=="no" goto :ExitSVN +if /i "%XY%"=="no" goto :EOC -:ExitSVN +:EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Wed Oct 31 18:15:29 2007 @@ -1,240 +1,47 @@ :: -:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: PROJECT: RosBE - ReactOS Build Environment for Windows. :: LICENSE: GPL - See LICENSE.txt in the top level directory. :: FILE: Root/scut.cmd -:: PURPOSE: Shortcut Creator, Remover and Switcher. +:: PURPOSE: Manages named shortcuts to ReactOS source directories. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: +:: Peter Ward <dralnix(a)gmail.com> :: @echo off -title Choose your Source Folder... - -:: -:: Receive the first Parameter and decide what to do. -:: -if /i "%1"=="" ( - goto :DEF -) -if /i "%1"=="add" ( - goto :ADD -) -if /i "%1"=="rem" ( - goto :REM -) -if /i "%1"=="edit" ( - goto :EDIT -) -if /i "%1"=="def" ( - goto :DEF2 -) -if /i "%1"=="list" ( - if /i "%2"=="" ( - echo Shortcuts: - for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do echo %%i - ) - if /i "%2"=="path" ( - echo Shortcuts, Paths: - for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do echo %%i, %%j - ) - goto :END -) -if /i "%1"=="run" ( - for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( - if %%i == Base ( - echo Active Shortcut: %%j - :: - : Set new source directory, if needed. - :: - if not "%%j" == "Default" ( - call "%_ROSBE_BASEDIR%\scut.cmd" %%j - ) +if /i "%1" == "" ( + for /f "usebackq tokens=*" %%i in (`"%_ROSBE_BASEDIR%\Tools\scut.exe"`) do ( + if /i not "%%i" == "Default" ( + cd /d %%i + set _ROSBE_ROSSOURCEDIR=%%i ) ) - goto :END -) else ( - set XY=%1 - goto :RUN + goto :EOC ) -goto :END - -:: -:: Load Shortcut from txt and set it active. -:: -:DEF -set /p XY="Choose your Shortcut: " - -:RUN -if /i "%XY%" == "" ( - echo ERROR: You must enter a valid Shortcut. - goto :END +if /i "%1" == "add" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC ) -for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( - if %%i == %XY% ( - cd /d %%j - goto :END +if /i "%1" == "rem" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) +if /i "%1" == "edit" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) +if /i "%1" == "def" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) +if not "%1" == "" ( + for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools Test\scut.exe" %*"`) do ( + if /i not "%%i" == "Default" ( + cd /d %%i + set _ROSBE_ROSSOURCEDIR=%%i + ) ) -) -echo ERROR: The Shortcut %XY% does not exist. -goto :END - -:: -:: Add new Shortcut to txt. -:: -:ADD -if not "%2" == "" ( - if not "%3" == "" ( - set CUT=%2 - set DIR=%3 - goto :ADD23 - ) else ( - set CUT=%2 - goto :ADD2 - ) -) else ( - goto :ADD1 + goto :EOC ) -:ADD1 -set /p CUT="Choose your Shortcut: " -if /i "%CUT%" == "" ( - echo ERROR: You must enter a valid Shortcut. - goto :END -) - -:ADD2 -set /p DIR="Choose your Source Folder: " - -:ADD23 -if not exist "%DIR%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :END -) -if /i "%DIR%" == "" ( - echo ERROR: You must enter a valid directory. - goto :END -) -for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( - if %%i == %CUT% ( - echo A Shortcut with the name %CUT% does already exist. Editing the existing one. - call "%_ROSBE_BASEDIR%\scut.cmd" edit %CUT% %DIR% - goto :END - ) -) -echo %CUT%,%DIR%>> "%_ROSBE_BASEDIR%\srclist.txt" -echo Shortcut %CUT% successfully added. -goto :END - -:: -:: Remove Shortcut from txt. -:: -:REM -if not "%2" == "" ( - set CUTREM=%2 - goto :REM1 -) -set /p CUTREM="Choose your Shortcut: " -if /i "%CUTREM%" == "" ( - echo ERROR: You must enter a valid Shortcut. - goto :END -) - -:REM1 -set _ROSBE_REM=0 -for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( - if not %%i == %CUTREM% ( - echo %%i,%%j>> "%_ROSBE_BASEDIR%\srclist2.txt" - ) else ( - set _ROSBE_REM=1 - ) -) -del "%_ROSBE_BASEDIR%\srclist.txt" -ren "%_ROSBE_BASEDIR%\srclist2.txt" srclist.txt -if %_ROSBE_REM% == 0 ( - echo ERROR: The Shortcut %CUTREM% does not exist. -) else ( - echo Shortcut %CUTREM% successfully deleted. -) -goto :END - - -:: -:: Set Default Shortcut. -:: -:DEF2 -if not "%2" == "" ( - set DIR=%2 - goto :DEF1 -) -set /p DIR="Choose your new Default Shortcut: " -if /i "%DIR%" == "" ( - echo ERROR: You must enter a valid Shortcut. - goto :END -) - -:DEF1 -call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% - -:: -:: Edit a existing Shortcut. -:: -:EDIT -if not "%2" == "" ( - if not "%3" == "" ( - set CUT=%2 - set DIR=%3 - goto :EDIT23 - ) else ( - set CUT=%2 - goto :EDIT2 - ) -) else ( - goto :EDIT1 -) - -:EDIT1 -set /p CUT="Choose your Shortcut: " -if /i "%CUT%" == "" ( - echo ERROR: You must enter a valid Shortcut. - goto :END -) - -:EDIT2 -set /p DIR="Choose your Source Folder: " - -:EDIT23 -if not exist "%DIR%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :END -) -if /i "%DIR%" == "" ( - echo ERROR: You must enter a valid directory. - goto :END -) -set _ROSBE_EDIT=0 -for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( - if %%i == %CUT% ( - set _ROSBE_EDIT=1 - if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( - echo %%i,%DIR%>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" - ) else ( - echo %%i,%DIR%> "%_ROSBE_BASEDIR%\temporaryfile.tmp" - ) - ) else ( - if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( - echo %%i,%%j>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" - ) else ( - echo %%i,%%j> "%_ROSBE_BASEDIR%\temporaryfile.tmp" - ) - ) -) -del "%_ROSBE_BASEDIR%\srclist.txt" -ren "%_ROSBE_BASEDIR%\temporaryfile.tmp" srclist.txt -if %_ROSBE_EDIT% == 0 ( - echo ERROR: The Shortcut %CUT% does not exist. -) else ( - echo Shortcut %CUT% successfully edited. -) - -:END +:EOC title ReactOS Build Environment %_ROSBE_VERSION% Removed: trunk/tools/RosBE-Windows/Root/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.txt (original) +++ trunk/tools/RosBE-Windows/Root/srclist.txt (removed) @@ -1,2 +1,0 @@ -Base,Default -Default,C:\RosBE\Source Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Wed Oct 31 18:15:29 2007 @@ -30,8 +30,8 @@ } if ((argc == 1) || (!strncmp(argv[1], "/?", 2)) || - (!strncmp(argv[1], "-h", 2)) || - (!strncmp(argv[1], "--help", 6))) + (!_strnicmp(_strlwr(argv[1]), "-h", 2)) || + (!_strnicmp(_strlwr(argv[1]), "--help", 6))) { printf("Usage: %s FILE1 FILE2\n", argv[0]); printf("Checks if FILE1 is newer than FILE2 by checking\n"); Modified: trunk/tools/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chkslash… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chkslash.c (original) +++ trunk/tools/RosBE-Windows/Tools/chkslash.c Wed Oct 31 18:15:29 2007 @@ -22,8 +22,8 @@ } if ((argc == 1) || (!strncmp(argv[1], "/?", 2)) || - (!strncmp(argv[1], "-h", 2)) || - (!strncmp(argv[1], "--help", 6))) + (!_strnicmp(argv[1], "-h", 2)) || + (!_strnicmp(argv[1], "--help", 6))) { printf("Usage: %s STRING\n", argv[0]); printf("Checks if STRING has a backslash or not. Returns\n"); Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Wed Oct 31 18:15:29 2007 @@ -48,7 +48,7 @@ { int foreground, background; BOOL showtime, writelog, useccache, strip, otherobj, otherout; - WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; + WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH], optionsfile[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; FILE *pFile; @@ -96,7 +96,9 @@ } CloseHandle(hFile); - pFile = fopen("rosbe-options.cmd", "w"); + wcscpy(optionsfile, _wgetenv(L"APPDATA")); + wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); + pFile = _wfopen(optionsfile, L"w"); if (pFile) { fprintf(pFile, "::\n"); Added: trunk/tools/RosBE-Windows/Tools/config/options.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Tools/config/options.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.rc Wed Oct 31 18:15:29 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include "resources.h" -ID_OPTICON ICON "reactos.ico" +ID_OPTICON ICON "options.ico" 1 24 "options.exe.Manifest" Removed: trunk/tools/RosBE-Windows/Tools/config/reactos.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== Binary file - no diff available. Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 31 18:15:29 2007 @@ -7,7 +7,7 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime chknewer chkslash cpucount echoh flash getdate tee +all: buildtime chknewer chkslash cpucount echoh flash getdate scut tee buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c @@ -30,8 +30,11 @@ getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c +scut: scut.c + ${CC} ${CFLAGS} scut scut.c + tee: tee.c ${CC} ${CFLAGS} tee tee.c clean: - del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe Added: trunk/tools/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/scut.c?r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/scut.c (added) +++ trunk/tools/RosBE-Windows/Tools/scut.c Wed Oct 31 18:15:29 2007 @@ -1,0 +1,540 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/scut.c + * PURPOSE: Manages named shortcuts to ReactOS source directories. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * Daniel Reimer <reimer.daniel(a)freenet.de> + * + */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +typedef struct _SHORTCUT +{ + char* name; + char* path; + struct _SHORTCUT *next; +} SHORTCUT, *PSHORTCUT; + +#define LINE_MAX 1024 +char* programname; +char shortcutfile[260]; + +PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); +int checkname(PSHORTCUT head, char* name); +int checkpath(char* path); // Alters path by fully expanding it. +void defaultshortcut(char* name); +PSHORTCUT deleteshortcut(PSHORTCUT ptr, PSHORTCUT *head); +void editshortcut(PSHORTCUT ptr, char* name, char* path); +void freeshortcuts(PSHORTCUT ptr); +PSHORTCUT previousshortcut(PSHORTCUT current, PSHORTCUT head); +PSHORTCUT readshortcuts(void); +int writeshortcuts(PSHORTCUT head); + +int main(int argc, char* argv[]) +{ + PSHORTCUT shortcuts = NULL, current = NULL; + char name[260], path[260]; + int removed = 0; + programname = argv[0]; + + strcpy(shortcutfile, getenv("APPDATA")); + strcat(shortcutfile, "\\RosBE\\srclist.txt"); + + if (argc > 4) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", programname); + return -1; + } + if (argc == 1) + { + defaultshortcut(NULL); + } + else if ((!strncmp(argv[1], "/?", 2)) || + (!_strnicmp(argv[1], "-h", 2)) || + (!_strnicmp(argv[1], "--help", 6))) + { + printf("Usage: %s [OPTIONS] [SHORTCUT] [PATH]\n", programname); + printf("Manages named shortcuts to ReactOS source directories. scut started\n"); + printf("with the name of a shortcut sets this shortcut active.\n\n"); + printf("The following details the options:\n\n"); + printf(" list - Lists all shortcuts and their paths.\n"); + printf(" add - Adds a shortcut.\n"); + printf(" (Optional: SHORTCUT PATH as the second and third parameters)\n"); + printf(" rem - Removes a shortcut.\n"); + printf(" (Optional: SHORTCUT as the second parameter)\n"); + printf(" edit - Edits a shortcut.\n"); + printf(" (Optional: SHORTCUT PATH as the second and third parameters)\n"); + printf(" def - Sets the default shortcut which is enabled on\n"); + printf(" every start of RosBE. 'Default' is the source\n"); + printf(" directory as you know it from previous versions.\n\n"); + return 0; + } + else if (!_strnicmp(argv[1], "list", 4)) + { + shortcuts = readshortcuts(); + current = shortcuts; + + printf("All available shortcuts:\n\n"); + while(current) + { + printf("Shortcut Name: %s\n", current->name); + printf(" -> Path: %s\n", current->path); + current = current->next; + } + freeshortcuts(shortcuts); + } + else if (!_strnicmp(argv[1], "add", 3)) + { + shortcuts = readshortcuts(); + current = shortcuts; + + if (argc >= 3) + { + strcpy(name, argv[2]); + } + else + { + do + { + printf("Please enter a name for the shortcut: "); + fflush(stdin); + fgets(name, 260, stdin); + } while(strlen(name) == 1); + strcpy(name, strtok(name, "\n")); + } + if (!checkname(shortcuts, name)) + { + fprintf(stderr, "%s: Shortcut '%s' already exists.\n", programname, name); + } + else + { + if (argc == 4) + { + strcpy(path, argv[3]); + } + else + { + do + { + printf("Please enter the path for the shortcut: "); + fflush(stdin); + fgets(path, 260, stdin); + } while(strlen(path) == 1); + strcpy(path, strtok(path, "\n")); + } + if (!checkpath(path)) + { + fprintf(stderr, "%s: Directory '%s' doesn't exist.\n", programname, path); + } + else + { + shortcuts = addshortcut(shortcuts, name, path); + writeshortcuts(shortcuts); + } + } + freeshortcuts(shortcuts); + } + else if (!_strnicmp(argv[1], "rem", 3)) + { + shortcuts = readshortcuts(); + current = shortcuts; + + if (argc >= 3) + { + strcpy(name, argv[2]); + } + else + { + do + { + printf("Please enter the name of the shortcut to remove: "); + fflush(stdin); + fgets(name, 260, stdin); + } while(strlen(name) == 1); + strcpy(name, strtok(name, "\n")); + } + if (!_stricmp(name, "Default")) + { + fprintf(stderr, "%s: Unable to remove default shortcut.\n", programname); + } + else + { + while(current) + { + if (!_stricmp(current->name, name)) + { + current = deleteshortcut(current, &shortcuts); + removed = 1; + break; + } + current = current->next; + } + if (removed) + { + writeshortcuts(shortcuts); + printf("Removed shortcut: %s\n", name); + } + else + { + printf("Unable to find shortcut: %s\n", name); + } + } + freeshortcuts(shortcuts); + } + else if (!_strnicmp(argv[1], "edit", 4)) + { + shortcuts = readshortcuts(); + current = shortcuts; + + if (argc >= 3) + { + strcpy(name, argv[2]); + } + else + { + do + { + printf("Please enter the name of the shortcut to edit: "); + fflush(stdin); + fgets(name, 260, stdin); + } while(strlen(name) == 1); + strcpy(name, strtok(name, "\n")); + } + if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + { + fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); + } + else + { + while(current) + { + if (!_stricmp(current->name, name)) + { + if (argc == 4) + { + strcpy(path, argv[3]); + } + else + { + do + { + printf("Please enter a new path for the shortcut: "); + fflush(stdin); + fgets(path, 260, stdin); + } while(strlen(path) == 1); + strcpy(path, strtok(path, "\n")); + } + if (!checkpath(path)) + { + fprintf(stderr, "%s: Directory '%s' doesn't exist.\n", programname, path); + break; + } + else + { + editshortcut(current, name, path); + writeshortcuts(shortcuts); + printf("Edited shortcut: %s\n", name); + break; + } + } + current = current->next; + } + } + freeshortcuts(shortcuts); + } + else if (!_strnicmp(argv[1], "def", 3)) + { + shortcuts = readshortcuts(); + current = shortcuts; + + if (argc >= 3) + { + strcpy(name, argv[2]); + } + else + { + do + { + printf("Please enter the the name of the shortcut to set as default: "); + fflush(stdin); + fgets(name, 260, stdin); + } while(strlen(name) == 1); + strcpy(name, strtok(name, "\n")); + } + if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + { + fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); + freeshortcuts(shortcuts); + } + else + { + freeshortcuts(shortcuts); + defaultshortcut(name); + } + } + else + { + shortcuts = readshortcuts(); + current = shortcuts; + + strcpy(name, argv[1]); + if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + { + fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); + } + else + { + while(current) + { + if (!_stricmp(current->name, name)) + { + printf("%s", current->path); + break; + } + current = current->next; + } + } + freeshortcuts(shortcuts); + } + + return 0; +} + +PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path) +{ + if (!ptr) + { + ptr = (PSHORTCUT)malloc(sizeof(SHORTCUT)); + ptr->name = (char*)malloc(strlen(name) + 1); + strcpy(ptr->name, name); + ptr->path = (char*)malloc(strlen(path) + 1); + strcpy(ptr->path, path); + ptr->next = NULL; + } + else + { + ptr->next = addshortcut(ptr->next, name, path); + } + + return ptr; +} + +int checkname(PSHORTCUT head, char* name) +{ + PSHORTCUT current = head; + + while(current) + { + if (!_stricmp(current->name, name)) + { + return 0; + } + current = current->next; + } + + return 1; +} + +int checkpath(char* path) +{ + char currentdir[260]; + getcwd(currentdir, 260); + if (!chdir(path)) + { + getcwd(path, 260); + chdir(currentdir); + return 1; + } + + return 0; +} + +void defaultshortcut(char* name) +{ + PSHORTCUT shortcuts = NULL, current = NULL; + char path[260]; + + shortcuts = readshortcuts(); + current = shortcuts; + + if (!name) + { + while(current) + { + if (!_stricmp(current->name, "Default")) + { + printf("%s", current->path); + break; + } + current = current->next; + } + } + else + { + while(current) + { + if (!_stricmp(current->name, name)) + { + strcpy(path, current->path); + current = shortcuts; + while(current) + { + if (!_stricmp(current->name, "Default")) + { + editshortcut(current, "Default", path); + writeshortcuts(shortcuts); + printf("Default shortcut set to: %s\n", path); + break; + } + current = current->next; + } + break; + } + current = current->next; + } + } + + freeshortcuts(shortcuts); +} + +PSHORTCUT deleteshortcut(PSHORTCUT current, PSHORTCUT *head) +{ + PSHORTCUT temp = NULL; + PSHORTCUT previous = NULL; + + if (current) + { + temp = current; + if (current != *head) + { + previous = previousshortcut(current, *head); + current = current->next; + previous->next = current; + } + else + { + *head = current->next; + } + if (temp->name) free(temp->name); + if (temp->path) free(temp->path); + free(temp); + } + + return current; +} + +void editshortcut(PSHORTCUT current, char* name, char* path) +{ + if (current) + { + if (name) + { + current->name = (char*)realloc(current->name, strlen(name) + 1); + strcpy(current->name, name); + } + if (path) + { + current->path = (char*)realloc(current->path, strlen(path) + 1); + strcpy(current->path, path); + } + } +} + +void freeshortcuts(PSHORTCUT head) +{ + PSHORTCUT temp = NULL; + + while (head) + { + temp = head; + head = head->next; + if (temp->name) free(temp->name); + if (temp->path) free(temp->path); + free(temp); + } +} + +PSHORTCUT previousshortcut(PSHORTCUT current, PSHORTCUT head) +{ + PSHORTCUT temp = head; + + if(current == head) + { + return head; + } + + while(temp->next != current) + { + temp = temp->next; + } + + return temp; +} + +PSHORTCUT readshortcuts(void) +{ + FILE *FILE; + PSHORTCUT head = NULL; + char strbuff[LINE_MAX]; + char *name = NULL, *path = NULL; + + FILE = fopen(shortcutfile, "r"); + if (!FILE) + { + fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); + return NULL; + } + else + { + while(!feof(FILE)) + { + fgets(strbuff, LINE_MAX, FILE); + name = strtok(strbuff, ","); + path = strtok(NULL, "\n"); + if (name && path) + { + head = addshortcut(head, name, path); + } + } + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file.\n", programname); + freeshortcuts(head); + return NULL; + } + } + + return head; +} + +int writeshortcuts(PSHORTCUT head) +{ + FILE *FILE; + + FILE = fopen(shortcutfile, "w"); + if (!FILE) + { + fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); + return -1; + } + else + { + while(head) + { + fprintf(FILE, "%s,%s\n", head->name, head->path); + head = head->next; + } + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file.\n", programname); + return -1; + } + } + + return 0; +} Propchange: trunk/tools/RosBE-Windows/Tools/scut.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/tools/RosBE-Windows/Tools/srclist.txt (from r29979, trunk/tools/RosBE-Windows/Root/srclist.txt) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/srclist.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.txt (original) +++ trunk/tools/RosBE-Windows/Tools/srclist.txt Wed Oct 31 18:15:29 2007 @@ -1,2 +1,1 @@ -Base,Default -Default,C:\RosBE\Source +Default,Default Modified: trunk/tools/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/tee.c?re… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/tee.c (original) +++ trunk/tools/RosBE-Windows/Tools/tee.c Wed Oct 31 18:15:29 2007 @@ -22,8 +22,8 @@ } if ((argc == 1) || (!strncmp(argv[1], "/?", 2)) || - (!strncmp(argv[1], "-h", 2)) || - (!strncmp(argv[1], "--help", 6))) + (!_strnicmp(argv[1], "-h", 2)) || + (!_strnicmp(argv[1], "--help", 6))) { printf("Usage: %s FILE\n", argv[0]); printf("Takes standard input and sends it to standard output\n");

16 years, 11 months

[fireball] 30014: - Dispatch all symbol loads to a single function, which determines type of passed name, and calls worker function. - Print source file:line in stack traces if possible, when KDBG is enabled - if KDBG is not defined, behaviour of the mainstream code is completely untouched.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 31 17:41:27 2007 New Revision: 30014 URL: http://svn.reactos.org/svn/reactos?rev=30014&view=rev Log: - Dispatch all symbol loads to a single function, which determines type of passed name, and calls worker function. - Print source file:line in stack traces if possible, when KDBG is enabled - if KDBG is not defined, behaviour of the mainstream code is completely untouched. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h Wed Oct 31 17:41:27 2007 @@ -84,7 +84,12 @@ KdbSymUnloadDriverSymbols(IN PLDR_DATA_TABLE_ENTRY ModuleObject); VOID -KdbSymProcessBootSymbols(IN PANSI_STRING FileName); +KdbSymProcessBootSymbols(IN PANSI_STRING AnsiFileName, + IN BOOLEAN FullName, + IN BOOLEAN LoadFromFile); + +VOID +KdbSymProcessSymbols(IN PANSI_STRING FileName); BOOLEAN KdbSymPrintAddress(IN PVOID Address); @@ -114,7 +119,7 @@ # define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) # define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) +# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessSymbols(FILENAME) #else # define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Wed Oct 31 17:41:27 2007 @@ -442,7 +442,7 @@ FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { - DPRINT("Could not open image file: %wZ\n", &FileName); + DPRINT("Could not open image file: %wZ\n", FileName); return; } @@ -577,6 +577,54 @@ ModuleObject->PatchInformation = NULL; } +VOID +KdbSymProcessSymbols(IN PANSI_STRING AnsiFileName) +{ + ANSI_STRING SystemPrefix, RealPathPrefix, ProperName; + CHAR Buffer[MAX_PATH], RealPathBuffer[MAX_PATH]; + + /* Init our strings for compare operations */ + RtlInitAnsiString(&SystemPrefix, "\\SystemRoot"); + + /* Convert system root to ansi */ + sprintf(RealPathBuffer, "%S", (PWCHAR)&SharedUserData->NtSystemRoot[2]); + RtlInitAnsiString(&RealPathPrefix, RealPathBuffer); + RealPathPrefix.MaximumLength = MAX_PATH; + + /* There are 3 cases: + 1) \SystemRoot\System32\ -> no change + 2) \ReactOS\System32 -> \SystemRoot\System32 + 3) module.dll -> \??\C:\ReactOS\system32\module.dll + */ + if (RtlPrefixString(&SystemPrefix, AnsiFileName, FALSE)) + { + /* Case: \SystemRoot\System32\ , just directly load it */ + KdbSymProcessBootSymbols(AnsiFileName, TRUE, FALSE); + } + else if (RtlPrefixString(&RealPathPrefix, AnsiFileName, FALSE)) + { + /* It's prefixed with a real path, instead of a \SystemRoot. + So build a new, proper name. */ + RtlZeroMemory(Buffer, MAX_PATH); + strcpy(Buffer, "\\SystemRoot"); + strncat(Buffer, + AnsiFileName->Buffer + RealPathPrefix.Length, + AnsiFileName->Length - RealPathPrefix.Length); + + /* Convert it to ANSI_STRING */ + RtlInitAnsiString(&ProperName, Buffer); + + /* Process symbols */ + KdbSymProcessBootSymbols(&ProperName, TRUE, TRUE); + } + else + { + /* Just a bare filename, nothing else. Why? Who knows... */ + KdbSymProcessBootSymbols(AnsiFileName, FALSE, TRUE); + } +} + + /*! \brief Called when a symbol file is loaded by the loader? * * Tries to find a driver (.sys) or executable (.exe) with the same base name @@ -587,7 +635,9 @@ * \param FileName Filename for which the symbols are loaded. */ VOID -KdbSymProcessBootSymbols(IN PANSI_STRING AnsiFileName) +KdbSymProcessBootSymbols(IN PANSI_STRING AnsiFileName, + IN BOOLEAN FullName, + IN BOOLEAN LoadFromFile) { BOOLEAN Found = FALSE; PLIST_ENTRY ListHead, NextEntry; @@ -624,10 +674,21 @@ LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - if (RtlEqualUnicodeString(&ModuleName, &LdrEntry->FullDllName, TRUE)) + if (FullName) { - Found = TRUE; - break; + if (RtlEqualUnicodeString(&ModuleName, &LdrEntry->FullDllName, TRUE)) + { + Found = TRUE; + break; + } + } + else + { + if (RtlEqualUnicodeString(&ModuleName, &LdrEntry->BaseDllName, TRUE)) + { + Found = TRUE; + break; + } } /* Go to the next one */ @@ -651,17 +712,26 @@ KdbpSymRemoveCachedFile(LdrEntry->PatchInformation); } - /* Load new symbol information */ - if (! RosSymCreateFromMem(LdrEntry->DllBase, - LdrEntry->SizeOfImage, - (PROSSYM_INFO*)&LdrEntry->PatchInformation)) - { - /* Error loading symbol info, exit */ - return; - } - - /* Add file to cache */ - KdbpSymAddCachedFile(&ModuleName, LdrEntry->PatchInformation); + if (LoadFromFile) + { + /* Load symbol info from file */ + KdbpSymLoadModuleSymbols(&LdrEntry->FullDllName, + (PROSSYM_INFO*)&LdrEntry->PatchInformation); + } + else + { + /* Load new symbol information */ + if (! RosSymCreateFromMem(LdrEntry->DllBase, + LdrEntry->SizeOfImage, + (PROSSYM_INFO*)&LdrEntry->PatchInformation)) + { + /* Error loading symbol info, exit */ + return; + } + + /* Add file to cache */ + KdbpSymAddCachedFile(&ModuleName, LdrEntry->PatchInformation); + } DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", &ModuleName, @@ -767,9 +837,9 @@ /* FIXME: Load as 1st and 2nd entries of InLoadOrderList instead of hardcoding them here! */ RtlInitAnsiString(&FileName, "\\SystemRoot\\System32\\NTOSKRNL.EXE"); - KdbSymProcessBootSymbols(&FileName); + KdbSymProcessBootSymbols(&FileName, TRUE, FALSE); RtlInitAnsiString(&FileName, "\\SystemRoot\\System32\\HAL.DLL"); - KdbSymProcessBootSymbols(&FileName); + KdbSymProcessBootSymbols(&FileName, TRUE, FALSE); } } Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3001… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Wed Oct 31 17:41:27 2007 @@ -290,8 +290,14 @@ if (KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry)) { /* Print out the module name */ - Addr -= (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); +#ifdef KDBG + if (!KdbSymPrintAddress((PVOID)Addr)) +#endif + { + /* Fall back to usual printing */ + Addr -= (ULONG_PTR)LdrEntry->DllBase; + DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); + } } else if (Addr) { Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Oct 31 17:41:27 2007 @@ -1860,7 +1860,12 @@ } /* Check if there's symbols */ +#ifdef KDBG + /* If KDBG is defined, then we always have symbols */ + if (TRUE) +#else if (MiCacheImageSymbols(LdrEntry->DllBase)) +#endif { /* Check if the system root is present */ if ((PrefixName.Length > (11 * sizeof(WCHAR))) &&

16 years, 11 months

[greatlrd] 30013: copy frambuf to framebuf_acc it will use system memory as cache, it will reduce the reading access of video memory, for reading video memory directly is slow and cost allot speed.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Oct 31 17:35:38 2007 New Revision: 30013 URL: http://svn.reactos.org/svn/reactos?rev=30013&view=rev Log: copy frambuf to framebuf_acc it will use system memory as cache, it will reduce the reading access of video memory, for reading video memory directly is slow and cost allot speed. Added: trunk/reactos/drivers/video/displays/framebuf_acc/ - copied from r30012, trunk/reactos/drivers/video/displays/framebuf/

16 years, 11 months

[hpoussin] 30012: Remove debug/useless code

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 31 16:41:31 2007 New Revision: 30012 URL: http://svn.reactos.org/svn/reactos?rev=30012&view=rev Log: Remove debug/useless code Removed: trunk/reactos/boot/freeldr/freeldr/video/bank.c trunk/reactos/boot/freeldr/freeldr/video/pixel.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/video/video.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Wed Oct 31 16:41:31 2007 @@ -2292,11 +2292,6 @@ DetectAcpiBios(SystemKey, &BusNumber); DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n")); - -#if 0 - printf("*** System stopped ***\n"); - for (;;); -#endif } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Wed Oct 31 16:41:31 2007 @@ -62,10 +62,8 @@ <file>ui.c</file> </directory> <directory name="video"> - <file>bank.c</file> <file>fade.c</file> <file>palette.c</file> - <file>pixel.c</file> <file>video.c</file> </directory> <if property="ARCH" value="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Oct 31 16:41:31 2007 @@ -762,18 +762,15 @@ strcat(szHalName, value); } - /* Load the kernel */ - LoadBase = FrLdrLoadImage(szKernelName, 5, 1); - if (!LoadBase) return; - - printf("Kernel loaded at %x\n", LoadBase); - - /* Get the NT header, kernel base and kernel entry */ - NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); - KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); - printf("KernelEntryPoint is %x (base %x)\n", KernelEntryPoint, KernelBase); - LoaderBlock.KernelBase = KernelBase; + /* Load the kernel */ + LoadBase = FrLdrLoadImage(szKernelName, 5, 1); + if (!LoadBase) return; + + /* Get the NT header, kernel base and kernel entry */ + NtHeader = RtlImageNtHeader(LoadBase); + KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); + KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); + LoaderBlock.KernelBase = KernelBase; /* * Load the System hive from disk @@ -836,7 +833,7 @@ */ if (!FrLdrLoadNlsFiles(szBootPath, MsgBuffer)) { - UiMessageBox(MsgBuffer); + UiMessageBox(MsgBuffer); return; } UiDrawProgressBarCenter(30, 100, szLoadingMsg); @@ -844,19 +841,15 @@ /* * Load boot drivers */ - printf("FrLdrLoadBootDrivers\n"); FrLdrLoadBootDrivers(szBootPath, 40); - printf("FrLdrLoadBootDrivers end\n"); //UiUnInitialize("Booting ReactOS..."); /* * Now boot the kernel */ DiskStopFloppyMotor(); - printf("MachVideoPrepareForReactOS\n"); - MachVideoPrepareForReactOS(FALSE); - printf("FrLdrStartup\n"); - FrLdrStartup(0x2badb002); + MachVideoPrepareForReactOS(FALSE); + FrLdrStartup(0x2badb002); } #undef DbgPrint Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Wed Oct 31 16:41:31 2007 @@ -27,11 +27,6 @@ VOID RegInitializeRegistry (VOID) { -#if 0 - FRLDRHKEY TestKey; - WCHAR szTestString[] = L"TestString"; -#endif - /* Create root key */ RootKey = (FRLDRHKEY) MmAllocateMemory (sizeof(KEY)); @@ -74,19 +69,6 @@ RegCreateKey (RootKey, L"Registry\\Machine\\HARDWARE\\RESOURCEMAP", NULL); - -/* Testcode */ -#if 0 - RegCreateKey (RootKey, - L"Registry\\Machine\\HARDWARE\\DESCRIPTION\\TestKey", - &TestKey); - - RegSetValue (TestKey, - L"TestValue", - REG_SZ, - szTestString, - sizeof(szTestString)); -#endif } Removed: trunk/reactos/boot/freeldr/freeldr/video/bank.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/bank.c (original) +++ trunk/reactos/boot/freeldr/freeldr/video/bank.c (removed) @@ -1,112 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <freeldr.h> - -#if 0 /* This stuff isn't used and as far as I'm concerned it can go - GvG */ -U32 CurrentMemoryBank = 0; - -VOID VideoSetMemoryBank(U16 BankNumber) -{ - if (CurrentMemoryBank != BankNumber) - { - BiosVesaSetBank(BankNumber); - CurrentMemoryBank = BankNumber; - } -} - -U32 VideoGetMemoryBankForPixel(U32 X, U32 Y) -{ - U32 Bank; - U32 MemoryPos; - U32 BankSize; - U32 BytesPerPixel; - - //BytesPerPixel = ROUND_UP(VesaVideoModeInformation.BitsPerPixel, 8) / 8; - BytesPerPixel = (VesaVideoModeInformation.BitsPerPixel + 7) >> 3; - MemoryPos = (Y * VideoGetBytesPerScanLine()) + (X * BytesPerPixel); - //BankSize = VesaVideoModeInformation.WindowGranularity * 1024; - BankSize = VesaVideoModeInformation.WindowGranularity << 10; - Bank = MemoryPos / BankSize; - - return Bank; -} - -U32 VideoGetMemoryBankForPixel16(U32 X, U32 Y) -{ - U32 Bank; - U32 MemoryPos; - U32 BankSize; - - MemoryPos = (Y * VideoGetBytesPerScanLine()) + (X / 2); - //BankSize = VesaVideoModeInformation.WindowGranularity * 1024; - BankSize = VesaVideoModeInformation.WindowGranularity << 10; - Bank = MemoryPos / BankSize; - - return Bank; -} - -U32 VideoGetBankOffsetForPixel(U32 X, U32 Y) -{ - U32 BankOffset; - U32 MemoryPos; - U32 BankSize; - U32 BytesPerPixel; - - //BytesPerPixel = ROUND_UP(VesaVideoModeInformation.BitsPerPixel, 8) / 8; - BytesPerPixel = (VesaVideoModeInformation.BitsPerPixel + 7) >> 3; - MemoryPos = (Y * VideoGetBytesPerScanLine()) + (X * BytesPerPixel); - //BankSize = VesaVideoModeInformation.WindowGranularity * 1024; - BankSize = VesaVideoModeInformation.WindowGranularity << 10; - BankOffset = MemoryPos % BankSize; - - return BankOffset; -} - -U32 VideoGetBankOffsetForPixel16(U32 X, U32 Y) -{ - U32 BankOffset; - U32 MemoryPos; - U32 BankSize; - - MemoryPos = (Y * VideoGetBytesPerScanLine()) + (X / 2); - //BankSize = VesaVideoModeInformation.WindowGranularity * 1024; - BankSize = VesaVideoModeInformation.WindowGranularity << 10; - BankOffset = MemoryPos % BankSize; - - return BankOffset; -} - -U32 VideoGetOffScreenMemoryOffsetForPixel(U32 X, U32 Y) -{ - U32 MemoryPos; - U32 BytesPerPixel; - - //BytesPerPixel = ROUND_UP(VesaVideoModeInformation.BitsPerPixel, 8) / 8; - BytesPerPixel = (VesaVideoModeInformation.BitsPerPixel + 7) >> 3; - MemoryPos = (Y * VesaVideoModeInformation.BytesPerScanLine) + (X * BytesPerPixel); - - return MemoryPos; -} -#endif - -VOID VideoCopyOffScreenBufferToVRAM(VOID) -{ - MachVideoCopyOffScreenBufferToVRAM(VideoOffScreenBuffer); -} Removed: trunk/reactos/boot/freeldr/freeldr/video/pixel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/pixel.c (original) +++ trunk/reactos/boot/freeldr/freeldr/video/pixel.c (removed) @@ -1,335 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <freeldr.h> - -#if 0 /* This stuff isn't used and as far as I'm concerned it can go - GvG */ -// -// Arrrggh! -// I really really hate 16 color bit plane modes. -// They should all burn in hell for what they've -// done to my sleeping habits. And I still can't -// get this code to work and I have absolutely -// no idea why... -// -// Someone else can take up this portion of the -// boot loader because my give up... -// -// I was going to store the offscreen buffer as -// a big array of bytes (as opposed to four bits) -// and that makes it a bit easier to set a pixel -// on the offscreen buffer, but will have to be -// handled in the VideoCopyOffScreenBufferToVRAM() -// function. -// -VOID VideoSetPixel16(U32 X, U32 Y, U8 Color) -{ - //U8 CurrentColor; - U8* MemoryPointer; - U32 ByteOffset; - U8 BitInByte; - U8 ReadByte; - U8 BitToChange; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - // Calculate the byte offset into the bit-plane - // where the pixel is to be set and the bit - // offset in that byte. - //ByteOffset = (Y * VideoGetBytesPerScanLine()) + (X >> 3); - //ByteOffset = (Y * 80) + (X >> 3); - ByteOffset = (Y * 640) + X; - BitInByte = ByteOffset & 7; - ByteOffset = ByteOffset >> 3; - //BitToChange = 0x80 >> BitInByte; - BitToChange = 0x80; - - DbgPrint((DPRINT_WARNING, "X = %d Y = %d Color = %d ByteOffset = %d BitInByte = %d BitToChange = %d\n", X, Y, Color, ByteOffset, BitInByte, BitToChange)); - //getch(); - - // Read the byte of memory to be changed. This is a - // read for the video card latches and the data read - // from memory does not need to be used. - ReadByte = MemoryPointer[ByteOffset]; - - // Select the bit or bits in the byte that need to be - // changed through index 8 of the VGA card address - // register by sending an 8 out to I/O port 3CEh. - // Next get the bits to be changed (a one-bit represents - // a bit to be changed) and send this out to I/O - // port 3CFh, the bit mask register (BMR). - //WRITE_PORT_USHORT((U16*)0x3CE, (((U16)BitToChange) << 8) + 0x08); - WRITE_PORT_UCHAR((U8*)0x3CE, 0x08); - //WRITE_PORT_UCHAR((U8*)0x3CF, BitToChange); - WRITE_PORT_UCHAR((U8*)0x3CF, BitInByte); - - // Next set all mask bits to 1111 in the map mask register - // (MMR) at sequencer offset 2, and write color 0 to the - // VGA card to set the color to black. The mask bits select - // the bit planes to be changed. If all are selected and a - // color of 0 is written, all four bit-planes are clear to zero. - WRITE_PORT_USHORT((U16*)0x3C4, 0x0F02); - //WRITE_PORT_UCHAR((U8*)0x3C4, 0x02); - //WRITE_PORT_UCHAR((U8*)0x3C5, 0x0F); // Mask to 1111 binary - MemoryPointer[ByteOffset] = 0x00; - - // Send the desired color number to the map mask register and - // write an FFh to the video memory. This places a logic one - // in only the selected bit planes to write a new color to - // a pixel or dot on the screen. - WRITE_PORT_UCHAR((U8*)0x3C4, 0x02); - //WRITE_PORT_UCHAR((U8*)0x3C5, Color); - WRITE_PORT_UCHAR((U8*)0x3C5, 0x0F); - //WRITE_PORT_USHORT((U16*)0x3C4, 0x0A02); - MemoryPointer[ByteOffset] = 0xFF; - - - /*CurrentColor = Color; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - WRITE_PORT_USHORT((U16*)0x3CE, 0x00 | (CurrentColor << 8)); - WRITE_PORT_USHORT((U16*)0x3CE, 0x08 | 0x8000 >> (X & 7)); - - MemoryPointer += (Y * VideoGetBytesPerScanLine()) + (X >> 3); - - *MemoryPointer = *MemoryPointer; - getch();*/ - - - // First select the color plane - //ColorPlane = Color; - //ColorPlane = (ColorPlane << 8) + 0x02; - //WRITE_PORT_USHORT((U16*)0x3C4, ColorPlane); - - // Now calculate the byte offset in the - // color plane that contains our pixel - // Since there are 8 pixels per byte we - // have to adjust accordingly - /*ByteOffset = (Y * VideoGetCurrentModeResolutionX()) + X; - BitInByte = ByteOffset % 8; - ByteOffset = ByteOffset / 8; - - // Shift the color to the right bit - Color = 1; - Color = Color << BitInByte; - - // Get the current color - CurrentColor = MemoryPointer[ByteOffset]; - - // Add the new color - CurrentColor = CurrentColor | Color; - - // Now set the color - MemoryPointer[ByteOffset] = CurrentColor;*/ -} - -VOID VideoSetPixel256(U32 X, U32 Y, U8 Color) -{ - U32 Bank; - U32 Offset; - U8* MemoryPointer; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - Bank = VideoGetMemoryBankForPixel(X, Y); - Offset = VideoGetBankOffsetForPixel(X, Y); - - VideoSetMemoryBank(Bank); - - MemoryPointer[Offset] = Color; -} - -VOID VideoSetPixelRGB_15Bit(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Bank; - U32 Offset; - U8* MemoryPointer; - U16 Pixel; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - Bank = VideoGetMemoryBankForPixel(X, Y); - Offset = VideoGetBankOffsetForPixel(X, Y); - - VideoSetMemoryBank(Bank); - - Red = Red >> 3; - Green = Green >> 3; - Blue = Blue >> 3; - - Pixel = Red << 11 | Green << 6 | Blue << 1; - - MemoryPointer[Offset] = Pixel & 0xFF; - MemoryPointer[Offset+1] = Pixel >> 8; -} - -VOID VideoSetPixelRGB_16Bit(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Bank; - U32 Offset; - U8* MemoryPointer; - U16 Pixel; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - Bank = VideoGetMemoryBankForPixel(X, Y); - Offset = VideoGetBankOffsetForPixel(X, Y); - - VideoSetMemoryBank(Bank); - - Red = Red >> 3; - Green = Green >> 2; - Blue = Blue >> 3; - - Pixel = (U16)Red << 11 | (U16)Green << 5 | (U16)Blue << 0; - - MemoryPointer[Offset] = Pixel & 0xFF; - MemoryPointer[Offset+1] = Pixel >> 8; -} - -VOID VideoSetPixelRGB_24Bit(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Bank; - U32 Offset; - U8* MemoryPointer; - - MemoryPointer = (U8*)(VIDEOVGA_MEM_ADDRESS); - - Bank = VideoGetMemoryBankForPixel(X, Y); - Offset = VideoGetBankOffsetForPixel(X, Y); - - VideoSetMemoryBank(Bank); - - MemoryPointer[Offset] = Blue; - MemoryPointer[Offset+1] = Green; - MemoryPointer[Offset+2] = Red; -} - -VOID VideoSetPixelRGB(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Width, Height, Depth; - - MachVideoGetDisplaySize(&Width, &Height, &Depth); - if (Depth >= 24) - { - VideoSetPixelRGB_24Bit(X, Y, Red, Green, Blue); - } - else if (Depth >= 16) - { - VideoSetPixelRGB_16Bit(X, Y, Red, Green, Blue); - } - else if (Depth == 15) - { - VideoSetPixelRGB_15Bit(X, Y, Red, Green, Blue); - } - else - { - BugCheck((DPRINT_UI, "This function does not support %d bits per pixel!", Depth)); - } -} - -VOID VideoSetPixel16_OffScreen(U32 X, U32 Y, U8 Color) -{ -} - -VOID VideoSetPixel256_OffScreen(U32 X, U32 Y, U8 Color) -{ - U8* MemoryPointer; - - MemoryPointer = (U8*)(VideoOffScreenBuffer + VideoGetOffScreenMemoryOffsetForPixel(X, Y)); - - *MemoryPointer = Color; -} - -VOID VideoSetPixelRGB_15Bit_OffScreen(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Offset; - U8* MemoryPointer; - U16 Pixel; - - MemoryPointer = (U8*)(VideoOffScreenBuffer); - Offset = VideoGetOffScreenMemoryOffsetForPixel(X, Y); - - Red = Red >> 3; - Green = Green >> 3; - Blue = Blue >> 3; - - Pixel = Red << 11 | Green << 6 | Blue << 1; - - MemoryPointer[Offset] = Pixel & 0xFF; - MemoryPointer[Offset+1] = Pixel >> 8; -} - -VOID VideoSetPixelRGB_16Bit_OffScreen(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Offset; - U8* MemoryPointer; - U16 Pixel; - - MemoryPointer = (U8*)(VideoOffScreenBuffer); - Offset = VideoGetOffScreenMemoryOffsetForPixel(X, Y); - - Red = Red >> 3; - Green = Green >> 2; - Blue = Blue >> 3; - - Pixel = (U16)Red << 11 | (U16)Green << 5 | (U16)Blue << 0; - - MemoryPointer[Offset] = Pixel & 0xFF; - MemoryPointer[Offset+1] = Pixel >> 8; -} - -VOID VideoSetPixelRGB_24Bit_OffScreen(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Offset; - U8* MemoryPointer; - - MemoryPointer = (U8*)(VideoOffScreenBuffer); - Offset = VideoGetOffScreenMemoryOffsetForPixel(X, Y); - - MemoryPointer[Offset] = Blue; - MemoryPointer[Offset+1] = Green; - MemoryPointer[Offset+2] = Red; -} - -VOID VideoSetPixelRGB_OffScreen(U32 X, U32 Y, U8 Red, U8 Green, U8 Blue) -{ - U32 Width, Height, Depth; - - MachVideoGetDisplaySize(&Width, &Height, &Depth); - if (Depth >= 24) - { - VideoSetPixelRGB_24Bit_OffScreen(X, Y, Red, Green, Blue); - } - else if (Depth >= 16) - { - VideoSetPixelRGB_16Bit_OffScreen(X, Y, Red, Green, Blue); - } - else if (Depth == 15) - { - VideoSetPixelRGB_15Bit_OffScreen(X, Y, Red, Green, Blue); - } - else - { - BugCheck((DPRINT_UI, "This function does not support %d bits per pixel!", Depth)); - } -} - -#endif Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/video.c (original) +++ trunk/reactos/boot/freeldr/freeldr/video/video.c Wed Oct 31 16:41:31 2007 @@ -37,3 +37,8 @@ return VideoOffScreenBuffer; } + +VOID VideoCopyOffScreenBufferToVRAM(VOID) +{ + MachVideoCopyOffScreenBufferToVRAM(VideoOffScreenBuffer); +}

16 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007