ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Display the file identifier instead of the filename in the SelfRegModules and SelfUnregModules actions.

This commit is contained in:
Hans Leidekker 2010-03-23 11:45:33 +01:00 committed by Alexandre Julliard
parent 25756b7873
commit a4be941df9
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/msi/action.c
View File

@ -4152,21 +4152,16 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
CloseHandle(info.hProcess); CloseHandle(info.hProcess);
} }
msi_free(FullName);
/* the UI chunk */
uirow = MSI_CreateRecord( 2 ); uirow = MSI_CreateRecord( 2 );
MSI_RecordSetStringW( uirow, 1, filename );
uipath = strdupW( file->TargetPath ); uipath = strdupW( file->TargetPath );
p = strrchrW(uipath,'\\'); if ((p = strrchrW( uipath,'\\' ))) *p = 0;
if (p) MSI_RecordSetStringW( uirow, 2, uipath );
p[0]=0; ui_actiondata( package, szSelfRegModules, uirow );
MSI_RecordSetStringW( uirow, 1, &p[1] );
MSI_RecordSetStringW( uirow, 2, uipath);
ui_actiondata( package, szSelfRegModules, uirow);
msiobj_release( &uirow->hdr ); msiobj_release( &uirow->hdr );
msi_free( uipath );
/* FIXME: call ui_progress? */
msi_free( FullName );
msi_free( uipath );
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -4235,21 +4230,16 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
CloseHandle( pi.hProcess ); CloseHandle( pi.hProcess );
} }
msi_free( cmdline );
uirow = MSI_CreateRecord( 2 ); uirow = MSI_CreateRecord( 2 );
MSI_RecordSetStringW( uirow, 1, filename );
uipath = strdupW( file->TargetPath ); uipath = strdupW( file->TargetPath );
if ((p = strrchrW( uipath, '\\' ))) if ((p = strrchrW( uipath,'\\' ))) *p = 0;
{
*p = 0;
MSI_RecordSetStringW( uirow, 1, ++p );
}
MSI_RecordSetStringW( uirow, 2, uipath ); MSI_RecordSetStringW( uirow, 2, uipath );
ui_actiondata( package, szSelfUnregModules, uirow ); ui_actiondata( package, szSelfUnregModules, uirow );
msiobj_release( &uirow->hdr ); msiobj_release( &uirow->hdr );
msi_free( uipath );
/* FIXME call ui_progress? */
msi_free( cmdline );
msi_free( uipath );
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }