From a3a2eaea9319fdd38a75928f7d2e7b35084cedde Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Wed, 29 Nov 2006 16:36:58 +0900 Subject: [PATCH] msi: Update the UI in one place only in ACTION_ProcessComponents. --- dlls/msi/action.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index da8a76c3ce6..c61a70b22be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2700,7 +2700,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) continue; squash_guid(comp->ComponentId,squished_cc); - + msi_free(comp->FullKeypath); comp->FullKeypath = resolve_keypath( package, comp ); @@ -2738,14 +2738,6 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } RegCloseKey(hkey2); - - /* UI stuff */ - uirow = MSI_CreateRecord(3); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - MSI_RecordSetStringW(uirow,3,comp->FullKeypath); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); } else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT)) { @@ -2763,14 +2755,16 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (res == ERROR_NO_MORE_ITEMS) RegDeleteKeyW(hkey,squished_cc); - /* UI stuff */ - uirow = MSI_CreateRecord(2); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); } - } + + /* UI stuff */ + uirow = MSI_CreateRecord(3); + MSI_RecordSetStringW(uirow,1,package->ProductCode); + MSI_RecordSetStringW(uirow,2,comp->ComponentId); + MSI_RecordSetStringW(uirow,3,comp->FullKeypath); + ui_actiondata(package,szProcessComponents,uirow); + msiobj_release( &uirow->hdr ); + } RegCloseKey(hkey); return rc; }