Skip to content

W
wine-cw
Commit edb58a6d authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

msi: Fix a regression caused by some bad logic.

parent 1da2fbce
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
dlls/msi/classes.c
View file @ edb58a6d
......@@ -832,7 +832,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
static const WCHAR szInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0};
static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0};
HKEY hkey,hkey2,hkey3;
BOOL install_on_demand = FALSE;
MSICLASS *cls;
load_classes_and_such(package);
......@@ -863,9 +862,9 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
* yes. MSDN says that these are based on _Feature_ not on
* Component. So verify the feature is to be installed
*/
if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ) ||
!(install_on_demand &&
ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED )))
if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ))
/* && !(install_on_demand &&
ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) */
{
TRACE("Skipping class %s reg due to disabled feature %s\n",
debugstr_w(cls->clsid),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment