Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
ad7279a5
Commit
ad7279a5
authored
12 years ago
by
Esme Povirk
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
appwiz.cpl: Move dialog template id to addon_info_t.
parent
091a4269
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/appwiz.cpl/addons.c
+4
-2
4 additions, 2 deletions
dlls/appwiz.cpl/addons.c
dlls/appwiz.cpl/appwiz.rc
+1
-1
1 addition, 1 deletion
dlls/appwiz.cpl/appwiz.rc
dlls/appwiz.cpl/res.h
+1
-1
1 addition, 1 deletion
dlls/appwiz.cpl/res.h
with
6 additions
and
4 deletions
dlls/appwiz.cpl/addons.c
+
4
−
2
View file @
ad7279a5
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
dlls/appwiz.cpl/appwiz.rc
+
1
−
1
View file @
ad7279a5
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
dlls/appwiz.cpl/res.h
+
1
−
1
View file @
ad7279a5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment