ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Make sure to only open a patch database in msi_apply_patch_package.

This commit is contained in:
Hans Leidekker 2010-04-29 09:38:54 +02:00 committed by Alexandre Julliard
parent 73f1294431
commit c6f281fcf7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/msi/action.c
View File

@ -541,12 +541,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file )
TRACE("%p %s\n", package, debugstr_w( file ) ); TRACE("%p %s\n", package, debugstr_w( file ) );
/* FIXME: r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db );
* We probably want to make sure we only open a patch collection here.
* Patch collections (.msp) and databases (.msi) have different GUIDs
* but currently MSI_OpenDatabaseW will accept both.
*/
r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &patch_db );
if ( r != ERROR_SUCCESS ) if ( r != ERROR_SUCCESS )
{ {
ERR("failed to open patch collection %s\n", debugstr_w( file ) ); ERR("failed to open patch collection %s\n", debugstr_w( file ) );
@ -565,7 +560,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file )
/* /*
* There might be a CAB file in the patch package, * There might be a CAB file in the patch package,
* so append it to the list of storage to search for streams. * so append it to the list of storages to search for streams.
*/ */
append_storage_to_db( package->db, patch_db->storage ); append_storage_to_db( package->db, patch_db->storage );