marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Restrict the match on files from cabinets to files that have not been installed.

oldstable
Hans Leidekker 2012-03-16 16:13:30 +01:00 committed by Alexandre Julliard
parent 72550c9d3a
commit 45a62d53b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/files.c
View File

@ -253,7 +253,7 @@ static MSIFILE *find_file( MSIPACKAGE *package, const WCHAR *filename )
LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
{
if (!strcmpiW( filename, file->File )) return file;
if (file->state != msifs_installed && !strcmpiW( filename, file->File )) return file;
}
return NULL;
}

2
dlls/msi/media.c
View File

@ -428,7 +428,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
goto done;
}
TRACE("extracting %s\n", debugstr_w(path));
TRACE("extracting %s -> %s\n", debugstr_w(data->curfile), debugstr_w(path));
attrs = attrs & (FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM);
if (!attrs) attrs = FILE_ATTRIBUTE_NORMAL;