Mike McCormack : msi: Fix a regression caused by some bad logic.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 18 14:35:06 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: edb58a6d0588b05307d187ae4155224d72814be6
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edb58a6d0588b05307d187ae4155224d72814be6
Author: Mike McCormack <mike at codeweavers.com>
Date: Wed Apr 19 02:29:33 2006 +0900
msi: Fix a regression caused by some bad logic.
---
dlls/msi/classes.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c
index 75a0ffa..45bd616 100644
--- a/dlls/msi/classes.c
+++ b/dlls/msi/classes.c
@@ -832,7 +832,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE
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
* 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),
More information about the wine-cvs
mailing list