[2/2] msi: Build a proper source path in MsiConfigureProductExW.

Hans Leidekker hans at codeweavers.com
Tue Mar 31 04:31:28 CDT 2009


We were passing uninitialized data which would ultimately end up in the
registry.

 -Hans

diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 445d135..90c7ba6 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -476,7 +476,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel,
     MSIINSTALLCONTEXT context;
     UINT r;
     DWORD sz;
-    WCHAR sourcepath[MAX_PATH];
+    WCHAR sourcepath[MAX_PATH], filename[MAX_PATH];
     LPWSTR commandline;
 
     static const WCHAR szInstalled[] = {
@@ -538,6 +538,16 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel,
     if (context == MSIINSTALLCONTEXT_MACHINE)
         lstrcatW(commandline, szMachine);
 
+    sz = sizeof(sourcepath);
+    MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT,
+                          INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz);
+
+    sz = sizeof(filename);
+    MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT,
+                          INSTALLPROPERTY_PACKAGENAMEW, filename, &sz);
+
+    strcatW(sourcepath, filename);
+
     r = MSI_InstallPackage( package, sourcepath, commandline );
 
     msi_free(commandline);



More information about the wine-patches mailing list