Hans Leidekker : msi: Features don't require a directory.

Alexandre Julliard julliard at winehq.org
Fri Nov 5 13:47:18 CDT 2010


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Nov  5 11:36:22 2010 +0100

msi: Features don't require a directory.

---

 dlls/msi/dialog.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index a68d953..57759f6 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -2377,14 +2377,19 @@ static UINT msi_dialog_seltree_handler( msi_dialog *dialog,
     ControlEvent_FireSubscribedEvent( dialog->package, szSelectionDescription, rec );
 
     dir = MSI_RecordGetString( row, 7 );
-    folder = get_loaded_folder( dialog->package, dir );
-    if (!folder)
+    if (dir)
     {
-        r = ERROR_FUNCTION_FAILED;
-        goto done;
+        folder = get_loaded_folder( dialog->package, dir );
+        if (!folder)
+        {
+            r = ERROR_FUNCTION_FAILED;
+            goto done;
+        }
+        MSI_RecordSetStringW( rec, 1, folder->ResolvedTarget );
     }
+    else
+        MSI_RecordSetStringW( rec, 1, NULL );
 
-    MSI_RecordSetStringW( rec, 1, folder->ResolvedTarget );
     ControlEvent_FireSubscribedEvent( dialog->package, szSelectionPath, rec );
 
 done:




More information about the wine-cvs mailing list