msi: Build a proper source path in MsiConfigureProductExW.

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

msi: Build a proper source path in MsiConfigureProductExW.
e3b55888 · Hans Leidekker · Alexandre Julliard · 965698cd · e3b55888
Commit e3b55888 authored Mar 31, 2009 by Hans Leidekker Committed by Alexandre Julliard Mar 31, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

msi.c dlls/msi/msi.c +11 -1

No files found.
--- 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);