From fd8c175a3c4e9e7324939ddf3f0557f06a830c3b Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Thu, 16 Jun 2005 16:08:58 +0000 Subject: [PATCH] Add UI messages to FindRelatedProducts. Reduce unneeded includes. --- dlls/msi/upgrade.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 516f22e0bab..7a066ca621a 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -27,27 +27,24 @@ */ #include -#include - -#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winreg.h" #include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" #include "msidefs.h" #include "msipriv.h" -#include "winnls.h" #include "winuser.h" -#include "winver.h" #include "action.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); +extern const WCHAR szFindRelatedProducts[]; +extern const WCHAR szMigrateFeatureStates[]; +extern const WCHAR szRemoveExistingProducts[]; + static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes) { DWORD langdword; @@ -113,6 +110,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; + MSIRECORD *uirow; upgrade_code = MSI_RecordGetString(rec,1); @@ -120,6 +118,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; + uirow = MSI_CreateRecord(1); attributes = MSI_RecordGetInteger(rec,5); while (rc == ERROR_SUCCESS) @@ -194,10 +193,12 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) action_property = MSI_RecordGetString(rec,7); append_productcode(package,action_property,productid); + ui_actiondata(package,szFindRelatedProducts,uirow); } index ++; } RegCloseKey(hkey); + msiobj_release( &uirow->hdr); return ERROR_SUCCESS; }