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
424e3a9f
Commit
424e3a9f
authored
Jul 21, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
Jul 21, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Move the component enabled check into the standard actions.
parent
568c7c19
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
186 additions
and
31 deletions
+186
-31
action.c
dlls/msi/action.c
+117
-28
classes.c
dlls/msi/classes.c
+24
-0
files.c
dlls/msi/files.c
+31
-1
font.c
dlls/msi/font.c
+12
-0
install.c
dlls/msi/tests/install.c
+2
-2
No files found.
dlls/msi/action.c
View file @
424e3a9f
This diff is collapsed.
Click to expand it.
dlls/msi/classes.c
View file @
424e3a9f
...
...
@@ -824,6 +824,12 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
if
(
!
comp
)
continue
;
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
continue
;
}
feature
=
cls
->
Feature
;
if
(
!
feature
)
continue
;
...
...
@@ -976,6 +982,12 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package )
if
(
!
comp
)
continue
;
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
continue
;
}
feature
=
cls
->
Feature
;
if
(
!
feature
)
continue
;
...
...
@@ -1250,6 +1262,12 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package)
if
(
!
ext
->
Component
)
continue
;
if
(
!
ext
->
Component
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
continue
;
}
feature
=
ext
->
Feature
;
if
(
!
feature
)
continue
;
...
...
@@ -1354,6 +1372,12 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package )
if
(
!
ext
->
Component
)
continue
;
if
(
!
ext
->
Component
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
continue
;
}
feature
=
ext
->
Feature
;
if
(
!
feature
)
continue
;
...
...
dlls/msi/files.c
View file @
424e3a9f
...
...
@@ -66,7 +66,7 @@ static void schedule_install_files(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY
(
file
,
&
package
->
files
,
MSIFILE
,
entry
)
{
if
(
file
->
Component
->
ActionRequest
!=
INSTALLSTATE_LOCAL
)
if
(
file
->
Component
->
ActionRequest
!=
INSTALLSTATE_LOCAL
||
!
file
->
Component
->
Enabled
)
{
TRACE
(
"File %s is not scheduled for install
\n
"
,
debugstr_w
(
file
->
File
));
...
...
@@ -501,6 +501,12 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
if
(
!
comp
)
return
ERROR_SUCCESS
;
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
comp
->
ActionRequest
!=
INSTALLSTATE_LOCAL
&&
comp
->
ActionRequest
!=
INSTALLSTATE_SOURCE
)
{
TRACE
(
"Component not scheduled for installation: %s
\n
"
,
debugstr_w
(
component
));
...
...
@@ -693,6 +699,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
if
(
!
comp
)
return
ERROR_SUCCESS
;
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
comp
->
ActionRequest
!=
INSTALLSTATE_LOCAL
)
{
TRACE
(
"Component not scheduled for installation %s
\n
"
,
debugstr_w
(
component
));
...
...
@@ -775,6 +787,12 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param )
if
(
!
comp
)
return
ERROR_SUCCESS
;
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
comp
->
ActionRequest
!=
INSTALLSTATE_ABSENT
)
{
TRACE
(
"Component not scheduled for removal %s
\n
"
,
debugstr_w
(
component
));
...
...
@@ -888,6 +906,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
return
ERROR_FUNCTION_FAILED
;
}
if
(
!
comp
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
!
verify_comp_for_removal
(
comp
,
install_mode
))
{
TRACE
(
"Skipping removal due to missing conditions
\n
"
);
...
...
@@ -972,6 +996,12 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
file
->
Component
->
Installed
==
INSTALLSTATE_SOURCE
)
continue
;
if
(
!
file
->
Component
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
continue
;
}
if
(
file
->
Version
)
{
ver
=
msi_get_disk_file_version
(
file
->
TargetPath
);
...
...
dlls/msi/font.c
View file @
424e3a9f
...
...
@@ -196,6 +196,12 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param)
return
ERROR_SUCCESS
;
}
if
(
!
file
->
Component
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
file
->
Component
->
ActionRequest
!=
INSTALLSTATE_LOCAL
)
{
TRACE
(
"Component not scheduled for installation
\n
"
);
...
...
@@ -274,6 +280,12 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param )
return
ERROR_SUCCESS
;
}
if
(
!
file
->
Component
->
Enabled
)
{
TRACE
(
"component is disabled
\n
"
);
return
ERROR_SUCCESS
;
}
if
(
file
->
Component
->
ActionRequest
!=
INSTALLSTATE_ABSENT
)
{
TRACE
(
"Component not scheduled for removal
\n
"
);
...
...
dlls/msi/tests/install.c
View file @
424e3a9f
...
...
@@ -5760,8 +5760,8 @@ static void test_publish(void)
/* UnpublishFeatures, only feature removed. Only works when entire product is removed */
r
=
MsiInstallProductA
(
msifile
,
"UNPUBLISH_FEATURES=1 REMOVE=feature"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
todo_wine
ok
(
pf_exists
(
"msitest
\\
maximus"
),
"File deleted
\n
"
);
todo_wine
ok
(
pf_exists
(
"msitest"
),
"Directory deleted
\n
"
);
ok
(
pf_exists
(
"msitest
\\
maximus"
),
"File deleted
\n
"
);
ok
(
pf_exists
(
"msitest"
),
"Directory deleted
\n
"
);
state
=
MsiQueryProductState
(
"{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"
);
ok
(
state
==
INSTALLSTATE_DEFAULT
,
"Expected INSTALLSTATE_DEFAULT, got %d
\n
"
,
state
);
...
...
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