appwiz.cpl: Move dialog template id to addon_info_t.
Vincent Povirk
madewokherd at gmail.com
Thu May 17 09:22:56 CDT 2012
-------------- next part --------------
From 31a42b0ef24eee3ca47e7edf3389baecbeaf4df6 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent at codeweavers.com>
Date: Thu, 17 May 2012 09:19:10 -0500
Subject: [PATCH] appwiz.cpl: Move dialog template id to addon_info_t.
---
dlls/appwiz.cpl/addons.c | 6 ++++--
dlls/appwiz.cpl/appwiz.rc | 2 +-
dlls/appwiz.cpl/res.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index 1cff5c4..ab70ed1 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -72,6 +72,7 @@ typedef struct {
const char *config_key;
const char *url_config_key;
const char *dir_config_key;
+ LPCWSTR dialog_template;
} addon_info_t;
static const addon_info_t addons_info[] = {
@@ -80,7 +81,8 @@ static const addon_info_t addons_info[] = {
"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi",
"gecko",
GECKO_SHA,
- "MSHTML", "GeckoUrl", "GeckoCabDir"
+ "MSHTML", "GeckoUrl", "GeckoCabDir",
+ MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG)
}
};
@@ -571,7 +573,7 @@ BOOL install_addon(addon_t addon_type)
if(!install_from_registered_dir()
&& !install_from_default_dir()
&& (url = get_url()))
- DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc);
+ DialogBoxW(hInst, addon->dialog_template, 0, installer_proc);
heap_free(url);
url = NULL;
diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc
index 8107212..af41d6a 100644
--- a/dlls/appwiz.cpl/appwiz.rc
+++ b/dlls/appwiz.cpl/appwiz.rc
@@ -92,7 +92,7 @@ FONT 8, "MS Shell Dlg"
CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 100, 105, 150, 8
}
-ID_DWL_DIALOG DIALOG 0, 0, 260, 95
+ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Wine Gecko Installer"
FONT 8, "MS Shell Dlg"
diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h
index 7dfbf1f..96cd62d 100644
--- a/dlls/appwiz.cpl/res.h
+++ b/dlls/appwiz.cpl/res.h
@@ -45,7 +45,7 @@
#define IDC_INFO_COMMENTS 1107
#define IDC_INFO_LABEL 1108
-#define ID_DWL_DIALOG 1200
+#define ID_DWL_GECKO_DIALOG 1200
#define ID_DWL_PROGRESS 1201
#define ID_DWL_INSTALL 1202
#define ID_DWL_STATUS 1203
--
1.7.9.5
More information about the wine-patches
mailing list