Hans Leidekker : msi: Components don't require a key path.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6d13e2fd4b796b14082cc3605df8ed9696c4aa6c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6d13e2fd4b796b14082cc3605d...

Author: Hans Leidekker 
Date:   Tue Nov 16 09:07:23 2010 +0100

msi: Components don't require a key path.

---

dlls/msi/action.c  |    3 +--
 dlls/msi/classes.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 5328193..511d82b 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -3245,8 +3245,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
                     '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ',
                     '`','D','i','s','k','I','d','`',0};

-                file = get_loaded_file(package, comp->KeyPath);
-                if (!file)
+                if (!comp->KeyPath || !(file = get_loaded_file(package, comp->KeyPath)))
                     continue;

row = MSI_QueryGetRecord(package->db, query, file->Sequence);
diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c
index 9305e04..d11f48b 100644
--- a/dlls/msi/classes.c
+++ b/dlls/msi/classes.c
@@ -850,8 +850,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package)
         }
         feature->Action = feature->ActionRequest;

-        file = get_loaded_file( package, comp->KeyPath );
-        if (!file)
+        if (!comp->KeyPath || !(file = get_loaded_file( package, comp->KeyPath )))
         {
             TRACE("COM server not provided, skipping class %s\n", debugstr_w(cls->clsid));
             continue;