- rename apps.xml to downloader.xml

- look first for the xml file in system32 then in current dir.

svn path=/trunk/; revision=25262
This commit is contained in:
Maarten Bosma 2007-01-01 14:29:26 +00:00
parent 3aa0dd271b
commit 4e8d28cf9f
4 changed files with 10 additions and 4 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <!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"> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe">
<include base="downloader">.</include> <include base="downloader">.</include>
<include base="expat">.</include> <include base="expat">.</include>

View file

@ -13,6 +13,8 @@
#include "resources.h" #include "resources.h"
#include "structures.h" #include "structures.h"
#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml"
HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton;
HBITMAP hLogo, hUnderline; HBITMAP hLogo, hUnderline;
WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionHeadline = L"";
@ -97,7 +99,7 @@ BOOL SetupControls (HWND hwnd)
HINSTANCE hInstance = GetModuleHandle(NULL); HINSTANCE hInstance = GetModuleHandle(NULL);
// Parse the XML file // Parse the XML file
if (ProcessXML ("apps.xml", &Root) == FALSE) if (ProcessXML (XML_PATH, &Root) == FALSE)
return FALSE; return FALSE;
// Set up the controls // Set up the controls

View file

@ -156,10 +156,14 @@ BOOL ProcessXML (const char* filename, struct Category* Root)
FILE* file = fopen(filename, "r"); FILE* file = fopen(filename, "r");
if(!file) if(!file)
{
file = fopen("downloader.xml", "r");
if(!file)
{ {
MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0);
return FALSE; return FALSE;
} }
}
XML_Parser parser = XML_ParserCreate(NULL); XML_Parser parser = XML_ParserCreate(NULL);
XML_SetElementHandler(parser, tag_opened, tag_closed); XML_SetElementHandler(parser, tag_opened, tag_closed);