From 32bfd4a46fbd476db5bc4dd19e74581456c452a8 Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Mon, 25 Dec 2006 19:25:27 +0000 Subject: [PATCH] Error if download failed. svn path=/trunk/; revision=25230 --- reactos/base/applications/downloader/download.c | 8 +++++++- reactos/base/applications/downloader/resources.h | 3 ++- reactos/base/applications/downloader/resources/de.rc | 1 + reactos/base/applications/downloader/resources/en.rc | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/reactos/base/applications/downloader/download.c b/reactos/base/applications/downloader/download.c index d2f0f682b2e..3ee01ad5575 100644 --- a/reactos/base/applications/downloader/download.c +++ b/reactos/base/applications/downloader/download.c @@ -40,6 +40,7 @@ #include extern struct Application* SelectedApplication; +extern WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; typedef struct _IBindStatusCallbackImpl { @@ -250,7 +251,12 @@ ThreadFunc(LPVOID Context) { IBindStatusCallback_Release(dl); } - if (S_OK != r || bCancelled ) + if (S_OK != r) + { + MessageBoxW(0,Strings[IDS_DOWNLOAD_ERROR],0,0); + goto end; + } + else if (bCancelled) { goto end; } diff --git a/reactos/base/applications/downloader/resources.h b/reactos/base/applications/downloader/resources.h index a386a54946c..e06ded18a17 100644 --- a/reactos/base/applications/downloader/resources.h +++ b/reactos/base/applications/downloader/resources.h @@ -35,6 +35,7 @@ #define IDS_CHOOSE_BOTH 13 #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 +#define IDS_DOWNLOAD_ERROR 16 -#define STRING_COUNT 15 +#define STRING_COUNT 17 #define MAX_STRING_LENGHT 0x100 diff --git a/reactos/base/applications/downloader/resources/de.rc b/reactos/base/applications/downloader/resources/de.rc index 2eb9c3ed795..04dffbaaca5 100644 --- a/reactos/base/applications/downloader/resources/de.rc +++ b/reactos/base/applications/downloader/resources/de.rc @@ -28,4 +28,5 @@ BEGIN IDS_CHOOSE_BOTH "Bitte wählen Sie eine Unterkategorie oder eine Anwendung." IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" + IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." END diff --git a/reactos/base/applications/downloader/resources/en.rc b/reactos/base/applications/downloader/resources/en.rc index 56d05d78294..4ba26f87e54 100644 --- a/reactos/base/applications/downloader/resources/en.rc +++ b/reactos/base/applications/downloader/resources/en.rc @@ -28,4 +28,5 @@ BEGIN IDS_CHOOSE_BOTH "Please choose a subcategory or an application." IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" + IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." END