Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
15ee85de
Commit
15ee85de
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: Implement MsiGet/SetMode(MSIRUNMODE_REBOOTNOW).
parent
a6b3d770
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
install.c
dlls/msi/install.c
+6
-2
msipriv.h
dlls/msi/msipriv.h
+1
-0
automation.c
dlls/msi/tests/automation.c
+2
-2
No files found.
dlls/msi/install.c
View file @
15ee85de
...
...
@@ -764,6 +764,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
r
=
package
->
need_reboot_at_end
;
break
;
case
MSIRUNMODE_REBOOTNOW
:
r
=
package
->
need_reboot_now
;
break
;
case
MSIRUNMODE_LOGENABLED
:
r
=
(
package
->
log_file
!=
INVALID_HANDLE_VALUE
);
break
;
...
...
@@ -819,8 +823,8 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
break
;
case
MSIRUNMODE_REBOOTNOW
:
FIXME
(
"unimplemented run mode: %d
\n
"
,
iRunMode
);
r
=
ERROR_
FUNCTION_FAILED
;
package
->
need_reboot_now
=
(
fState
!=
0
);
r
=
ERROR_
SUCCESS
;
break
;
default:
...
...
dlls/msi/msipriv.h
View file @
15ee85de
...
...
@@ -407,6 +407,7 @@ typedef struct tagMSIPACKAGE
unsigned
char
commit_action_running
:
1
;
unsigned
char
rollback_action_running
:
1
;
unsigned
char
need_reboot_at_end
:
1
;
unsigned
char
need_reboot_now
:
1
;
unsigned
char
need_rollback
:
1
;
}
MSIPACKAGE
;
...
...
dlls/msi/tests/automation.c
View file @
15ee85de
...
...
@@ -1887,7 +1887,7 @@ static void test_Session(IDispatch *pSession)
ok
(
hr
==
S_OK
,
"Session_ModePut failed, hresult 0x%08x
\n
"
,
hr
);
hr
=
Session_ModePut
(
pSession
,
MSIRUNMODE_REBOOTNOW
,
TRUE
);
todo_wine
ok
(
hr
==
S_OK
,
"Session_ModePut failed, hresult 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Session_ModePut failed, hresult 0x%08x
\n
"
,
hr
);
if
(
hr
==
DISP_E_EXCEPTION
)
ok_exception
(
hr
,
szModeFlag
);
hr
=
Session_ModeGet
(
pSession
,
MSIRUNMODE_REBOOTNOW
,
&
bool
);
...
...
@@ -1895,7 +1895,7 @@ static void test_Session(IDispatch *pSession)
ok
(
bool
,
"Reboot now mode is %d, expected 1
\n
"
,
bool
);
hr
=
Session_ModePut
(
pSession
,
MSIRUNMODE_REBOOTNOW
,
FALSE
);
/* set it again so we don't reboot */
todo_wine
ok
(
hr
==
S_OK
,
"Session_ModePut failed, hresult 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Session_ModePut failed, hresult 0x%08x
\n
"
,
hr
);
if
(
hr
==
DISP_E_EXCEPTION
)
ok_exception
(
hr
,
szModeFlag
);
hr
=
Session_ModePut
(
pSession
,
MSIRUNMODE_MAINTENANCE
,
TRUE
);
...
...
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