[mbosma] 25262: - rename apps.xml to downloader.xml - look first for the xml file in system32 then in current dir.
Author: mbosma Date: Mon Jan 1 17:29:26 2007 New Revision: 25262
URL: http://svn.reactos.org/svn/reactos?rev=25262&view=rev Log: - rename apps.xml to downloader.xml - look first for the xml file in system32 then in current dir.
Added: trunk/reactos/base/applications/downloader/downloader.xml - copied unchanged from r25234, trunk/reactos/base/applications/downloader/apps.xml Removed: trunk/reactos/base/applications/downloader/apps.xml Modified: trunk/reactos/base/applications/downloader/downloader.rbuild trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/xml.c
Removed: trunk/reactos/base/applications/downloader/apps.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/downloade... ============================================================================== --- trunk/reactos/base/applications/downloader/apps.xml (original) +++ trunk/reactos/base/applications/downloader/apps.xml (removed) @@ -1,78 +1,0 @@ -<tree Version="1"> <!-- Application version this tree is made for --> - <category name="Internet & Network" icon="1"> - <application name="Firefox"> - <description>The most popular free webbrowser out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win3...</location> - </application> - <application name="Thunderbird"> - <description>The most popular free Mail Client out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest/...</location> - </application> - <application name="SeaMonkey"> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/sea...</location> - </application> - <application name="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactOS...</location> - </application> - <application name="Putty"> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> - </application> - </category> - <category name="Office" icon="2"> - <application name="Abiword"> - <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.e...</location> - </application> - <application name="OpenOffice"> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_Wi...</location> - </application> - </category> - <category name="Graphics" icon="3"> - <application name="IrfanView"> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> - </application> - <application name="IrfanView Plugins"> - <description>Additional Plugins for supporting more File types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> - </application> - <application name="TuxPaint"> - <description>An open source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-ins...</location> - </application> - </category> - <category name="Multimedia" icon="4"> - </category> - <category name="Development" icon="5"> - <application name="ReactOS Build Envirement"> - <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location> - </application> - </category> - <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> - </application> - </category> - <category name="Tools" icon="7"> - <application name="7-Zip"> - <description>Utility to create and open zip, tar, rar and other archive files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> - </application> - <application name="uTorrent"> - <description>Small and fast Torrent Client.</description> - <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> - </application> - <application name="Audio Grabber"> - <description>A very good CD Ripper/File Converter.</description> - <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> - </application> - </category> - <category name="Others" icon="8"> - </category> -</tree>
Modified: trunk/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/downloade... ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rbuild (original) +++ trunk/reactos/base/applications/downloader/downloader.rbuild Mon Jan 1 17:29:26 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<installfile base="system32">apps.xml</installfile> +<installfile base="system32">downloader.xml</installfile> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> <include base="downloader">.</include> <include base="expat">.</include>
Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/downloade... ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Mon Jan 1 17:29:26 2007 @@ -12,6 +12,8 @@ #include <stdio.h> #include "resources.h" #include "structures.h" + +#define XML_PATH "C:\ReactOS\system32\downloader.xml"
HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; @@ -97,7 +99,7 @@ HINSTANCE hInstance = GetModuleHandle(NULL);
// Parse the XML file - if (ProcessXML ("apps.xml", &Root) == FALSE) + if (ProcessXML (XML_PATH, &Root) == FALSE) return FALSE;
// Set up the controls
Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/downloade... ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Mon Jan 1 17:29:26 2007 @@ -157,8 +157,12 @@ FILE* file = fopen(filename, "r"); if(!file) { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return FALSE; + file = fopen("downloader.xml", "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); + return FALSE; + } }
XML_Parser parser = XML_ParserCreate(NULL);
-
mbosma＠svn.reactos.org