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
b64fabf3
Commit
b64fabf3
authored
Jun 03, 2013
by
Hans Leidekker
Committed by
Alexandre Julliard
Jun 03, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't defer custom actions in the UI sequence if they match the currently running script.
parent
df6c2a84
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
action.c
dlls/msi/action.c
+4
-6
custom.c
dlls/msi/custom.c
+2
-2
msipriv.h
dlls/msi/msipriv.h
+1
-1
No files found.
dlls/msi/action.c
View file @
b64fabf3
...
...
@@ -635,14 +635,12 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package)
/********************************************************
* ACTION helper functions and functions that perform the actions
*******************************************************/
static
BOOL
ACTION_HandleCustomAction
(
MSIPACKAGE
*
package
,
LPCWSTR
action
,
UINT
*
rc
,
UINT
script
,
BOOL
force
)
static
BOOL
ACTION_HandleCustomAction
(
MSIPACKAGE
*
package
,
LPCWSTR
action
,
UINT
*
rc
,
UINT
script
)
{
BOOL
ret
=
FALSE
;
UINT
arc
;
arc
=
ACTION_CustomAction
(
package
,
action
,
script
,
force
);
arc
=
ACTION_CustomAction
(
package
,
action
,
script
);
if
(
arc
!=
ERROR_CALL_NOT_IMPLEMENTED
)
{
*
rc
=
arc
;
...
...
@@ -7650,7 +7648,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script)
handled
=
ACTION_HandleStandardAction
(
package
,
action
,
&
rc
);
if
(
!
handled
)
handled
=
ACTION_HandleCustomAction
(
package
,
action
,
&
rc
,
script
,
TRUE
);
handled
=
ACTION_HandleCustomAction
(
package
,
action
,
&
rc
,
script
);
if
(
!
handled
)
{
...
...
@@ -7672,7 +7670,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip
handled
=
ACTION_HandleStandardAction
(
package
,
action
,
&
rc
);
if
(
!
handled
)
handled
=
ACTION_HandleCustomAction
(
package
,
action
,
&
rc
,
script
,
FALSE
);
handled
=
ACTION_HandleCustomAction
(
package
,
action
,
&
rc
,
script
);
if
(
!
handled
&&
ACTION_DialogBox
(
package
,
action
)
==
ERROR_SUCCESS
)
handled
=
TRUE
;
...
...
dlls/msi/custom.c
View file @
b64fabf3
...
...
@@ -1172,7 +1172,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT
return
ERROR_SUCCESS
;
}
UINT
ACTION_CustomAction
(
MSIPACKAGE
*
package
,
LPCWSTR
action
,
UINT
script
,
BOOL
execute
)
UINT
ACTION_CustomAction
(
MSIPACKAGE
*
package
,
LPCWSTR
action
,
UINT
script
)
{
static
const
WCHAR
query
[]
=
{
'S'
,
'E'
,
'L'
,
'E'
,
'C'
,
'T'
,
' '
,
'*'
,
' '
,
'F'
,
'R'
,
'O'
,
'M'
,
' '
,
...
...
@@ -1212,7 +1212,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL
if
(
type
&
msidbCustomActionTypeNoImpersonate
)
WARN
(
"msidbCustomActionTypeNoImpersonate not handled
\n
"
);
if
(
!
execute
||
!
action_type_matches_script
(
type
,
script
))
if
(
!
action_type_matches_script
(
type
,
script
))
{
rc
=
defer_custom_action
(
package
,
action
,
type
);
goto
end
;
...
...
dlls/msi/msipriv.h
View file @
b64fabf3
...
...
@@ -977,7 +977,7 @@ extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN;
extern
UINT
ACTION_PerformAction
(
MSIPACKAGE
*
package
,
const
WCHAR
*
action
,
UINT
script
)
DECLSPEC_HIDDEN
;
extern
UINT
ACTION_PerformUIAction
(
MSIPACKAGE
*
package
,
const
WCHAR
*
action
,
UINT
script
)
DECLSPEC_HIDDEN
;
extern
void
ACTION_FinishCustomActions
(
const
MSIPACKAGE
*
package
)
DECLSPEC_HIDDEN
;
extern
UINT
ACTION_CustomAction
(
MSIPACKAGE
*
package
,
const
WCHAR
*
action
,
UINT
script
,
BOOL
execute
)
DECLSPEC_HIDDEN
;
extern
UINT
ACTION_CustomAction
(
MSIPACKAGE
*
,
const
WCHAR
*
,
UINT
)
DECLSPEC_HIDDEN
;
/* actions in other modules */
extern
UINT
ACTION_AppSearch
(
MSIPACKAGE
*
package
)
DECLSPEC_HIDDEN
;
...
...
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