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

[Alexandre Julliard]

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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Tue May  8 09:30:02 2012 +0200

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

---

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

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';