msi: Only add text to the scroll control if text is provided

James Hawkins truiken at gmail.com
Wed Nov 8 13:40:25 CST 2006


Hi,

This fixes bug 6030.  http://bugs.winehq.org/show_bug.cgi?id=6030

Changelog:
* Only add text to the scroll control if text is provided.

 dlls/msi/dialog.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

-- 
James Hawkins
-------------- next part --------------
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 407cb29..d928edc 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -920,6 +920,7 @@ static UINT msi_dialog_scrolltext_contro
     struct msi_scrolltext_info *info;
     msi_control *control;
     HMODULE hRichedit;
+    LPCWSTR text;
     DWORD style;
 
     info = msi_alloc( sizeof *info );
@@ -949,7 +950,9 @@ static UINT msi_dialog_scrolltext_contro
     SetPropW( control->hwnd, szButtonData, info );
 
     /* add the text into the richedit */
-    msi_scrolltext_add_text( control, MSI_RecordGetString( rec, 10 ) );
+    text = MSI_RecordGetString( rec, 10 );
+    if (text)
+        msi_scrolltext_add_text( control, text );
 
     return ERROR_SUCCESS;
 }
-- 
1.4.3



More information about the wine-patches mailing list