James Hawkins : msi: Patches are applied based on ProductCode,
not ProductID.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 18 08:05:00 CDT 2007
Module: wine
Branch: master
Commit: 261e1179bb2903590794473668dc93ffd3785ff7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=261e1179bb2903590794473668dc93ffd3785ff7
Author: James Hawkins <truiken at gmail.com>
Date: Fri Jun 15 14:12:13 2007 -0700
msi: Patches are applied based on ProductCode, not ProductID.
---
dlls/msi/action.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index d09ddd0..ab3c914 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -454,15 +454,15 @@ static UINT msi_apply_substorage_transform( MSIPACKAGE *package,
static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si )
{
- static const WCHAR szProdID[] = { 'P','r','o','d','u','c','t','I','D',0 };
- LPWSTR guid_list, *guids, product_id;
+ static const WCHAR szProdCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 };
+ LPWSTR guid_list, *guids, product_code;
UINT i, ret = ERROR_FUNCTION_FAILED;
- product_id = msi_dup_property( package, szProdID );
- if (!product_id)
+ product_code = msi_dup_property( package, szProdCode );
+ if (!product_code)
{
- /* FIXME: the property ProductID should be written into the DB somewhere */
- ERR("no product ID to check\n");
+ /* FIXME: the property ProductCode should be written into the DB somewhere */
+ ERR("no product code to check\n");
return ERROR_SUCCESS;
}
@@ -470,12 +470,12 @@ static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si
guids = msi_split_string( guid_list, ';' );
for ( i = 0; guids[i] && ret != ERROR_SUCCESS; i++ )
{
- if (!lstrcmpW( guids[i], product_id ))
+ if (!lstrcmpW( guids[i], product_code ))
ret = ERROR_SUCCESS;
}
msi_free( guids );
msi_free( guid_list );
- msi_free( product_id );
+ msi_free( product_code );
return ret;
}
More information about the wine-cvs
mailing list