ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appwiz.cpl: Move dialog template id to addon_info_t.

This commit is contained in:
Vincent Povirk 2012-05-17 09:19:10 -05:00 committed by Alexandre Julliard
parent 091a4269ef
commit ad7279a5a6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/appwiz.cpl/addons.c
View File

@ -72,6 +72,7 @@ typedef struct {
const char *config_key; const char *config_key;
const char *url_config_key; const char *url_config_key;
const char *dir_config_key; const char *dir_config_key;
LPCWSTR dialog_template;
} addon_info_t; } addon_info_t;
static const addon_info_t addons_info[] = { 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", "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi",
"gecko", "gecko",
GECKO_SHA, 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() if(!install_from_registered_dir()
&& !install_from_default_dir() && !install_from_default_dir()
&& (url = get_url())) && (url = get_url()))
DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); DialogBoxW(hInst, addon->dialog_template, 0, installer_proc);
heap_free(url); heap_free(url);
url = NULL; url = NULL;

2
dlls/appwiz.cpl/appwiz.rc
View File

@ -92,7 +92,7 @@ FONT 8, "MS Shell Dlg"
CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 100, 105, 150, 8 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 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Wine Gecko Installer" CAPTION "Wine Gecko Installer"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"

2
dlls/appwiz.cpl/res.h
View File

@ -45,7 +45,7 @@
#define IDC_INFO_COMMENTS 1107 #define IDC_INFO_COMMENTS 1107
#define IDC_INFO_LABEL 1108 #define IDC_INFO_LABEL 1108
#define ID_DWL_DIALOG 1200 #define ID_DWL_GECKO_DIALOG 1200
#define ID_DWL_PROGRESS 1201 #define ID_DWL_PROGRESS 1201
#define ID_DWL_INSTALL 1202 #define ID_DWL_INSTALL 1202
#define ID_DWL_STATUS 1203 #define ID_DWL_STATUS 1203