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
5871ad6d
Commit
5871ad6d
authored
Nov 03, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
Nov 03, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Revert
3cd55cc9
.
It breaks the Office 2003 installer.
parent
ee7d8547
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
action.c
dlls/msi/action.c
+0
-4
package.c
dlls/msi/tests/package.c
+5
-5
No files found.
dlls/msi/action.c
View file @
5871ad6d
...
...
@@ -212,10 +212,6 @@ void msi_feature_set_state( MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTA
feature
->
ActionRequest
=
state
;
feature
->
Action
=
state
;
}
if
(
feature
->
Attributes
&
msidbFeatureAttributesUIDisallowAbsent
)
{
feature
->
Action
=
INSTALLSTATE_UNKNOWN
;
}
}
void
msi_component_set_state
(
MSIPACKAGE
*
package
,
MSICOMPONENT
*
comp
,
INSTALLSTATE
state
)
...
...
dlls/msi/tests/package.c
View file @
5871ad6d
...
...
@@ -5581,7 +5581,7 @@ static void test_states(void)
r
=
MsiGetFeatureState
(
hpkg
,
"eleven"
,
&
state
,
&
action
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
state
==
INSTALLSTATE_SOURCE
,
"Expected INSTALLSTATE_SOURCE, got %d
\n
"
,
state
);
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
todo_wine
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
state
=
0xdeadbee
;
action
=
0xdeadbee
;
...
...
@@ -6534,7 +6534,7 @@ static void test_states(void)
r
=
MsiGetFeatureState
(
hpkg
,
"eleven"
,
&
state
,
&
action
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
state
==
INSTALLSTATE_SOURCE
,
"Expected INSTALLSTATE_SOURCE, got %d
\n
"
,
state
);
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
todo_wine
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
state
=
0xdeadbee
;
action
=
0xdeadbee
;
...
...
@@ -7483,7 +7483,7 @@ static void test_states(void)
r
=
MsiGetFeatureState
(
hpkg
,
"eleven"
,
&
state
,
&
action
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
state
==
INSTALLSTATE_SOURCE
,
"Expected INSTALLSTATE_SOURCE, got %d
\n
"
,
state
);
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
todo_wine
ok
(
action
==
INSTALLSTATE_UNKNOWN
,
"Expected INSTALLSTATE_UNKNOWN, got %d
\n
"
,
action
);
state
=
0xdeadbee
;
action
=
0xdeadbee
;
...
...
@@ -9711,7 +9711,7 @@ static void test_featureparents(void)
r
=
MsiGetFeatureState
(
hpkg
,
"lyra"
,
&
state
,
&
action
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
state
==
INSTALLSTATE_ABSENT
,
"Expected INSTALLSTATE_ABSENT, got %d
\n
"
,
state
);
todo_wine
ok
(
action
==
INSTALLSTATE_LOCAL
,
"Expected INSTALLSTATE_LOCAL, got %d
\n
"
,
action
);
ok
(
action
==
INSTALLSTATE_LOCAL
,
"Expected INSTALLSTATE_LOCAL, got %d
\n
"
,
action
);
state
=
0xdeadbee
;
action
=
0xdeadbee
;
...
...
@@ -9839,7 +9839,7 @@ static void test_featureparents(void)
r
=
MsiGetFeatureState
(
hpkg
,
"lyra"
,
&
state
,
&
action
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
state
==
INSTALLSTATE_ABSENT
,
"Expected lyra INSTALLSTATE_ABSENT, got %d
\n
"
,
state
);
todo_wine
ok
(
action
==
INSTALLSTATE_ABSENT
,
"Expected lyra INSTALLSTATE_ABSENT, got %d
\n
"
,
action
);
ok
(
action
==
INSTALLSTATE_ABSENT
,
"Expected lyra INSTALLSTATE_ABSENT, got %d
\n
"
,
action
);
state
=
0xdeadbee
;
action
=
0xdeadbee
;
...
...
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