msi: Resolve the target path for the ODBC driver file if necessary.

Hans Leidekker hans at codeweavers.com
Thu May 3 02:40:00 CDT 2012


Fixes http://bugs.winehq.org/show_bug.cgi?id=30571
---
 dlls/msi/action.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index aa2cfca..c1d3b49 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -6082,6 +6082,11 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param )
     ptr += lstrlenW(ptr) + 1;
     *ptr = '\0';
 
+    if (!driver_file->TargetPath)
+    {
+        const WCHAR *dir = msi_get_target_folder( package, driver_file->Component->Directory );
+        driver_file->TargetPath = msi_build_directory_name( 2, dir, driver_file->FileName );
+    }
     driver_path = strdupW(driver_file->TargetPath);
     ptr = strrchrW(driver_path, '\\');
     if (ptr) *ptr = '\0';
-- 
1.7.10






More information about the wine-patches mailing list