From c6f281fcf736628cc2f9121bfd9b057bba7ac327 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Thu, 29 Apr 2010 09:38:54 +0200 Subject: [PATCH] msi: Make sure to only open a patch database in msi_apply_patch_package. --- dlls/msi/action.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0b236560b99..fd7f78233c1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -541,12 +541,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) TRACE("%p %s\n", package, debugstr_w( file ) ); - /* FIXME: - * 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 ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db ); if ( r != ERROR_SUCCESS ) { 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, - * 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 );