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
1d6540bd
Commit
1d6540bd
authored
May 30, 2011
by
Hans Leidekker
Committed by
Alexandre Julliard
May 30, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Skip files from global assemblies in the RemoveFiles action.
parent
9af15023
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
files.c
dlls/msi/files.c
+13
-6
No files found.
dlls/msi/files.c
View file @
1d6540bd
...
...
@@ -1164,7 +1164,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
TRACE
(
"Skipping removal due to install mode
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
comp
->
assembly
&&
!
comp
->
assembly
->
application
)
{
return
ERROR_SUCCESS
;
}
if
(
comp
->
Attributes
&
msidbComponentAttributesPermanent
)
{
TRACE
(
"permanent component, not removing file
\n
"
);
...
...
@@ -1266,15 +1269,19 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
MSIRECORD
*
uirow
;
LPWSTR
dir
,
p
;
VS_FIXEDFILEINFO
*
ver
;
MSICOMPONENT
*
comp
=
file
->
Component
;
if
(
file
->
state
==
msifs_installed
)
ERR
(
"removing installed file %s
\n
"
,
debugstr_w
(
file
->
TargetPath
));
file
->
Component
->
Action
=
msi_get_component_action
(
package
,
file
->
Component
);
if
(
file
->
Component
->
Action
!=
INSTALLSTATE_ABSENT
||
file
->
Component
->
Installed
==
INSTALLSTATE_SOURCE
)
comp
->
Action
=
msi_get_component_action
(
package
,
comp
);
if
(
comp
->
Action
!=
INSTALLSTATE_ABSENT
||
comp
->
Installed
==
INSTALLSTATE_SOURCE
)
continue
;
if
(
comp
->
assembly
&&
!
comp
->
assembly
->
application
)
continue
;
if
(
file
->
Component
->
Attributes
&
msidbComponentAttributesPermanent
)
if
(
comp
->
Attributes
&
msidbComponentAttributesPermanent
)
{
TRACE
(
"permanent component, not removing file
\n
"
);
continue
;
...
...
@@ -1299,7 +1306,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
{
WARN
(
"failed to delete %s (%u)
\n
"
,
debugstr_w
(
file
->
TargetPath
),
GetLastError
());
}
else
if
(
!
has_persistent_dir
(
package
,
file
->
Component
))
else
if
(
!
has_persistent_dir
(
package
,
comp
))
{
if
((
dir
=
strdupW
(
file
->
TargetPath
)))
{
...
...
@@ -1312,7 +1319,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
uirow
=
MSI_CreateRecord
(
9
);
MSI_RecordSetStringW
(
uirow
,
1
,
file
->
FileName
);
MSI_RecordSetStringW
(
uirow
,
9
,
file
->
Component
->
Directory
);
MSI_RecordSetStringW
(
uirow
,
9
,
comp
->
Directory
);
msi_ui_actiondata
(
package
,
szRemoveFiles
,
uirow
);
msiobj_release
(
&
uirow
->
hdr
);
/* FIXME: call msi_ui_progress here? */
...
...
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