comctl32: Introduce ComboBox control.

dlls/comctl32/Makefile.in

@@ -7,6 +7,7 @@ DELAYIMPORTS = winmm uxtheme
 C_SRCS = \
 	animate.c \
 	button.c \
+	combo.c \
 	comboex.c \
 	comctl32undoc.c \
 	commctrl.c \

dlls/comctl32/comctl32.h

@@ -178,6 +178,7 @@ HRGN set_control_clipping(HDC hdc, const RECT *rect) DECLSPEC_HIDDEN;
 extern void ANIMATE_Register(void) DECLSPEC_HIDDEN;
 extern void ANIMATE_Unregister(void) DECLSPEC_HIDDEN;
 extern void BUTTON_Register(void) DECLSPEC_HIDDEN;
+extern void COMBO_Register(void) DECLSPEC_HIDDEN;
 extern void COMBOEX_Register(void) DECLSPEC_HIDDEN;
 extern void COMBOEX_Unregister(void) DECLSPEC_HIDDEN;
 extern void DATETIME_Register(void) DECLSPEC_HIDDEN;

dlls/comctl32/commctrl.c

@@ -99,6 +99,7 @@ static void unregister_versioned_classes(void)
     static const char *classes[] =
     {
         VERSION WC_BUTTONA,
+        VERSION WC_COMBOBOXA,
         VERSION WC_EDITA,
         VERSION WC_STATICA,
     };
@@ -170,6 +171,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             UPDOWN_Register ();
 
             BUTTON_Register ();
+            COMBO_Register ();
             EDIT_Register ();
             STATIC_Register ();
 

dlls/comctl32/tests/misc.c

@@ -346,6 +346,7 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno
     if (GetClassInfoA( 0, name, &wc ))
     {
 todo_wine_if(strcmp(name, "Button") &&
+                strcmp(name, "ComboBox") &&
                 strcmp(name, "Edit") &&
                 strcmp(name, "Static"))
         ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n",

dlls/user32/class.c

@@ -166,7 +166,6 @@ static BOOL is_builtin_class( const WCHAR *name )
 {
     static const WCHAR classesW[][20] =
     {
-        {'C','o','m','b','o','B','o','x',0},
         {'C','o','m','b','o','L','B','o','x',0},
         {'I','M','E',0},
         {'L','i','s','t','B','o','x',0},