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
89c80c41
Commit
89c80c41
authored
Apr 02, 2012
by
Hans Leidekker
Committed by
Alexandre Julliard
Apr 02, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Rename the need_reboot flag to need_reboot_at_end.
parent
4f60ddce
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
action.c
dlls/msi/action.c
+2
-2
files.c
dlls/msi/files.c
+1
-1
install.c
dlls/msi/install.c
+2
-2
media.c
dlls/msi/media.c
+1
-1
msipriv.h
dlls/msi/msipriv.h
+1
-1
No files found.
dlls/msi/action.c
View file @
89c80c41
...
...
@@ -6883,7 +6883,7 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package )
static
UINT
ACTION_ScheduleReboot
(
MSIPACKAGE
*
package
)
{
TRACE
(
"
\n
"
);
package
->
need_reboot
=
1
;
package
->
need_reboot
_at_end
=
1
;
return
ERROR_SUCCESS
;
}
...
...
@@ -7508,7 +7508,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
}
msi_free
(
reinstall
);
if
(
rc
==
ERROR_SUCCESS
&&
package
->
need_reboot
)
if
(
rc
==
ERROR_SUCCESS
&&
package
->
need_reboot
_at_end
)
return
ERROR_SUCCESS_REBOOT_REQUIRED
;
return
rc
;
...
...
dlls/msi/files.c
View file @
89c80c41
...
...
@@ -215,7 +215,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
MoveFileExW
(
tmpfileW
,
file
->
TargetPath
,
MOVEFILE_DELAY_UNTIL_REBOOT
))
{
file
->
state
=
msifs_installed
;
package
->
need_reboot
=
1
;
package
->
need_reboot
_at_end
=
1
;
gle
=
ERROR_SUCCESS
;
}
else
...
...
dlls/msi/install.c
View file @
89c80c41
...
...
@@ -761,7 +761,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
break
;
case
MSIRUNMODE_REBOOTATEND
:
r
=
package
->
need_reboot
;
r
=
package
->
need_reboot
_at_end
;
break
;
case
MSIRUNMODE_LOGENABLED
:
...
...
@@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
switch
(
iRunMode
)
{
case
MSIRUNMODE_REBOOTATEND
:
package
->
need_reboot
=
1
;
package
->
need_reboot
_at_end
=
1
;
r
=
ERROR_SUCCESS
;
break
;
...
...
dlls/msi/media.c
View file @
89c80c41
...
...
@@ -477,7 +477,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
MoveFileExW
(
path
,
NULL
,
MOVEFILE_DELAY_UNTIL_REBOOT
)
&&
MoveFileExW
(
tmpfileW
,
path
,
MOVEFILE_DELAY_UNTIL_REBOOT
))
{
data
->
package
->
need_reboot
=
1
;
data
->
package
->
need_reboot
_at_end
=
1
;
}
else
{
...
...
dlls/msi/msipriv.h
View file @
89c80c41
...
...
@@ -406,7 +406,7 @@ typedef struct tagMSIPACKAGE
unsigned
char
scheduled_action_running
:
1
;
unsigned
char
commit_action_running
:
1
;
unsigned
char
rollback_action_running
:
1
;
unsigned
char
need_reboot
:
1
;
unsigned
char
need_reboot
_at_end
:
1
;
unsigned
char
need_rollback
:
1
;
}
MSIPACKAGE
;
...
...
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