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

msi: Display the product code in the PublishProduct action.

This commit is contained in:
Hans Leidekker 2010-03-05 12:27:49 +01:00 committed by Alexandre Julliard
parent e90fbf09c7
commit c547fb3629
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/action.c
View File

@ -3469,7 +3469,6 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param)
CHAR buffer[1024]; CHAR buffer[1024];
DWORD sz; DWORD sz;
UINT rc; UINT rc;
MSIRECORD *uirow;
FileName = MSI_RecordGetString(row,1); FileName = MSI_RecordGetString(row,1);
if (!FileName) if (!FileName)
@ -3508,14 +3507,8 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param)
} while (sz == 1024); } while (sz == 1024);
msi_free(FilePath); msi_free(FilePath);
CloseHandle(the_file); CloseHandle(the_file);
uirow = MSI_CreateRecord(1);
MSI_RecordSetStringW(uirow,1,FileName);
ui_actiondata(package,szPublishProduct,uirow);
msiobj_release( &uirow->hdr );
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -3777,8 +3770,8 @@ done:
static UINT ACTION_PublishProduct(MSIPACKAGE *package) static UINT ACTION_PublishProduct(MSIPACKAGE *package)
{ {
UINT rc; UINT rc;
HKEY hukey=0; HKEY hukey = NULL, hudkey = NULL;
HKEY hudkey=0; MSIRECORD *uirow;
/* FIXME: also need to publish if the product is in advertise mode */ /* FIXME: also need to publish if the product is in advertise mode */
if (!msi_check_publish(package)) if (!msi_check_publish(package))
@ -3816,6 +3809,11 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package)
rc = msi_publish_icons(package); rc = msi_publish_icons(package);
end: end:
uirow = MSI_CreateRecord( 1 );
MSI_RecordSetStringW( uirow, 1, package->ProductCode );
ui_actiondata( package, szPublishProduct, uirow );
msiobj_release( &uirow->hdr );
RegCloseKey(hukey); RegCloseKey(hukey);
RegCloseKey(hudkey); RegCloseKey(hudkey);