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
7c9873e4
Commit
7c9873e4
authored
Aug 21, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Aug 21, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Fix the logic to determine the appropriate action of the component.
parent
f909e1c0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
20 deletions
+46
-20
msipriv.h
dlls/msi/msipriv.h
+34
-2
format.c
dlls/msi/tests/format.c
+4
-1
install.c
dlls/msi/tests/install.c
+8
-17
package.c
dlls/msi/tests/package.c
+0
-0
No files found.
dlls/msi/msipriv.h
View file @
7c9873e4
...
...
@@ -861,8 +861,40 @@ static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE stat
static
inline
void
msi_component_set_state
(
MSICOMPONENT
*
comp
,
INSTALLSTATE
state
)
{
comp
->
ActionRequest
=
state
;
comp
->
Action
=
state
;
if
(
state
==
INSTALLSTATE_ABSENT
)
{
switch
(
comp
->
Installed
)
{
case
INSTALLSTATE_LOCAL
:
case
INSTALLSTATE_SOURCE
:
case
INSTALLSTATE_DEFAULT
:
comp
->
ActionRequest
=
state
;
comp
->
Action
=
state
;
break
;
default:
comp
->
ActionRequest
=
INSTALLSTATE_UNKNOWN
;
comp
->
Action
=
INSTALLSTATE_UNKNOWN
;
}
}
else
if
(
state
==
INSTALLSTATE_SOURCE
)
{
switch
(
comp
->
Installed
)
{
case
INSTALLSTATE_ABSENT
:
case
INSTALLSTATE_SOURCE
:
comp
->
ActionRequest
=
state
;
comp
->
Action
=
state
;
break
;
default:
comp
->
ActionRequest
=
INSTALLSTATE_UNKNOWN
;
comp
->
Action
=
INSTALLSTATE_UNKNOWN
;
}
}
else
{
comp
->
ActionRequest
=
state
;
comp
->
Action
=
state
;
}
}
/* actions in other modules */
...
...
dlls/msi/tests/format.c
View file @
7c9873e4
...
...
@@ -2417,7 +2417,10 @@ static void test_formatrecord_tables(void)
MsiRecordSetString
(
hrec
,
1
,
"[$parietal]"
);
r
=
MsiFormatRecord
(
hpkg
,
hrec
,
buf
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"format record failed: %d
\n
"
,
r
);
ok
(
!
lstrcmp
(
buf
,
expected
),
"Expected '%s', got %s
\n
"
,
expected
,
buf
);
todo_wine
{
ok
(
!
lstrcmp
(
buf
,
expected
),
"Expected '%s', got %s
\n
"
,
expected
,
buf
);
}
sprintf
(
buf
,
"%sI am a really long directory
\\
temporal.txt"
,
root
);
DeleteFile
(
buf
);
...
...
dlls/msi/tests/install.c
View file @
7c9873e4
...
...
@@ -3274,10 +3274,7 @@ static void test_publish(void)
r
=
MsiInstallProductA
(
msifile
,
"FULL=1 REMOVE=ALL"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
todo_wine
{
ok
(
pf_exists
(
"msitest
\\
maximus"
),
"File deleted
\n
"
);
}
ok
(
pf_exists
(
"msitest
\\
maximus"
),
"File deleted
\n
"
);
ok
(
pf_exists
(
"msitest"
),
"File deleted
\n
"
);
state
=
MsiQueryProductState
(
"{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"
);
...
...
@@ -4248,10 +4245,7 @@ static void test_removefiles(void)
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
!
pf_exists
(
"msitest
\\
hydrogen"
),
"File not deleted
\n
"
);
ok
(
!
pf_exists
(
"msitest
\\
helium"
),
"File not deleted
\n
"
);
todo_wine
{
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
}
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File deleted
\n
"
);
create_pf
(
"msitest"
,
FALSE
);
...
...
@@ -4270,10 +4264,7 @@ static void test_removefiles(void)
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
!
pf_exists
(
"msitest
\\
hydrogen"
),
"File not deleted
\n
"
);
ok
(
delete_pf
(
"msitest
\\
helium"
,
TRUE
),
"File deleted
\n
"
);
todo_wine
{
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
}
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File deleted
\n
"
);
create_pf
(
"msitest"
,
FALSE
);
...
...
@@ -4317,10 +4308,7 @@ static void test_removefiles(void)
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
!
delete_pf
(
"msitest
\\
hydrogen"
,
TRUE
),
"File not deleted
\n
"
);
ok
(
!
delete_pf
(
"msitest
\\
helium"
,
TRUE
),
"File not deleted
\n
"
);
todo_wine
{
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
}
ok
(
delete_pf
(
"msitest
\\
lithium"
,
TRUE
),
"File deleted
\n
"
);
ok
(
delete_pf
(
"msitest
\\
furlong"
,
TRUE
),
"File deleted
\n
"
);
ok
(
delete_pf
(
"msitest
\\
firkin"
,
TRUE
),
"File deleted
\n
"
);
ok
(
delete_pf
(
"msitest
\\
fortnight"
,
TRUE
),
"File deleted
\n
"
);
...
...
@@ -4329,7 +4317,10 @@ static void test_removefiles(void)
ok
(
delete_pf
(
"msitest
\\
attoparsec"
,
TRUE
),
"File deleted
\n
"
);
ok
(
!
delete_pf
(
"msitest
\\
storeys"
,
TRUE
),
"File not deleted
\n
"
);
ok
(
!
delete_pf
(
"msitest
\\
block"
,
TRUE
),
"File not deleted
\n
"
);
ok
(
delete_pf
(
"msitest
\\
siriometer"
,
TRUE
),
"File deleted
\n
"
);
todo_wine
{
ok
(
delete_pf
(
"msitest
\\
siriometer"
,
TRUE
),
"File deleted
\n
"
);
}
ok
(
pf_exists
(
"msitest
\\
cabout"
),
"Directory deleted
\n
"
);
ok
(
pf_exists
(
"msitest"
),
"Directory deleted
\n
"
);
...
...
dlls/msi/tests/package.c
View file @
7c9873e4
This diff is collapsed.
Click to expand it.
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