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
5caebb26
Commit
5caebb26
authored
Apr 16, 2019
by
Hans Leidekker
Committed by
Alexandre Julliard
Apr 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Get rid of a redundant get_registry_view call.
Signed-off-by:
Hans Leidekker
<
hans@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
70732e27
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
action.c
dlls/msi/action.c
+3
-5
No files found.
dlls/msi/action.c
View file @
5caebb26
...
@@ -2922,7 +2922,7 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
...
@@ -2922,7 +2922,7 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
HKEY
key
;
HKEY
key
;
LONG
res
;
LONG
res
;
key
=
open_key
(
comp
,
root
,
path
,
FALSE
,
get_registry_view
(
comp
)
|
KEY_READ
);
key
=
open_key
(
comp
,
root
,
path
,
FALSE
,
KEY_READ
);
if
(
!
key
)
return
0
;
if
(
!
key
)
return
0
;
res
=
RegQueryInfoKeyW
(
key
,
0
,
0
,
0
,
&
subkeys
,
0
,
0
,
&
values
,
0
,
0
,
0
,
0
);
res
=
RegQueryInfoKeyW
(
key
,
0
,
0
,
0
,
&
subkeys
,
0
,
0
,
&
values
,
0
,
0
,
0
,
0
);
...
@@ -2934,12 +2934,10 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
...
@@ -2934,12 +2934,10 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path)
static
void
delete_key
(
const
MSICOMPONENT
*
comp
,
HKEY
root
,
const
WCHAR
*
path
)
static
void
delete_key
(
const
MSICOMPONENT
*
comp
,
HKEY
root
,
const
WCHAR
*
path
)
{
{
LONG
res
=
ERROR_SUCCESS
;
LONG
res
=
ERROR_SUCCESS
;
REGSAM
access
=
0
;
REGSAM
access
=
get_registry_view
(
comp
)
;
WCHAR
*
subkey
,
*
p
;
WCHAR
*
subkey
,
*
p
;
HKEY
hkey
;
HKEY
hkey
;
access
|=
get_registry_view
(
comp
);
if
(
!
(
subkey
=
strdupW
(
path
)))
return
;
if
(
!
(
subkey
=
strdupW
(
path
)))
return
;
do
do
{
{
...
@@ -2947,7 +2945,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
...
@@ -2947,7 +2945,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
{
{
*
p
=
0
;
*
p
=
0
;
if
(
!
p
[
1
])
continue
;
/* trailing backslash */
if
(
!
p
[
1
])
continue
;
/* trailing backslash */
hkey
=
open_key
(
comp
,
root
,
subkey
,
FALSE
,
access
|
READ_CONTROL
);
hkey
=
open_key
(
comp
,
root
,
subkey
,
FALSE
,
READ_CONTROL
);
if
(
!
hkey
)
break
;
if
(
!
hkey
)
break
;
if
(
!
is_key_empty
(
comp
,
hkey
,
p
+
1
))
if
(
!
is_key_empty
(
comp
,
hkey
,
p
+
1
))
{
{
...
...
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