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
331c86f1
Commit
331c86f1
authored
Jul 24, 2014
by
Piotr Caban
Committed by
Alexandre Julliard
Jul 24, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't publish features with non positive install level.
parent
1cfee7da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
action.c
dlls/msi/action.c
+2
-0
package.c
dlls/msi/tests/package.c
+7
-0
No files found.
dlls/msi/action.c
View file @
331c86f1
...
@@ -4892,6 +4892,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
...
@@ -4892,6 +4892,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
BOOL
absent
=
FALSE
;
BOOL
absent
=
FALSE
;
MSIRECORD
*
uirow
;
MSIRECORD
*
uirow
;
if
(
feature
->
Level
<=
0
)
continue
;
if
(
feature
->
Action
!=
INSTALLSTATE_LOCAL
&&
if
(
feature
->
Action
!=
INSTALLSTATE_LOCAL
&&
feature
->
Action
!=
INSTALLSTATE_SOURCE
&&
feature
->
Action
!=
INSTALLSTATE_SOURCE
&&
feature
->
Action
!=
INSTALLSTATE_ADVERTISED
)
absent
=
TRUE
;
feature
->
Action
!=
INSTALLSTATE_ADVERTISED
)
absent
=
TRUE
;
...
...
dlls/msi/tests/package.c
View file @
331c86f1
...
@@ -2689,6 +2689,7 @@ static void test_states(void)
...
@@ -2689,6 +2689,7 @@ static void test_states(void)
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'3'
,
'-'
,
'p'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'3'
,
'-'
,
'p'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
msifile4W
[]
=
static
const
WCHAR
msifile4W
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'4'
,
'-'
,
'p'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'4'
,
'-'
,
'p'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
INSTALLSTATE
state
;
MSIHANDLE
hpkg
;
MSIHANDLE
hpkg
;
UINT
r
;
UINT
r
;
MSIHANDLE
hdb
;
MSIHANDLE
hdb
;
...
@@ -3217,10 +3218,16 @@ static void test_states(void)
...
@@ -3217,10 +3218,16 @@ static void test_states(void)
r
=
MsiInstallProductA
(
msifile
,
"REMOVE=ALL"
);
r
=
MsiInstallProductA
(
msifile
,
"REMOVE=ALL"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
state
=
MsiQueryFeatureStateA
(
"{7262AC98-EEBD-4364-8CE3-D654F6A425B9}"
,
"five"
);
ok
(
state
==
INSTALLSTATE_UNKNOWN
,
"state = %d
\n
"
,
state
);
/* all features installed locally */
/* all features installed locally */
r
=
MsiInstallProductA
(
msifile2
,
"ADDLOCAL=ALL"
);
r
=
MsiInstallProductA
(
msifile2
,
"ADDLOCAL=ALL"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
state
=
MsiQueryFeatureStateA
(
"{7262AC98-EEBD-4364-8CE3-D654F6A425B9}"
,
"five"
);
ok
(
state
==
INSTALLSTATE_UNKNOWN
,
"state = %d
\n
"
,
state
);
r
=
MsiOpenDatabaseW
(
msifile2W
,
MSIDBOPEN_DIRECT
,
&
hdb
);
r
=
MsiOpenDatabaseW
(
msifile2W
,
MSIDBOPEN_DIRECT
,
&
hdb
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to open database: %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to open database: %d
\n
"
,
r
);
...
...
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