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
af56e28f
Commit
af56e28f
authored
Jun 18, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Jun 18, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't publish features to an invalid location.
parent
d8e4258d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
14 deletions
+1
-14
action.c
dlls/msi/action.c
+0
-7
install.c
dlls/msi/tests/install.c
+1
-7
No files found.
dlls/msi/action.c
View file @
af56e28f
...
...
@@ -3733,17 +3733,12 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
{
MSIFEATURE
*
feature
;
UINT
rc
;
HKEY
hkey
=
0
;
HKEY
hukey
=
0
;
HKEY
userdata
=
0
;
if
(
!
msi_check_publish
(
package
))
return
ERROR_SUCCESS
;
rc
=
MSIREG_OpenFeaturesKey
(
package
->
ProductCode
,
&
hkey
,
TRUE
);
if
(
rc
!=
ERROR_SUCCESS
)
goto
end
;
rc
=
MSIREG_OpenUserFeaturesKey
(
package
->
ProductCode
,
&
hukey
,
TRUE
);
if
(
rc
!=
ERROR_SUCCESS
)
goto
end
;
...
...
@@ -3801,7 +3796,6 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
strcatW
(
data
,
feature
->
Feature_Parent
);
}
msi_reg_set_val_str
(
hkey
,
feature
->
Feature
,
data
);
msi_reg_set_val_str
(
userdata
,
feature
->
Feature
,
data
);
msi_free
(
data
);
...
...
@@ -3837,7 +3831,6 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
}
end:
RegCloseKey
(
hkey
);
RegCloseKey
(
hukey
);
return
rc
;
}
...
...
dlls/msi/tests/install.c
View file @
af56e28f
...
...
@@ -2522,13 +2522,7 @@ static void test_publish_publishfeatures(void)
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
res
=
RegOpenKeyA
(
HKEY_LOCAL_MACHINE
,
featkey
,
&
hkey
);
todo_wine
{
ok
(
res
==
ERROR_FILE_NOT_FOUND
,
"Expected ERROR_FILE_NOT_FOUND, got %d
\n
"
,
res
);
}
if
(
res
==
ERROR_SUCCESS
)
RegCloseKey
(
hkey
);
ok
(
res
==
ERROR_FILE_NOT_FOUND
,
"Expected ERROR_FILE_NOT_FOUND, got %d
\n
"
,
res
);
res
=
RegOpenKeyA
(
HKEY_CURRENT_USER
,
cupath
,
&
hkey
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
...
...
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