From 4e8d28cf9f42a1bc938bc757fb7f1e7dbde3b177 Mon Sep 17 00:00:00 2001
From: Maarten Bosma <maarten@bosma.de>
Date: Mon, 1 Jan 2007 14:29:26 +0000
Subject: [PATCH] - rename apps.xml to downloader.xml - look first for the xml
 file in system32 then in current dir.

svn path=/trunk/; revision=25262
---
 reactos/base/applications/downloader/downloader.rbuild    | 2 +-
 .../applications/downloader/{apps.xml => downloader.xml}  | 0
 reactos/base/applications/downloader/main.c               | 4 +++-
 reactos/base/applications/downloader/xml.c                | 8 ++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)
 rename reactos/base/applications/downloader/{apps.xml => downloader.xml} (100%)

diff --git a/reactos/base/applications/downloader/downloader.rbuild b/reactos/base/applications/downloader/downloader.rbuild
index c3d2ab3786a..7d266c01aad 100644
--- a/reactos/base/applications/downloader/downloader.rbuild
+++ b/reactos/base/applications/downloader/downloader.rbuild
@@ -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>
diff --git a/reactos/base/applications/downloader/apps.xml b/reactos/base/applications/downloader/downloader.xml
similarity index 100%
rename from reactos/base/applications/downloader/apps.xml
rename to reactos/base/applications/downloader/downloader.xml
diff --git a/reactos/base/applications/downloader/main.c b/reactos/base/applications/downloader/main.c
index 58d4dafaefa..6c2d1114697 100644
--- a/reactos/base/applications/downloader/main.c
+++ b/reactos/base/applications/downloader/main.c
@@ -13,6 +13,8 @@
 #include "resources.h"
 #include "structures.h"
 
+#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml"
+
 HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton;
 HBITMAP hLogo, hUnderline;
 WCHAR* DescriptionHeadline = L"";
@@ -97,7 +99,7 @@ BOOL SetupControls (HWND hwnd)
 	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
diff --git a/reactos/base/applications/downloader/xml.c b/reactos/base/applications/downloader/xml.c
index d7ff30f2a32..e68b1132c9f 100644
--- a/reactos/base/applications/downloader/xml.c
+++ b/reactos/base/applications/downloader/xml.c
@@ -157,8 +157,12 @@ BOOL ProcessXML (const char* filename, struct Category* Root)
 	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);