Peter Oberndorfer : msi: Honor attributes for combobox.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c1b7a825ff6ca9ede64d5eae2808738664af1b4b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1b7a825ff6ca9ede64d5eae2808738664af1b4b

Author: Peter Oberndorfer <kumbayo84 at arcor.de>
Date:   Sat Feb  3 20:09:09 2007 +0100

msi: Honor attributes for combobox.

---

 dlls/msi/dialog.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 7c1cb91..1502374 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1124,9 +1124,18 @@ static UINT msi_dialog_icon_control( msi
 static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec )
 {
     static const WCHAR szCombo[] = { 'C','O','M','B','O','B','O','X',0 };
+    DWORD attributes, style;
+
+    style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD;
+    attributes = MSI_RecordGetInteger( rec, 8 );
+    if ( ~attributes & msidbControlAttributesSorted)
+        style |= CBS_SORT;
+    if ( attributes & msidbControlAttributesComboList)
+        style |= CBS_DROPDOWNLIST;
+    else
+        style |= CBS_DROPDOWN;
 
-    msi_dialog_add_control( dialog, rec, szCombo,
-                            SS_BITMAP | SS_LEFT | SS_CENTERIMAGE );
+    msi_dialog_add_control( dialog, rec, szCombo, style );
     return ERROR_SUCCESS;
 }