From 2793a4fd52112f25de3e32620a0b141f5b852211 Mon Sep 17 00:00:00 2001 From: Octavian Voicu Date: Mon, 19 Apr 2010 12:59:01 +0300 Subject: [PATCH] msi: Use standard window class for combo control and add error checking. --- dlls/msi/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ac2e95af91f..5afced2363b 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; }