msi: action text corrections
Aric Stewart
aric at codeweavers.com
Wed Aug 24 14:13:22 CDT 2005
Display the correct text string in the action text field for the dialog
boxes. Also the string should be deformatted.
-------------- next part --------------
Index: dlls/msi/action.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/action.c,v
retrieving revision 1.182
diff -u -r1.182 action.c
--- dlls/msi/action.c 24 Aug 2005 10:57:27 -0000 1.182
+++ dlls/msi/action.c 24 Aug 2005 19:12:50 -0000
@@ -379,6 +379,7 @@
WCHAR timet[0x100];
MSIRECORD * row = 0;
LPCWSTR ActionText;
+ LPWSTR deformated;
GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100);
@@ -387,8 +388,10 @@
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 @@
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 @@
{
if (strcmpW(StandardActions[i].action, action)==0)
{
- ce_actiontext(package, action);
if (!run)
{
ui_actioninfo(package, action, TRUE, 0);
More information about the wine-patches
mailing list