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
c2e91588
Commit
c2e91588
authored
May 29, 2007
by
James Hawkins
Committed by
Alexandre Julliard
May 30, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Perform a forced reboot if a custom action returns ERROR_INSTALL_SUSPEND.
parent
b8e0b3c1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
action.c
dlls/msi/action.c
+1
-1
custom.c
dlls/msi/custom.c
+5
-2
msipriv.h
dlls/msi/msipriv.h
+1
-0
No files found.
dlls/msi/action.c
View file @
c2e91588
...
...
@@ -3851,7 +3851,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
return
rc
;
}
static
UINT
ACTION_ForceReboot
(
MSIPACKAGE
*
package
)
UINT
ACTION_ForceReboot
(
MSIPACKAGE
*
package
)
{
static
const
WCHAR
RunOnce
[]
=
{
'S'
,
'o'
,
'f'
,
't'
,
'w'
,
'a'
,
'r'
,
'e'
,
'\\'
,
...
...
dlls/msi/custom.c
View file @
c2e91588
...
...
@@ -389,7 +389,7 @@ static UINT custom_get_process_return( HANDLE process )
return
ERROR_SUCCESS
;
}
static
UINT
custom_get_thread_return
(
HANDLE
thread
)
static
UINT
custom_get_thread_return
(
MSIPACKAGE
*
package
,
HANDLE
thread
)
{
DWORD
rc
=
0
;
...
...
@@ -404,6 +404,9 @@ static UINT custom_get_thread_return( HANDLE thread )
return
rc
;
case
ERROR_NO_MORE_ITEMS
:
return
ERROR_SUCCESS
;
case
ERROR_INSTALL_SUSPEND
:
ACTION_ForceReboot
(
package
);
return
ERROR_SUCCESS
;
default:
ERR
(
"Invalid Return Code %d
\n
"
,
rc
);
return
ERROR_INSTALL_FAILURE
;
...
...
@@ -475,7 +478,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info )
msi_dialog_check_messages
(
info
->
handle
);
if
(
!
(
info
->
type
&
msidbCustomActionTypeContinue
))
rc
=
custom_get_thread_return
(
info
->
handle
);
rc
=
custom_get_thread_return
(
info
->
package
,
info
->
handle
);
free_custom_action_data
(
info
);
}
...
...
dlls/msi/msipriv.h
View file @
c2e91588
...
...
@@ -580,6 +580,7 @@ extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg );
extern
UINT
MSI_InstallPackage
(
MSIPACKAGE
*
,
LPCWSTR
,
LPCWSTR
);
extern
void
ACTION_free_package_structures
(
MSIPACKAGE
*
);
extern
UINT
ACTION_DialogBox
(
MSIPACKAGE
*
,
LPCWSTR
);
extern
UINT
ACTION_ForceReboot
(
MSIPACKAGE
*
package
);
extern
UINT
MSI_Sequence
(
MSIPACKAGE
*
package
,
LPCWSTR
szTable
,
INT
iSequenceMode
);
extern
UINT
MSI_SetFeatureStates
(
MSIPACKAGE
*
package
);
...
...
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