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
9b2b760e
Commit
9b2b760e
authored
Mar 22, 2012
by
Hans Leidekker
Committed by
Alexandre Julliard
Mar 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Get the UI level from the global variable instead of the property.
parent
673377a7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
action.c
dlls/msi/action.c
+1
-2
dialog.c
dlls/msi/dialog.c
+1
-2
media.c
dlls/msi/media.c
+2
-3
No files found.
dlls/msi/action.c
View file @
9b2b760e
...
...
@@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)
static
BOOL
needs_ui_sequence
(
MSIPACKAGE
*
package
)
{
INT
level
=
msi_get_property_int
(
package
->
db
,
szUILevel
,
0
);
return
(
level
&
INSTALLUILEVEL_MASK
)
>=
INSTALLUILEVEL_REDUCED
;
return
(
gUILevel
&
INSTALLUILEVEL_MASK
)
>=
INSTALLUILEVEL_REDUCED
;
}
UINT
msi_set_context
(
MSIPACKAGE
*
package
)
...
...
dlls/msi/dialog.c
View file @
9b2b760e
...
...
@@ -3978,8 +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
(
(
msi_get_property_int
(
package
->
db
,
szUILevel
,
0
)
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
)
return
ERROR_SUCCESS
;
if
((
gUILevel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
)
return
ERROR_SUCCESS
;
if
(
!
error_dialog
)
{
...
...
dlls/msi/media.c
View file @
9b2b760e
...
...
@@ -77,9 +77,8 @@ 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
((
msi_get_property_int
(
package
->
db
,
szUILevel
,
0
)
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
&&
!
gUIHandlerA
&&
!
gUIHandlerW
&&
!
gUIHandlerRecord
)
return
ERROR_SUCCESS
;
if
((
gUILevel
&
INSTALLUILEVEL_MASK
)
==
INSTALLUILEVEL_NONE
&&
!
gUIHandlerA
&&
!
gUIHandlerW
&&
!
gUIHandlerRecord
)
return
ERROR_SUCCESS
;
error
=
msi_build_error_string
(
package
,
1302
,
1
,
mi
->
disk_prompt
);
error_dialog
=
msi_dup_property
(
package
->
db
,
error_prop
);
...
...
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