Commit c6f281fc authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent 73f12944
...@@ -541,12 +541,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR 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 ) ...@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment