Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Fix component Action for shared components in CostFinalize.

Browse source 
Fixes regression in wow .NET4.6.2 installation.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d95bffdadbf18b91c1bb15cc7132ae3b9f505f98 by Piotr Caban <piotr@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 18:51:45 +01:00 committed by Mark Jansen
parent f51751dd6b
commit 06129f8479
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dll/win32/msi/action.c
View file

@ -1979,13 +1979,21 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
component->ActionRequest = INSTALLSTATE_UNKNOWN; component->ActionRequest = INSTALLSTATE_UNKNOWN;
} }
TRACE("component %s (installed %d request %d action %d)\n",
debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action);
if (component->Action == INSTALLSTATE_LOCAL || component->Action == INSTALLSTATE_SOURCE) if (component->Action == INSTALLSTATE_LOCAL || component->Action == INSTALLSTATE_SOURCE)
component->num_clients++; component->num_clients++;
else if (component->Action == INSTALLSTATE_ABSENT) else if (component->Action == INSTALLSTATE_ABSENT)
{
component->num_clients--; component->num_clients--;
if (component->num_clients > 0)
{
TRACE("multiple clients uses %s - disallowing uninstallation\n", debugstr_w(component->Component));
component->Action = INSTALLSTATE_UNKNOWN;
}
}
TRACE("component %s (installed %d request %d action %d)\n",
debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action);
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;

27
modules/rostests/winetests/msi/install.c
View file

@ -1223,7 +1223,9 @@ static const char shc_custom_action_dat[] =
"Action\tType\tSource\tTarget\tISComments\n" "Action\tType\tSource\tTarget\tISComments\n"
"s72\ti2\tS64\tS0\tS255\n" "s72\ti2\tS64\tS0\tS255\n"
"CustomAction\tAction\n" "CustomAction\tAction\n"
"TestComponentAction\t19\t\twrong component action on install\t\n"; "TestComponentAction\t19\t\twrong component action on install\t\n"
"TestDisallowedAction\t19\t\twrong component action on disallowed remove\t\n"
"TestRemoveAction\t19\t\twrong component action on remove\t\n";
static const char shc_install_exec_seq_dat[] = static const char shc_install_exec_seq_dat[] =
"Action\tCondition\tSequence\n" "Action\tCondition\tSequence\n"
@ -1233,6 +1235,27 @@ static const char shc_install_exec_seq_dat[] =
"CostInitialize\t\t200\n" "CostInitialize\t\t200\n"
"FileCost\t\t300\n" "FileCost\t\t300\n"
"CostFinalize\t\t600\n" "CostFinalize\t\t600\n"
"TestDisallowedAction\tREMOVE AND ($sharedcomponent <> -1)\t700\n"
"InstallValidate\t\t900\n"
"InstallInitialize\t\t1200\n"
"ProcessComponents\t\t1300\n"
"RemoveFiles\t\t1400\n"
"InstallFiles\t\t1500\n"
"TestComponentAction\tNOT REMOVE AND ($sharedcomponent <> 3)\t1600\n"
"RegisterProduct\t\t1700\n"
"PublishFeatures\t\t1800\n"
"PublishProduct\t\t1900\n"
"InstallFinalize\t\t2000\n";
static const char shc2_install_exec_seq_dat[] =
"Action\tCondition\tSequence\n"
"s72\tS255\tI2\n"
"InstallExecuteSequence\tAction\n"
"LaunchConditions\t\t100\n"
"CostInitialize\t\t200\n"
"FileCost\t\t300\n"
"CostFinalize\t\t600\n"
"TestRemoveAction\tREMOVE AND ($sharedcomponent <> 2)\t700\n"
"InstallValidate\t\t900\n" "InstallValidate\t\t900\n"
"InstallInitialize\t\t1200\n" "InstallInitialize\t\t1200\n"
"ProcessComponents\t\t1300\n" "ProcessComponents\t\t1300\n"
@ -1990,7 +2013,7 @@ static const msi_table shc2_tables[] =
ADD_TABLE(shc_feature), ADD_TABLE(shc_feature),
ADD_TABLE(shc_feature_comp), ADD_TABLE(shc_feature_comp),
ADD_TABLE(shc_custom_action), ADD_TABLE(shc_custom_action),
ADD_TABLE(shc_install_exec_seq), ADD_TABLE(shc2_install_exec_seq),
ADD_TABLE(shc2_property) ADD_TABLE(shc2_property)
}; };