Hans Leidekker : msi: Don't add text to the scrollable text control twice.
Alexandre Julliard
julliard at winehq.org
Fri Jan 10 14:44:57 CST 2014
Module: wine
Branch: stable
Commit: 788ba3345e98f82352c02ce67c04508923dd55bf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=788ba3345e98f82352c02ce67c04508923dd55bf
Author: Hans Leidekker <hans at codeweavers.com>
Date: Thu Dec 19 13:36:10 2013 +0100
msi: Don't add text to the scrollable text control twice.
(cherry picked from commit f222582af6806bdd0aaab954bc87457b297647db)
---
dlls/msi/dialog.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 5347005..d78b721 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -739,12 +739,13 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog,
MSIRECORD *rec, LPCWSTR szCls, DWORD style )
{
DWORD attributes;
- LPCWSTR text, name;
+ const WCHAR *text = NULL, *name, *control_type;
DWORD exstyle = 0;
name = MSI_RecordGetString( rec, 2 );
+ control_type = MSI_RecordGetString( rec, 3 );
attributes = MSI_RecordGetInteger( rec, 8 );
- text = MSI_RecordGetString( rec, 10 );
+ if (strcmpW( control_type, szScrollableText )) text = MSI_RecordGetString( rec, 10 );
TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name),
attributes, debugstr_w(text), style);
More information about the wine-cvs
mailing list