Index: test/tools/llvm-rc/Inputs/tag-dialog.rc
===================================================================
--- test/tools/llvm-rc/Inputs/tag-dialog.rc
+++ test/tools/llvm-rc/Inputs/tag-dialog.rc
@@ -28,6 +28,19 @@
   EDITTEXT 2001, 2002, 2003, 2004, 2005
 
   LTEXT 65535, 3001, 3002, 3003, 3004, 3005
+
+  AUTO3STATE "A3", 12, 2, 3, 4, 5
+  AUTOCHECKBOX "AC", 13, 2, 3, 4, 5
+  AUTORADIOBUTTON "AR", 14, 2, 3, 4, 5
+  CHECKBOX "C", 15, 2, 3, 4, 5
+  COMBOBOX 16, 2, 3, 4, 5
+  GROUPBOX "G", 17, 2, 3, 4, 5
+  ICON "I", 18, 2, 3, 4, 5
+  LISTBOX 19, 2, 3, 4, 5
+  RADIOBUTTON "R", 20, 2, 3, 4, 5
+  COMBOBOX 21, 2, 3, 4, 5
+  SCROLLBAR 22, 2, 3, 4, 5
+  STATE3 "S", 23, 2, 3, 4, 5
 }
 
 EmptyOld DIALOG 1, 2, 3, 4 {}
Index: test/tools/llvm-rc/tag-dialog.test
===================================================================
--- test/tools/llvm-rc/tag-dialog.test
+++ test/tools/llvm-rc/tag-dialog.test
@@ -70,10 +70,10 @@
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
-; DIALOG-NEXT: Data size: 282
+; DIALOG-NEXT: Data size: 698
 ; DIALOG-NEXT: Data: (
 ; DIALOG-NEXT:   0000: 0100FFFF 54535251 00000000 00008880  |....TSRQ........|
-; DIALOG-NEXT:   0010: 07003930 31D43412 ED1E0000 00000000  |..901.4.........|
+; DIALOG-NEXT:   0010: 13003930 31D43412 ED1E0000 00000000  |..901.4.........|
 ; DIALOG-NEXT:   0020: 00000000 00000000 00000250 02000300  |...........P....|
 ; DIALOG-NEXT:   0030: 04000500 01000000 FFFF8200 4C000000  |............L...|
 ; DIALOG-NEXT:   0040: 00000000 00000000 00000000 01000250  |...............P|
@@ -89,7 +89,34 @@
 ; DIALOG-NEXT:   00E0: 00008150 D207D307 D407D507 D1070000  |...P............|
 ; DIALOG-NEXT:   00F0: FFFF8100 00000000 00000000 00000000  |................|
 ; DIALOG-NEXT:   0100: 00000250 BA0BBB0B BC0BBD0B B90B0000  |...P............|
-; DIALOG-NEXT:   0110: FFFF8200 FFFFFFFF 0000               |..........|
+; DIALOG-NEXT:   0110: FFFF8200 FFFFFFFF 00000000 00000000  |................|
+; DIALOG-NEXT:   0120: 00000000 06000150 02000300 04000500  |.......P........|
+; DIALOG-NEXT:   0130: 0C000000 FFFF8000 41003300 00000000  |........A.3.....|
+; DIALOG-NEXT:   0140: 00000000 00000000 03000150 02000300  |...........P....|
+; DIALOG-NEXT:   0150: 04000500 0D000000 FFFF8000 41004300  |............A.C.|
+; DIALOG-NEXT:   0160: 00000000 00000000 00000000 09000050  |...............P|
+; DIALOG-NEXT:   0170: 02000300 04000500 0E000000 FFFF8000  |................|
+; DIALOG-NEXT:   0180: 41005200 00000000 00000000 00000000  |A.R.............|
+; DIALOG-NEXT:   0190: 02000150 02000300 04000500 0F000000  |...P............|
+; DIALOG-NEXT:   01A0: FFFF8000 43000000 00000000 00000000  |....C...........|
+; DIALOG-NEXT:   01B0: 00000000 00000050 02000300 04000500  |.......P........|
+; DIALOG-NEXT:   01C0: 10000000 FFFF8500 00000000 00000000  |................|
+; DIALOG-NEXT:   01D0: 00000000 07000050 02000300 04000500  |.......P........|
+; DIALOG-NEXT:   01E0: 11000000 FFFF8000 47000000 00000000  |........G.......|
+; DIALOG-NEXT:   01F0: 00000000 00000000 03000050 02000300  |...........P....|
+; DIALOG-NEXT:   0200: 04000500 12000000 FFFF8200 49000000  |............I...|
+; DIALOG-NEXT:   0210: 00000000 00000000 00000000 01008050  |...............P|
+; DIALOG-NEXT:   0220: 02000300 04000500 13000000 FFFF8300  |................|
+; DIALOG-NEXT:   0230: 00000000 00000000 00000000 04000050  |...............P|
+; DIALOG-NEXT:   0240: 02000300 04000500 14000000 FFFF8000  |................|
+; DIALOG-NEXT:   0250: 52000000 00000000 00000000 00000000  |R...............|
+; DIALOG-NEXT:   0260: 00000050 02000300 04000500 15000000  |...P............|
+; DIALOG-NEXT:   0270: FFFF8500 00000000 00000000 00000000  |................|
+; DIALOG-NEXT:   0280: 00000050 02000300 04000500 16000000  |...P............|
+; DIALOG-NEXT:   0290: FFFF8400 00000000 00000000 00000000  |................|
+; DIALOG-NEXT:   02A0: 05000150 02000300 04000500 17000000  |...P............|
+; DIALOG-NEXT:   02B0: FFFF8000 53000000 0000               |....S.....|
+
 ; DIALOG-NEXT: )
 
 ; DIALOG-DAG: Resource type (int): 5
Index: tools/llvm-rc/ResourceScriptStmt.cpp
===================================================================
--- tools/llvm-rc/ResourceScriptStmt.cpp
+++ tools/llvm-rc/ResourceScriptStmt.cpp
@@ -124,9 +124,20 @@
     {"LTEXT", CtlInfo{0x50020000, ClsStatic, true}},
     {"CTEXT", CtlInfo{0x50020001, ClsStatic, true}},
     {"RTEXT", CtlInfo{0x50020002, ClsStatic, true}},
+    {"ICON", CtlInfo{0x50000003, ClsStatic, true}},
     {"PUSHBUTTON", CtlInfo{0x50010000, ClsButton, true}},
     {"DEFPUSHBUTTON", CtlInfo{0x50010001, ClsButton, true}},
+    {"AUTO3STATE", CtlInfo{0x50010006, ClsButton, true}},
+    {"AUTOCHECKBOX", CtlInfo{0x50010003, ClsButton, true}},
+    {"AUTORADIOBUTTON", CtlInfo{0x50000009, ClsButton, true}},
+    {"CHECKBOX", CtlInfo{0x50010002, ClsButton, true}},
+    {"GROUPBOX", CtlInfo{0x50000007, ClsButton, true}},
+    {"RADIOBUTTON", CtlInfo{0x50000004, ClsButton, true}},
+    {"STATE3", CtlInfo{0x50010005, ClsButton, true}},
     {"EDITTEXT", CtlInfo{0x50810000, ClsEdit, false}},
+    {"COMBOBOX", CtlInfo{0x50000000, ClsComboBox, false}},
+    {"LISTBOX", CtlInfo{0x50800001, ClsListBox, false}},
+    {"SCROLLBAR", CtlInfo{0x50000000, ClsScrollBar, false}},
 };
 
 raw_ostream &Control::log(raw_ostream &OS) const {