marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display the correct text string in the action text field for the 

dialog boxes. Also the string should be deformatted.
oldstable
Aric Stewart 2005-08-25 09:50:08 +00:00 committed by Alexandre Julliard
parent f62f6e8fe1
commit 43ec0a4d06
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msi/action.c
View File

@ -379,6 +379,7 @@ static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action)
WCHAR timet[0x100];
MSIRECORD * row = 0;
LPCWSTR ActionText;
LPWSTR deformated;
GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100);
@ -387,8 +388,10 @@ static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action)
return;
ActionText = MSI_RecordGetString(row,2);
deformat_string(package, ActionText, &deformated);
sprintfW(message,template_s,timet,action,ActionText);
sprintfW(message,template_s,timet,action,deformated);
ce_actiontext(package, deformated);
msiobj_release(&row->hdr);
row = MSI_CreateRecord(1);
@ -396,6 +399,7 @@ static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action)
MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row);
msiobj_release(&row->hdr);
HeapFree(GetProcessHeap(),0,deformated);
}
static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start,
@ -799,7 +803,6 @@ static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action,
{
if (strcmpW(StandardActions[i].action, action)==0)
{
ce_actiontext(package, action);
if (!run)
{
ui_actioninfo(package, action, TRUE, 0);