commit 2793a4fd52112f25de3e32620a0b141f5b852211
author Octavian Voicu <octavian.voicu@gmail.com> Mon Apr 19 12:59:01 2010 +0300
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 19 15:12:48 2010 +0200
tree c4d2c4343828923c72179a3a44deb5a964527341
parent 9c892430ba3d9cf5c6c507ca258f0cb08400e2ba

msi: Use standard window class for combo control and add error checking.

dlls/msi/dialog.c

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_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 @@
     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;
 }