msi: Only extract a file when its disk id matches the media disk id.

This makes sure that an updated file is extracted from the cabinet stream included in the patch, instead of the original source.

msi: Only extract a file when its disk id matches the media disk id.
6475c11c · Hans Leidekker · Alexandre Julliard · 376c2fd0 · 6475c11c
Commit 6475c11c authored May 12, 2010 by Hans Leidekker Committed by Alexandre Julliard May 12, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

files.c dlls/msi/files.c +3 -5

No files found.
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -179,6 +179,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
                            LPWSTR *path, DWORD *attrs, PVOID user)
 {
    static MSIFILE *f = NULL;
+    MSIMEDIAINFO *mi = user;

    if (action == MSICABEXTRACT_BEGINEXTRACT)
    {
@@ -189,11 +190,8 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
            return FALSE;
        }

-        if (f->state != msifs_missing && f->state != msifs_overwrite)
-        {
-            TRACE("Skipping extraction of %s\n", debugstr_w(file));
+        if (f->disk_id != mi->disk_id || (f->state != msifs_missing && f->state != msifs_overwrite))
            return FALSE;
-        }

        msi_file_update_ui(package, f, szInstallFiles);

@@ -257,7 +255,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
            data.mi = mi;
            data.package = package;
            data.cb = installfiles_cb;
-            data.user = NULL;
+            data.user = mi;

            if (file->IsCompressed &&
                !msi_cabextract(package, mi, &data))