From 2666294f649f2e79fdf4e0f5ef64ccbe4c5d1160 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Fri, 5 Mar 2010 12:25:07 +0100 Subject: [PATCH] msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions. --- dlls/msi/files.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index aaaa7c11f9d..c55bbfa75f9 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -386,6 +386,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString(row,2); @@ -432,7 +433,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) FIXME("We should track these duplicate files as well\n"); - msi_file_update_ui(package, file, szDuplicateFiles); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetInteger( uirow, 6, file->FileSize ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS; @@ -462,6 +468,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString( row, 2 ); @@ -505,7 +512,11 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) WARN("Failed to delete duplicate file %s (%u)\n", debugstr_w(dest), GetLastError()); } - msi_file_update_ui( package, file, szRemoveDuplicateFiles ); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szRemoveDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS; -- 2.11.4.GIT