[PATCH 1/3] msi: Use standard window class for combo control and add error checking.
Octavian Voicu
octavian.voicu at gmail.com
Mon Apr 19 04:59:01 CDT 2010
This patch series fixes bug http://bugs.winehq.org/show_bug.cgi?id=20735.
---
dlls/msi/dialog.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index ac2e95a..5afced2 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1224,7 +1224,7 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec )
static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec )
{
- static const WCHAR szCombo[] = { 'C','O','M','B','O','B','O','X',0 };
+ msi_control *control;
DWORD attributes, style;
style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD;
@@ -1236,7 +1236,10 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec )
else
style |= CBS_DROPDOWN;
- msi_dialog_add_control( dialog, rec, szCombo, style );
+ control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style );
+ if (!control)
+ return ERROR_FUNCTION_FAILED;
+
return ERROR_SUCCESS;
}
--
1.6.3.3
More information about the wine-patches
mailing list