ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix a regression caused by some bad logic.

This commit is contained in:
Mike McCormack 2006-04-19 02:29:33 +09:00 committed by Alexandre Julliard
parent 1da2fbce95
commit edb58a6d05
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msi/classes.c
View File

@ -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 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}; static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0};
HKEY hkey,hkey2,hkey3; HKEY hkey,hkey2,hkey3;
BOOL install_on_demand = FALSE;
MSICLASS *cls; MSICLASS *cls;
load_classes_and_such(package); 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 * yes. MSDN says that these are based on _Feature_ not on
* Component. So verify the feature is to be installed * Component. So verify the feature is to be installed
*/ */
if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ) || if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ))
!(install_on_demand && /* && !(install_on_demand &&
ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) */
{ {
TRACE("Skipping class %s reg due to disabled feature %s\n", TRACE("Skipping class %s reg due to disabled feature %s\n",
debugstr_w(cls->clsid), debugstr_w(cls->clsid),