[PATCH v2 1/1] appwiz.cpl: Allow installation of add-ons to be skipped.

[Owen Rudge]

From: Owen Rudge

---
 dlls/appwiz.cpl/addons.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index a5fdda3e81f..e324e46d2d6 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -77,6 +77,7 @@ typedef struct {
     const char *url_config_key;
     const char *dir_config_key;
     LPCWSTR dialog_template;
+    const char *env_var;
 } addon_info_t;

/* Download addon files over HTTP because Wine depends on an external library
@@ -90,7 +91,8 @@ static const addon_info_t addons_info[] = {
         GECKO_SHA,
         "http://source.winehq.org/winegecko.php",
         "MSHTML", "GeckoUrl", "GeckoCabDir",
-        MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG)
+        MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG),
+        "WINE_SKIP_GECKO_INSTALL"
     },
     {
         MONO_VERSION,
@@ -99,7 +101,8 @@ static const addon_info_t addons_info[] = {
         MONO_SHA,
         "http://source.winehq.org/winemono.php",
         "Dotnet", "MonoUrl", "MonoCabDir",
-        MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG)
+        MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG),
+        "WINE_SKIP_MONO_INSTALL"
     }
 };

@@ -752,6 +755,10 @@ BOOL install_addon(addon_t addon_type)

addon = addons_info+addon_type;

+    /* Don't install the add-on if the user has asked not to */
+    if (getenv(addon->env_var))
+        return FALSE;
+
     p_wine_get_dos_file_name = (void *)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "wine_get_dos_file_name");

/*