Skip to content

W
wine-cw
Commit 2666294f authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions.

parent 3c36d9d1
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 2 deletions
dlls/msi/files.c
View file @ 2666294f
...@@ -386,6 +386,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) ...@@ -386,6 +386,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
LPWSTR dest; LPWSTR dest;
LPCWSTR file_key, component; LPCWSTR file_key, component;
MSICOMPONENT *comp; MSICOMPONENT *comp;
MSIRECORD *uirow;
MSIFILE *file; MSIFILE *file;
component = MSI_RecordGetString(row,2); component = MSI_RecordGetString(row,2);
...@@ -432,7 +433,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) ...@@ -432,7 +433,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
FIXME("We should track these duplicate files as well\n"); 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); msi_free(dest);
return ERROR_SUCCESS; return ERROR_SUCCESS;
...@@ -462,6 +468,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) ...@@ -462,6 +468,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param )
LPWSTR dest; LPWSTR dest;
LPCWSTR file_key, component; LPCWSTR file_key, component;
MSICOMPONENT *comp; MSICOMPONENT *comp;
MSIRECORD *uirow;
MSIFILE *file; MSIFILE *file;
component = MSI_RecordGetString( row, 2 ); component = MSI_RecordGetString( row, 2 );
...@@ -505,7 +512,11 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) ...@@ -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()); 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); msi_free(dest);
return ERROR_SUCCESS; return ERROR_SUCCESS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment