James Hawkins : msi: Check the local package for existence when resolving the package source.

Alexandre Julliard julliard at winehq.org
Mon Jan 7 08:39:10 CST 2008


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

Author: James Hawkins <truiken at gmail.com>
Date:   Sat Jan  5 13:48:32 2008 -0700

msi: Check the local package for existence when resolving the package source.

---

 dlls/msi/action.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 562178c..e116967 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -4203,7 +4203,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package)
 
     msi_set_sourcedir_props(package, TRUE);
 
-    attrib = GetFileAttributesW(package->PackagePath);
+    attrib = GetFileAttributesW(package->db->path);
     if (attrib == INVALID_FILE_ATTRIBUTES)
     {
         LPWSTR prompt;
@@ -4221,7 +4221,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package)
                     INSTALLPROPERTY_DISKPROMPTW,prompt,&size);
         }
         else
-            prompt = strdupW(package->PackagePath);
+            prompt = strdupW(package->db->path);
 
         msg = generate_error_string(package,1302,1,prompt);
         while(attrib == INVALID_FILE_ATTRIBUTES)
@@ -4232,7 +4232,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package)
                 rc = ERROR_INSTALL_USEREXIT;
                 break;
             }
-            attrib = GetFileAttributesW(package->PackagePath);
+            attrib = GetFileAttributesW(package->db->path);
         }
         msi_free(prompt);
         rc = ERROR_SUCCESS;




More information about the wine-cvs mailing list