From: Jacek Caban Subject: [PATCH 2/2] appwiz.cpl: Include information about Gecko arch in download message. Message-Id: <52459343.8020209@codeweavers.com> Date: Fri, 27 Sep 2013 16:16:35 +0200 --- dlls/appwiz.cpl/addons.c | 2 ++ dlls/appwiz.cpl/appwiz.rc | 10 ++++++++-- dlls/appwiz.cpl/res.h | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 24d1300..a47460f 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,9 +57,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #ifdef __i386__ #define ARCH_STRING "x86" #define GECKO_SHA "b4923c0565e6cbd20075a0d4119ce3b48424f962" +#define IDS_GECKO_DWL IDS_GECKO32_DWL #elif defined(__x86_64__) #define ARCH_STRING "x86_64" #define GECKO_SHA "da65fb99a53d87c831030ec8787e31d797f60e60" +#define IDS_GECKO_DWL IDS_GECKO64_DWL #else #define ARCH_STRING "" #define GECKO_SHA "???" diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index e32a684..f1d2a88 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -48,8 +48,14 @@ STRINGTABLE IDS_DOWNLOADING "Downloading..." IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." - IDS_GECKO_DWL -"Wine could not find a Gecko package which is needed for applications embedding HTML \ + IDS_GECKO32_DWL +"Wine could not find a Gecko (32-bit) package which is needed for applications embedding HTML \ +to work correctly. Wine can automatically download and install it for you.\ +\ +Note: it is recommended to use your distribution's packages instead. \ +See http://wiki.winehq.org/Gecko for details." + IDS_GECKO64_DWL +"Wine could not find a Gecko (64-bit) package which is needed for applications embedding HTML \ to work correctly. Wine can automatically download and install it for you.\ \ Note: it is recommended to use your distribution's packages instead. \ diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index d0235b4..98e27d2 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -71,5 +71,6 @@ #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15 #define IDS_INVALID_SHA 16 -#define IDS_GECKO_DWL 17 -#define IDS_MONO_DWL 18 +#define IDS_GECKO32_DWL 17 +#define IDS_GECKO64_DWL 18 +#define IDS_MONO_DWL 19