Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
dd205230
Commit
dd205230
authored
Apr 05, 2012
by
Hans Leidekker
Committed by
Alexandre Julliard
Apr 05, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Keep the UI level fixed during the lifetime of a package.
parent
79aac9fa
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
6 deletions
+8
-6
action.c
dlls/msi/action.c
+2
-2
custom.c
dlls/msi/custom.c
+2
-2
dialog.c
dlls/msi/dialog.c
+1
-1
media.c
dlls/msi/media.c
+1
-1
msipriv.h
dlls/msi/msipriv.h
+1
-0
package.c
dlls/msi/package.c
+1
-0
No files found.
dlls/msi/action.c
View file @
dd205230
...
...
@@ -480,7 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)
static
BOOL
needs_ui_sequence
(
MSIPACKAGE
*
package
)
{
return
(
gUIL
evel
&
INSTALLUILEVEL_MASK
)
>=
INSTALLUILEVEL_REDUCED
;
return
(
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
>=
INSTALLUILEVEL_REDUCED
;
}
UINT
msi_set_context
(
MSIPACKAGE
*
package
)
...
...
@@ -2954,7 +2954,7 @@ static UINT ITERATE_LaunchConditions(MSIRECORD *row, LPVOID param)
r
=
MSI_EvaluateConditionW
(
package
,
cond
);
if
(
r
==
MSICONDITION_FALSE
)
{
if
((
gUIL
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
if
((
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
{
LPWSTR
deformated
;
message
=
MSI_RecordGetString
(
row
,
2
);
...
...
dlls/msi/custom.c
View file @
dd205230
...
...
@@ -903,11 +903,11 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source,
if
(
row
)
{
LPCWSTR
error
=
MSI_RecordGetString
(
row
,
1
);
if
((
gUIL
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
if
((
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
MessageBoxW
(
NULL
,
error
,
NULL
,
MB_OK
);
msiobj_release
(
&
row
->
hdr
);
}
else
if
((
gUIL
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
else
if
((
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
!=
INSTALLUILEVEL_NONE
)
MessageBoxW
(
NULL
,
deformated
,
NULL
,
MB_OK
);
msi_free
(
deformated
);
...
...
dlls/msi/dialog.c
View file @
dd205230
...
...
@@ -3978,7 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er
'M'
,
'S'
,
'I'
,
'E'
,
'r'
,
'r'
,
'o'
,
'r'
,
'D'
,
'i'
,
'a'
,
'l'
,
'o'
,
'g'
,
'R'
,
'e'
,
's'
,
'u'
,
'l'
,
't'
,
0
};
if
((
gUIL
evel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
)
return
ERROR_SUCCESS
;
if
((
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
)
return
ERROR_SUCCESS
;
if
(
!
error_dialog
)
{
...
...
dlls/msi/media.c
View file @
dd205230
...
...
@@ -77,7 +77,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)
static
const
WCHAR
error_prop
[]
=
{
'E'
,
'r'
,
'r'
,
'o'
,
'r'
,
'D'
,
'i'
,
'a'
,
'l'
,
'o'
,
'g'
,
0
};
if
((
gUIL
evel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
&&
if
((
package
->
ui_l
evel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
&&
!
gUIHandlerA
&&
!
gUIHandlerW
&&
!
gUIHandlerRecord
)
return
ERROR_SUCCESS
;
error
=
msi_build_error_string
(
package
,
1302
,
1
,
mi
->
disk_prompt
);
...
...
dlls/msi/msipriv.h
View file @
dd205230
...
...
@@ -389,6 +389,7 @@ typedef struct tagMSIPACKAGE
LPWSTR
localfile
;
BOOL
delete_on_close
;
INSTALLUILEVEL
ui_level
;
UINT
CurrentInstallState
;
msi_dialog
*
dialog
;
LPWSTR
next_dialog
;
...
...
dlls/msi/package.c
View file @
dd205230
...
...
@@ -1180,6 +1180,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url )
set_installed_prop
(
package
);
set_installer_properties
(
package
);
package
->
ui_level
=
gUILevel
;
sprintfW
(
uilevel
,
fmtW
,
gUILevel
&
INSTALLUILEVEL_MASK
);
msi_set_property
(
package
->
db
,
szUILevel
,
uilevel
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment