[02/10] [llvm-readobj] Print the resource type textually for .res files

[mstorsjo]

Summary

This already is done when dumping resources from coff objects.

[rnk]

lgtm

llvm/trunk/test/tools/llvm-rc/codepage.test

 ; RUN: llvm-rc /C 65001 /FO %t.utf8.res -- %p/Inputs/utf8.rc
 ; RUN: llvm-readobj %t.utf8.res | FileCheck %s --check-prefix=UTF8
 
-; UTF8:      Resource type (int): 6
+; UTF8:      Resource type (int): STRINGTABLE (ID 6)
 ; UTF8-NEXT: Resource name (int): 1
 ; UTF8-NEXT: Data version: 0
 ; UTF8-NEXT: Memory flags: 0x1030
 ; UTF8-NEXT: Language ID: 1033
 ; UTF8-NEXT: Version (major): 0
 ; UTF8-NEXT: Version (minor): 0
 ; UTF8-NEXT: Characteristics: 0
 ; UTF8-NEXT: Data size: 68
 ; UTF8-NEXT: Data: (
 ; UTF8-NEXT:   0000: 00000700 E500E400 F6002000 A9002000  |.......... ... .|
 ; UTF8-NEXT:   0010: 61000B00 E500E400 F6002000 A9002000  |a......... ... .|
 ; UTF8-NEXT:   0020: E500E400 F6002000 A9000000 00000000  |...... .........|
 ; UTF8-NEXT:   0030: 00000000 00000000 00000000 00000000  |................|
 ; UTF8-NEXT:   0040: 00000000                             |....|
 ; UTF8-NEXT: )
 
 ; RUN: not llvm-rc /C 65001 /FO %t.utf8-escape-narrow.res -- %p/Inputs/utf8-escape-narrow.rc 2>&1 | FileCheck %s --check-prefix UTF8_ESCAPE
 ; UTF8_ESCAPE: llvm-rc: Error in STRINGTABLE statement (ID 1):
 ; UTF8_ESCAPE-NEXT: Unable to interpret single byte (195) as UTF-8
 
 ; RUN: llvm-rc /C 1252 /FO %t.cp1252.res -- %p/Inputs/cp1252.rc
 ; RUN: llvm-readobj %t.cp1252.res | FileCheck %s --check-prefix=CP1252
 
-; CP1252:      Resource type (int): 6
+; CP1252:      Resource type (int): STRINGTABLE (ID 6)
 ; CP1252-NEXT: Resource name (int): 1
 ; CP1252-NEXT: Data version: 0
 ; CP1252-NEXT: Memory flags: 0x1030
 ; CP1252-NEXT: Language ID: 1033
 ; CP1252-NEXT: Version (major): 0
 ; CP1252-NEXT: Version (minor): 0
 ; CP1252-NEXT: Characteristics: 0
 ; CP1252-NEXT: Data size: 92
 ; CP1252-NEXT: Data: (
 ; CP1252-NEXT:   0000: 00000F00 E500E400 F6002000 A9002000  |.......... ... .|
 ; CP1252-NEXT:   0010: 92012000 E500E400 F6002000 A9002000  |.. ....... ... .|
 ; CP1252-NEXT:   0020: 92010F00 E500E400 F6002000 A9002000  |.......... ... .|
 ; CP1252-NEXT:   0030: 92012000 E500E400 F6002000 A9002000  |.. ....... ... .|
 ; CP1252-NEXT:   0040: 92010000 00000000 00000000 00000000  |................|
 ; CP1252-NEXT:   0050: 00000000 00000000 00000000           |............|
 ; CP1252-NEXT: )

llvm/trunk/test/tools/llvm-rc/cpp-output.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/cpp-output.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 6
+; CHECK:      Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 40
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000100 61000100 62000100 63000100  |....a...b...c...|
 ; CHECK-NEXT:   0010: 64000000 00000000 00000000 00000000  |d...............|
 ; CHECK-NEXT:   0020: 00000000 00000000                    |........|
 ; CHECK-NEXT: )

llvm/trunk/test/tools/llvm-rc/include-paths.test

 ; contains the resource being searched for.  Do this test last since it
 ; changes the current working directory and could affect the success or
 ; failure of other tests if run first.
 ; RUN: rm -f %t.nested-include.res
 ; RUN: cd %p/Inputs/nested
 ; RUN: llvm-rc /FO %t.nested-include.res -- %p/Inputs/include.rc
 ; RUN: llvm-readobj %t.nested-include.res | FileCheck --check-prefix=FOUND %s
 
-FOUND:      Resource type (int): 2
+FOUND:      Resource type (int): BITMAP (ID 2)
 FOUND-NEXT: Resource name (string): FOO
 FOUND-NEXT: Data version: 0
 FOUND-NEXT: Memory flags: 0x30
 FOUND-NEXT: Language ID: 1033
 FOUND-NEXT: Version (major): 0
 FOUND-NEXT: Version (minor): 0
 FOUND-NEXT: Characteristics: 0
 FOUND-NEXT: Data size: 96

llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/memoryflags-stringtable.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 6
+; CHECK:      Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 6
+; CHECK:      Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 6
+; CHECK:      Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x60

llvm/trunk/test/tools/llvm-rc/memoryflags.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/memoryflags.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 3
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 3
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 4
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 4
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 5
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 5
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 6
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 6
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 7
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 7
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 8
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 8
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 1
+; CHECK:      Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 9
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 12
+; CHECK:      Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 9
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 10
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 11
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 12
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 13
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 10
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1050
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 14
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 15
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 16
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 17
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 11
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 18
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 19
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 20
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 21
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 12
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 22
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 23
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 24
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 25
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 13
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 26
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 27
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 28
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 29
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 14
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 30
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 31
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 32
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 33
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 15
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 34
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 35
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 36
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 37
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 16
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 38
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 39
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 40
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 41
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 17
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 42
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 43
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 44
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 3
+; CHECK:      Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 45
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 14
+; CHECK:      Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 18
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 19
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x70
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 20
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 21
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x20
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 22
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 23
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 24
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 25
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 26
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 27
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 28
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 29
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x0
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 30
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x20
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 31
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x10
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 32
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 33
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x20
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 34
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x20
-; CHECK:      Resource type (int): 2
+; CHECK:      Resource type (int): BITMAP (ID 2)
 ; CHECK-NEXT: Resource name (int): 35
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030

llvm/trunk/test/tools/llvm-rc/not-expr.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/not-expr.rc
 ; RUN: llvm-readobj %t | FileCheck %s --check-prefix=NOTEXPR
 
-; NOTEXPR: Resource type (int): 5
+; NOTEXPR: Resource type (int): DIALOG (ID 5)
 ; NOTEXPR-NEXT: Resource name (string): NOT
 ; NOTEXPR-NEXT: Data version: 0
 ; NOTEXPR-NEXT: Memory flags: 0x1030
 ; NOTEXPR-NEXT: Language ID: 1033
 ; NOTEXPR-NEXT: Version (major): 0
 ; NOTEXPR-NEXT: Version (minor): 0
 ; NOTEXPR-NEXT: Characteristics: 0
 ; NOTEXPR-NEXT: Data size: 96
 ; NOTEXPR-NEXT: Data: (
 ; NOTEXPR-NEXT:   0000: 0100FFFF 04000000 F7FFFFFF 03FF00FF  |................|
 ; NOTEXPR-NEXT:   0010: 02000000 02003C00 03000000 00000000  |......<.........|
 ; NOTEXPR-NEXT:   0020: 00000000 00000000 22000050 00000A00  |........"..P....|
 ; NOTEXPR-NEXT:   0030: 00000000 00000000 FFFF8000 00000000  |................|
 ; NOTEXPR-NEXT:   0040: 00000000 00000000 01000050 00000000  |...........P....|
 ; NOTEXPR-NEXT:   0050: 00000000 01000000 FFFF8000 00000000  |................|
 ; NOTEXPR-NEXT: )

llvm/trunk/test/tools/llvm-rc/tag-accelerators.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-accelerators.rc
 ; RUN: llvm-readobj %t | FileCheck %s --check-prefix=ACCELERATORS
 
-; ACCELERATORS: Resource type (int): 9
+; ACCELERATORS: Resource type (int): ACCELERATOR (ID 9)
 ; ACCELERATORS-NEXT: Resource name (int): 1
 ; ACCELERATORS-NEXT: Data version: 0
 ; ACCELERATORS-NEXT: Memory flags: 0x30
 ; ACCELERATORS-NEXT: Language ID: 1029
 ; ACCELERATORS-NEXT: Version (major): 0
 ; ACCELERATORS-NEXT: Version (minor): 700
 ; ACCELERATORS-NEXT: Characteristics: 0
 ; ACCELERATORS-NEXT: Data size: 248

 ; ACCELERATORS-NEXT:   00A0: 01007F00 2C000000 00008000 2E000000  |....,...........|
 ; ACCELERATORS-NEXT:   00B0: 01008000 2F000000 0000FF00 31000000  |..../.......1...|
 ; ACCELERATORS-NEXT:   00C0: 0100FF00 32000000 00000001 34000000  |....2.......4...|
 ; ACCELERATORS-NEXT:   00D0: 01000001 35000000 00000100 42000000  |....5.......B...|
 ; ACCELERATORS-NEXT:   00E0: 00000100 43000000 000031D4 46000000  |....C.....1.F...|
 ; ACCELERATORS-NEXT:   00F0: 810031D4 47000000                    |..1.G...|
 ; ACCELERATORS-NEXT: )
 
-; ACCELERATORS-DAG: Resource type (int): 9
+; ACCELERATORS-DAG: Resource type (int): ACCELERATOR (ID 9)
 ; ACCELERATORS-NEXT: Resource name (int): 2
 ; ACCELERATORS-NEXT: Data version: 0
 ; ACCELERATORS-NEXT: Memory flags: 0x30
 ; ACCELERATORS-NEXT: Language ID: 1033
 ; ACCELERATORS-NEXT: Version (major): 0
 ; ACCELERATORS-NEXT: Version (minor): 0
 ; ACCELERATORS-NEXT: Characteristics: 0
 ; ACCELERATORS-NEXT: Data size: 592

llvm/trunk/test/tools/llvm-rc/tag-dialog.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-dialog.rc
 ; RUN: llvm-readobj %t | FileCheck %s --check-prefix=DIALOG
 
-; DIALOG: Resource type (int): 5
+; DIALOG: Resource type (int): DIALOG (ID 5)
 ; DIALOG-NEXT: Resource name (string): EMPTY
 ; DIALOG-NEXT: Data version: 0
 ; DIALOG-NEXT: Memory flags: 0x1030
 ; DIALOG-NEXT: Language ID: 1033
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
 ; DIALOG-NEXT: Data size: 32
 ; DIALOG-NEXT: Data: (
 ; DIALOG-NEXT:   0000: 0100FFFF 00000000 00000000 00008880  |................|
 ; DIALOG-NEXT:   0010: 00000200 03000400 05000000 00000000  |................|
 ; DIALOG-NEXT: )
 
-; DIALOG-DAG: Resource type (int): 5
+; DIALOG-DAG: Resource type (int): DIALOG (ID 5)
 ; DIALOG-NEXT: Resource name (string): ARGS
 ; DIALOG-NEXT: Data version: 0
 ; DIALOG-NEXT: Memory flags: 0x1030
 ; DIALOG-NEXT: Language ID: 1033
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
 ; DIALOG-NEXT: Data size: 552

 ; DIALOG-NEXT:   01D0: 00000000 420000C0 0A000150 CA001E00  |....B......P....|
 ; DIALOG-NEXT:   01E0: 36000B00 22000000 FFFF8000 50007500  |6...".......P.u.|
 ; DIALOG-NEXT:   01F0: 73006800 20003300 00000000 02000000  |s.h. .3.........|
 ; DIALOG-NEXT:   0200: 01000000 00000150 C8002D00 36000B00  |.......P..-.6...|
 ; DIALOG-NEXT:   0210: 23000000 FFFF8000 50007500 73006800  |#.......P.u.s.h.|
 ; DIALOG-NEXT:   0220: 20003400 00000000                    | .4.....|
 ; DIALOG-NEXT: )
 
-; DIALOG-DAG: Resource type (int): 5
+; DIALOG-DAG: Resource type (int): DIALOG (ID 5)
 ; DIALOG-NEXT: Resource name (string): TYPES
 ; DIALOG-NEXT: Data version: 0
 ; DIALOG-NEXT: Memory flags: 0x1030
 ; DIALOG-NEXT: Language ID: 1033
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
 ; DIALOG-NEXT: Data size: 778

 ; DIALOG-NEXT:   02B0: FFFF8000 53000000 00000000 00000000  |....S...........|
 ; DIALOG-NEXT:   02C0: 00000000 0A000150 02000300 04000500  |.......P........|
 ; DIALOG-NEXT:   02D0: 18000000 FFFF8000 50000000 00000000  |........P.......|
 ; DIALOG-NEXT:   02E0: 00000000 00000000 2A000050 02000300  |........*..P....|
 ; DIALOG-NEXT:   02F0: 04000500 19000000 43006C00 61007300  |........C.l.a.s.|
 ; DIALOG-NEXT:   0300: 73000000 43000000 0000               |s...C.....|
 ; DIALOG-NEXT: )
 
-; DIALOG-DAG: Resource type (int): 5
+; DIALOG-DAG: Resource type (int): DIALOG (ID 5)
 ; DIALOG-NEXT: Resource name (string): EMPTYOLD
 ; DIALOG-NEXT: Data version: 0
 ; DIALOG-NEXT: Memory flags: 0x1030
 ; DIALOG-NEXT: Language ID: 1033
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
 ; DIALOG-NEXT: Data size: 24
 ; DIALOG-NEXT: Data: (
 ; DIALOG-NEXT:   0000: 00008880 00000000 00000100 02000300  |................|
 ; DIALOG-NEXT:   0010: 04000000 00000000                    |........|
 ; DIALOG-NEXT: )
 
-; DIALOG-DAG: Resource type (int): 5
+; DIALOG-DAG: Resource type (int): DIALOG (ID 5)
 ; DIALOG-NEXT: Resource name (string): ARGSOLD
 ; DIALOG-NEXT: Data version: 0
 ; DIALOG-NEXT: Memory flags: 0x1030
 ; DIALOG-NEXT: Language ID: 1033
 ; DIALOG-NEXT: Version (major): 0
 ; DIALOG-NEXT: Version (minor): 0
 ; DIALOG-NEXT: Characteristics: 0
 ; DIALOG-NEXT: Data size: 198

 ; DIALOG-NEXT:   00B0: 24000000 1F002000 21002200 1E00FFFF  |$..... .!.".....|
 ; DIALOG-NEXT:   00C0: 81000000 0000                        |......|
 ; DIALOG-NEXT: )
 
 
 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-dialog-headers.rc
 ; RUN: llvm-readobj %t | FileCheck %s --check-prefix=HEADERS
 
-; HEADERS: Resource type (int): 5
+; HEADERS: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 1
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 00008880  |................|
 ; HEADERS-NEXT:   0010: 00000100 02000300 04000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 2
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 00008880 00000000 00000100 02000300  |................|
 ; HEADERS-NEXT:   0010: 04000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 3
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 52
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 0000C880  |................|
 ; HEADERS-NEXT:   0010: 00001027 204E3075 FF7F0000 00004D00  |...' N0u......M.|
 ; HEADERS-NEXT:   0020: 79002000 43006100 70007400 69006F00  |y. .C.a.p.t.i.o.|
 ; HEADERS-NEXT:   0030: 6E000000                             |n...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 4
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 44
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0000C880 00000000 00000080 FF7F0000  |................|
 ; HEADERS-NEXT:   0010: FF7F0000 00004D00 79002000 43006100  |......M.y. .C.a.|
 ; HEADERS-NEXT:   0020: 70007400 69006F00 6E000000           |p.t.i.o.n...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 5
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 27452301  |............'E#.|
 ; HEADERS-NEXT:   0010: 00000000 01000000 09000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 6
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 27452301 00000000 00000000 01000000  |'E#.............|
 ; HEADERS-NEXT:   0010: 09000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 7
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 42
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 40008880  |............@...|
 ; HEADERS-NEXT:   0010: 00000800 07000600 05000000 00000000  |................|
 ; HEADERS-NEXT:   0020: 32000000 00016100 0000               |2.....a...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 8
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 36
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 40008880 00000000 00000800 07000600  |@...............|
 ; HEADERS-NEXT:   0010: 05000000 00000000 32006100 61006100  |........2.a.a.a.|
 ; HEADERS-NEXT:   0020: 61000000                             |a...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 9
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 42
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 40008880  |............@...|
 ; HEADERS-NEXT:   0010: 00000800 07000600 05000000 00000000  |................|
 ; HEADERS-NEXT:   0020: 32000000 00016100 0000               |2.....a...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 10
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 36
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 40008880 00000000 00000800 07000600  |@...............|
 ; HEADERS-NEXT:   0010: 05000000 00000000 32006100 61006100  |........2.a.a.a.|
 ; HEADERS-NEXT:   0020: 61000000                             |a...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 11
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 48
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 40008880  |............@...|
 ; HEADERS-NEXT:   0010: 00000100 02000300 04000000 00000000  |................|
 ; HEADERS-NEXT:   0020: 32003300 00014600 4F004E00 54000000  |2.3...F.O.N.T...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 12
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 48
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 40008880  |............@...|
 ; HEADERS-NEXT:   0010: 00000100 02000300 04000000 00000000  |................|
 ; HEADERS-NEXT:   0020: 32003300 01014600 4F004E00 54000000  |2.3...F.O.N.T...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 13
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 48
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 40008880  |............@...|
 ; HEADERS-NEXT:   0010: 00000100 02000300 04000000 00000000  |................|
 ; HEADERS-NEXT:   0020: 32003300 01354600 4F004E00 54000000  |2.3..5F.O.N.T...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 14
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 62
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 4000C880  |............@...|
 ; HEADERS-NEXT:   0010: 00000100 01000100 01000000 00004300  |..............C.|
 ; HEADERS-NEXT:   0020: 41005000 54004900 4F004E00 00002A00  |A.P.T.I.O.N...*.|
 ; HEADERS-NEXT:   0030: 00000001 46004F00 4E005400 0000      |....F.O.N.T...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 15
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 50
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 4000C880 00000000 00000100 01000100  |@...............|
 ; HEADERS-NEXT:   0010: 01000000 00004300 41005000 54004900  |......C.A.P.T.I.|
 ; HEADERS-NEXT:   0020: 4F004E00 00002A00 46004F00 4E005400  |O.N...*.F.O.N.T.|
 ; HEADERS-NEXT:   0030: 0000                                 |..|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 16
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 62
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 4000C000  |............@...|
 ; HEADERS-NEXT:   0010: 00000200 02000200 02000000 00004300  |..............C.|
 ; HEADERS-NEXT:   0020: 41005000 54004900 4F004E00 00002A00  |A.P.T.I.O.N...*.|
 ; HEADERS-NEXT:   0030: 00000001 46004F00 4E005400 0000      |....F.O.N.T...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 17
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 50
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 4000C000 00000000 00000200 02000200  |@...............|
 ; HEADERS-NEXT:   0010: 02000000 00004300 41005000 54004900  |......C.A.P.T.I.|
 ; HEADERS-NEXT:   0020: 4F004E00 00002A00 46004F00 4E005400  |O.N...*.F.O.N.T.|
 ; HEADERS-NEXT:   0030: 0000                                 |..|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 18
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 46
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 0000C000  |................|
 ; HEADERS-NEXT:   0010: 00000300 03000300 03000000 00004300  |..............C.|
 ; HEADERS-NEXT:   0020: 41005000 54004900 4F004E00 0000      |A.P.T.I.O.N...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 19
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 38
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0000C000 00000000 00000300 03000300  |................|
 ; HEADERS-NEXT:   0010: 03000000 00004300 41005000 54004900  |......C.A.P.T.I.|
 ; HEADERS-NEXT:   0020: 4F004E00 0000                        |O.N...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 20
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 00FF00FF  |................|
 ; HEADERS-NEXT:   0010: 00000400 04000400 04000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 21
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 00FF00FF 00000000 00000400 04000400  |................|
 ; HEADERS-NEXT:   0010: 04000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 22
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 BF00FF00  |................|
 ; HEADERS-NEXT:   0010: 00000400 04000400 04000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 23
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: BF00FF00 00000000 00000400 04000400  |................|
 ; HEADERS-NEXT:   0010: 04000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 24
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 0000C000  |................|
 ; HEADERS-NEXT:   0010: 00000500 05000500 05000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 25
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0000C000 00000000 00000500 05000500  |................|
 ; HEADERS-NEXT:   0010: 05000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 26
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 05000000 00000000 00008880  |................|
 ; HEADERS-NEXT:   0010: 00000100 02000300 04000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 27
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 44
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 00000000 00008880  |................|
 ; HEADERS-NEXT:   0010: 00000500 05000500 05000000 46006F00  |............F.o.|
 ; HEADERS-NEXT:   0020: 6F006200 61007200 00000000           |o.b.a.r.....|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 28
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 26
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 00008880 00000000 00000500 05000500  |................|
 ; HEADERS-NEXT:   0010: 05000000 FFFF2A00 0000               |......*...|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 29
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 67452301 00008880  |........gE#.....|
 ; HEADERS-NEXT:   0010: 00000000 01000000 09000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 30
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 00008880 67452301 00000000 01000000  |....gE#.........|
 ; HEADERS-NEXT:   0010: 09000000 00000000                    |........|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 31
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 32
 ; HEADERS-NEXT: Data: (
 ; HEADERS-NEXT:   0000: 0100FFFF 00000000 67452301 10325476  |........gE#..2Tv|
 ; HEADERS-NEXT:   0010: 00000000 01000000 09000000 00000000  |................|
 ; HEADERS-NEXT: )
 
-; HEADERS-DAG: Resource type (int): 5
+; HEADERS-DAG: Resource type (int): DIALOG (ID 5)
 ; HEADERS-NEXT: Resource name (int): 32
 ; HEADERS-NEXT: Data version: 0
 ; HEADERS-NEXT: Memory flags: 0x1030
 ; HEADERS-NEXT: Language ID: 1033
 ; HEADERS-NEXT: Version (major): 0
 ; HEADERS-NEXT: Version (minor): 0
 ; HEADERS-NEXT: Characteristics: 0
 ; HEADERS-NEXT: Data size: 24

llvm/trunk/test/tools/llvm-rc/tag-escape.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-escape.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 4
+; CHECK:      Resource type (int): MENU (ID 4)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 304

 ; CHECK-NEXT:   00D0: 03000000 00000400 00000000 05000100  |................|
 ; CHECK-NEXT:   00E0: 09004900 49003100 49003100 31004900  |..I.I.1.I.1.1.I.|
 ; CHECK-NEXT:   00F0: 31003100 31004900 31003100 31003100  |1.1.1.I.1.1.1.1.|
 ; CHECK-NEXT:   0100: 49003100 31003100 31003100 00000000  |I.1.1.1.1.1.....|
 ; CHECK-NEXT:   0110: 06002200 22002200 5C005C00 5C000000  |..".".".\.\.\...|
 ; CHECK-NEXT:   0120: 00000700 61000000 80000800 61000000  |....a.......a...|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 4
+; CHECK-DAG:  Resource type (int): MENU (ID 4)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 116

 ; CHECK-NEXT:   0030: 23013412 34123500 01006700 00000100  |#.4.4.5...g.....|
 ; CHECK-NEXT:   0040: 08004000 00020010 00800080 30000100  |..@.........0...|
 ; CHECK-NEXT:   0050: 09004900 49024912 49924992 49923100  |..I.I.I.I.I.I.1.|
 ; CHECK-NEXT:   0060: 22002200 22005C00 5C005C00 61000000  |".".".\.\.\.a...|
 ; CHECK-NEXT:   0070: 62000000 00006300 00000000 00006400  |b.....c.......d.|
 ; CHECK-NEXT:   0080: 00006100 00006200 0000               |..a...b...|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 404

 ; CHECK-NEXT:   0140: 49003100 49003100 31004900 31003100  |I.1.I.1.1.I.1.1.|
 ; CHECK-NEXT:   0150: 31004900 31003100 31003100 49003100  |1.I.1.1.1.1.I.1.|
 ; CHECK-NEXT:   0160: 31003100 31003100 06002200 22002200  |1.1.1.1...".".".|
 ; CHECK-NEXT:   0170: 5C005C00 5C000300 61000000 62000300  |\.\.\...a...b...|
 ; CHECK-NEXT:   0180: 61000000 62000000 00000000 00000000  |a...b...........|
 ; CHECK-NEXT:   0190: 00000000                             |....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 148

llvm/trunk/test/tools/llvm-rc/tag-html.test

 ; RUN: rm -rf %t && mkdir %t && cd %t
 ; RUN: cp %p/Inputs/webpage*.html .
 ; RUN: llvm-rc /FO %t/tag-html.res -- %p/Inputs/tag-html.rc
 ; RUN: llvm-readobj %t/tag-html.res | FileCheck %s --check-prefix HTML
 
-; HTML: Resource type (int): 23
+; HTML: Resource type (int): HTML (ID 23)
 ; HTML-NEXT: Resource name (int): 100
 ; HTML-NEXT: Data version: 0
 ; HTML-NEXT: Memory flags: 0x30
 ; HTML-NEXT: Language ID: 1033
 ; HTML-NEXT: Version (major): 0
 ; HTML-NEXT: Version (minor): 0
 ; HTML-NEXT: Characteristics: 0
 ; HTML-NEXT: Data size: 45
 ; HTML-NEXT: Data: (
 ; HTML-NEXT:   0000: 3C68746D 6C3E0A20 203C626F 64793E0A  |<html>.  <body>.|
 ; HTML-NEXT:   0010: 20202020 48656C6C 6F210A20 203C2F62  |    Hello!.  </b|
 ; HTML-NEXT:   0020: 6F64793E 0A3C2F68 746D6C3E 0A        |ody>.</html>.|
 ; HTML-NEXT: )
 
-; HTML-DAG: Resource type (int): 23
+; HTML-DAG: Resource type (int): HTML (ID 23)
 ; HTML-NEXT: Resource name (string): KITTEN
 ; HTML-NEXT: Data version: 0
 ; HTML-NEXT: Memory flags: 0x30
 ; HTML-NEXT: Language ID: 1033
 ; HTML-NEXT: Version (major): 0
 ; HTML-NEXT: Version (minor): 0
 ; HTML-NEXT: Characteristics: 0
 ; HTML-NEXT: Data size: 61
 ; HTML-NEXT: Data: (
 ; HTML-NEXT:   0000: 3C212D2D 2053686F 756C6420 6E6F7420  |<!-- Should not |
 ; HTML-NEXT:   0010: 656D6265 64207468 6520696D 6167652E  |embed the image.|
 ; HTML-NEXT:   0020: 202D2D3E 0A3C696D 67207372 633D226B  | -->.<img src="k|
 ; HTML-NEXT:   0030: 69747465 6E732E62 6D70223E 0A        |ittens.bmp">.|
 ; HTML-NEXT: )

llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test

 ; RUN: rm -rf %t
 ; RUN: mkdir %t
 
 ; RUN: llvm-rc /FO %t/tag-icon-cursor.res -- %p/Inputs/tag-icon-cursor.rc
 ; RUN: llvm-readobj %t/tag-icon-cursor.res | FileCheck %s
 
-; CHECK: Resource type (int): 1
+; CHECK: Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 308
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 0A000B00 28000000 20000000 40000000  |....(... ...@...|
 ; CHECK-NEXT:   0010: 01000100 00000000 80000000 00000000  |................|
 ; CHECK-NEXT:   0020: 00000000 02000000 00000000 00000000  |................|
 ; (...)
 ; CHECK-DAG:    0110: FFFFFFFF FFFFFFFF FFFFFFFF F3CFFFFF  |................|
 ; CHECK-NEXT:   0120: F3CFFFFF FFFFFFFF FFFFFFFF FFFFFFFF  |................|
 ; CHECK-NEXT:   0130: FFFFFFFF                             |....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 12
+; CHECK-DAG:  Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 4464
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 20
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000200 01002000 40000100 01003401  |...... .@.....4.|
 ; CHECK-NEXT:   0010: 00000100                             |....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 1
+; CHECK-DAG:  Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 2220
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 01000C00 28000000 20000000 40000000  |....(... ...@...|
 ; CHECK-NEXT:   0010: 01000800 00000000 00040000 00000000  |................|
 ; CHECK-NEXT:   0020: 00000000 00010000 00000000 00000000  |................|
 ; (...)
 ; CHECK-DAG:    0880: C001FFFF F557FFFF F557FFFF F551FFFF  |.....W...W...Q..|
 ; CHECK-NEXT:   0890: C005FFFF B557FFFF F557FFFF F557FFFF  |.....W...W...W..|
 ; CHECK-NEXT:   08A0: C001FFFF F557FFFF FFFFFFFF           |.....W......|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 12
+; CHECK-DAG:  Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 4465
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 20
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000200 01002000 40000100 0800AC08  |...... .@.......|
 ; CHECK-NEXT:   0010: 00000200                             |....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 3
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 1128
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 10000000 20000000 01002000  |(....... ..... .|
 ; CHECK-NEXT:   0010: 00000000 00040000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    0440: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0450: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0460: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 4
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 2440
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 18000000 30000000 01002000  |(.......0..... .|
 ; CHECK-NEXT:   0010: 00000000 00090000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    0960: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0970: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0980: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 5
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 4264
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 20000000 40000000 01002000  |(... ...@..... .|
 ; CHECK-NEXT:   0010: 00000000 00100000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    1080: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   1090: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   10A0: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 6
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 9640
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 30000000 60000000 01002000  |(...0...`..... .|
 ; CHECK-NEXT:   0010: 00000000 00240000 C30E0000 C30E0000  |.....$..........|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    2580: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   2590: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   25A0: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 14
+; CHECK-DAG:  Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 100
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 62
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000100 04001010 00000100 20006804  |............ .h.|
 ; CHECK-NEXT:   0010: 00000300 18180000 01002000 88090000  |.......... .....|
 ; CHECK-NEXT:   0020: 04002020 00000100 2000A810 00000500  |..  .... .......|
 ; CHECK-NEXT:   0030: 30300000 01002000 A8250000 0600      |00.... ..%....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 1
+; CHECK-DAG:  Resource type (int): CURSOR (ID 1)
 ; CHECK-NEXT: Resource name (int): 7
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 4268
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 0D000600 28000000 20000000 40000000  |....(... ...@...|
 ; CHECK-NEXT:   0010: 01002000 00000000 00100000 00000000  |.. .............|
 ; CHECK-NEXT:   0020: 00000000 00000000 00000000 00000000  |................|
 ; (...)
 ; CHECK-DAG:    1080: E027FFFF C3F3FFFF FFFFFFFF FFFFFFFF  |.'..............|
 ; CHECK-NEXT:   1090: FFFFFFFF F3CFFFFF F3CFFFFF FFFFFFFF  |................|
 ; CHECK-NEXT:   10A0: FFFFFFFF FFFFFFFF FFFFFFFF           |............|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 12
+; CHECK-DAG:  Resource type (int): GROUP_CURSOR (ID 12)
 ; CHECK-NEXT: Resource name (int): 4466
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 20
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000200 01002000 40000100 2000AC10  |...... .@... ...|
 ; CHECK-NEXT:   0010: 00000700                             |....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 8
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 1128
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 10000000 20000000 01002000  |(....... ..... .|
 ; CHECK-NEXT:   0010: 00000000 00040000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    0440: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0450: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0460: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 9
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 2440
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 18000000 30000000 01002000  |(.......0..... .|
 ; CHECK-NEXT:   0010: 00000000 00090000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    0960: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0970: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0980: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 10
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 4264
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 20000000 40000000 01002000  |(... ...@..... .|
 ; CHECK-NEXT:   0010: 00000000 00100000 C30E0000 C30E0000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    1080: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   1090: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   10A0: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 11
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 9640
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 28000000 30000000 60000000 01002000  |(...0...`..... .|
 ; CHECK-NEXT:   0010: 00000000 00240000 C30E0000 C30E0000  |.....$..........|
 ; CHECK-NEXT:   0020: 00000000 00000000 FFFFFFFF FFFFFFFF  |................|
 ; (...)
 ; CHECK-DAG:    2580: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   2590: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   25A0: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 14
+; CHECK-DAG:  Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 100
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 62
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000100 04001010 00000100 20006804  |............ .h.|
 ; CHECK-NEXT:   0010: 00000800 18180000 01002000 88090000  |.......... .....|
 ; CHECK-NEXT:   0020: 09002020 00000100 2000A810 00000A00  |..  .... .......|
 ; CHECK-NEXT:   0030: 30300000 01002000 A8250000 0B00      |00.... ..%....|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 3
+; CHECK-DAG:  Resource type (int): ICON (ID 3)
 ; CHECK-NEXT: Resource name (int): 12
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 82
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 89504E47 0D0A1A0A 0000000D 49484452  |.PNG........IHDR|
 ; CHECK-NEXT:   0010: 00000010 00000010 08060000 001FF3FF  |................|
 ; CHECK-NEXT:   0020: 61000000 19494441 5438CB63 FC0F040C  |a....IDAT8.c....|
 ; CHECK-NEXT:   0030: 1400C651 03460D18 3560B818 0000251F  |...Q.F..5`....%.|
 ; CHECK-NEXT:   0040: 3FD1D6DC 546E0000 00004945 4E44AE42  |?...Tn....IEND.B|
 ; CHECK-NEXT:   0050: 6082                                 |`.|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 14
+; CHECK-DAG:  Resource type (int): GROUP_ICON (ID 14)
 ; CHECK-NEXT: Resource name (int): 100
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 20

llvm/trunk/test/tools/llvm-rc/tag-menu.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-menu.rc
 ; RUN: llvm-readobj %t | FileCheck %s --check-prefix=MENU
 
 ; Test running llvm-rc without an explicit output file.
 ; RUN: cp %p/Inputs/tag-menu.rc %t.implicit.rc
 ; RUN: llvm-rc -- %t.implicit.rc
 ; RUN: llvm-readobj %t.implicit.res | FileCheck --check-prefix=MENU %s
 
-; MENU: Resource type (int): 4
+; MENU: Resource type (int): MENU (ID 4)
 ; MENU-NEXT: Resource name (string): CHECKRECURSION
 ; MENU-NEXT: Data version: 0
 ; MENU-NEXT: Memory flags: 0x1030
 ; MENU-NEXT: Language ID: 1033
 ; MENU-NEXT: Version (major): 0
 ; MENU-NEXT: Version (minor): 0
 ; MENU-NEXT: Characteristics: 0
 ; MENU-NEXT: Data size: 102
 ; MENU-NEXT: Data: (
 ; MENU-NEXT:   0000: 00000000 90004100 00001000 42000000  |......A.....B...|
 ; MENU-NEXT:   0010: 00000100 61000000 00000200 62000000  |....a.......b...|
 ; MENU-NEXT:   0020: 00000300 63000000 90004300 00009000  |....c.....C.....|
 ; MENU-NEXT:   0030: 44000000 90004500 00009000 46000000  |D.....E.....F...|
 ; MENU-NEXT:   0040: 90004700 00009000 48000000 90004900  |..G.....H.....I.|
 ; MENU-NEXT:   0050: 00008000 2EDF6400 00008000 255B6500  |......d.....%[e.|
 ; MENU-NEXT:   0060: 66006700 0000                        |f.g...|
 ; MENU-NEXT: )
 
-; MENU-DAG: Resource type (int): 4
+; MENU-DAG: Resource type (int): MENU (ID 4)
 ; MENU-NEXT: Resource name (string): CHECKFLAGS
 ; MENU-NEXT: Data version: 0
 ; MENU-NEXT: Memory flags: 0x1030
 ; MENU-NEXT: Language ID: 1033
 ; MENU-NEXT: Version (major): 0
 ; MENU-NEXT: Version (minor): 0
 ; MENU-NEXT: Characteristics: 0
 ; MENU-NEXT: Data size: 202
 ; MENU-NEXT: Data: (
 ; MENU-NEXT:   0000: 00000000 08000100 61000000 01000200  |........a.......|
 ; MENU-NEXT:   0010: 62000000 00400300 63000000 02000400  |b....@..c.......|
 ; MENU-NEXT:   0020: 64000000 20000500 65000000 40000600  |d... ...e...@...|
 ; MENU-NEXT:   0030: 66000000 0A000700 61006400 00000000  |f.......a.d.....|
 ; MENU-NEXT:   0040: 00000000 18004100 00008000 64007800  |......A.....d.x.|
 ; MENU-NEXT:   0050: 00001100 42000000 80006500 78000000  |....B.....e.x...|
 ; MENU-NEXT:   0060: 10404300 00008000 66007800 00001200  |.@C.....f.x.....|
 ; MENU-NEXT:   0070: 44000000 80006700 78000000 30004500  |D.....g.x...0.E.|
 ; MENU-NEXT:   0080: 00008000 68007800 00005000 46000000  |....h.x...P.F...|
 ; MENU-NEXT:   0090: 80006900 78000000 31404700 0000DA40  |..i.x...1@G....@|
 ; MENU-NEXT:   00A0: 48000000 00000000 00002200 6A007800  |H.........".j.x.|
 ; MENU-NEXT:   00B0: 00008000 00000000 EB400800 61006200  |.........@..a.b.|
 ; MENU-NEXT:   00C0: 63006400 65006600 0000               |c.d.e.f...|
 ; MENU-NEXT: )
 
-; MENU-DAG: Resource type (int): 4
+; MENU-DAG: Resource type (int): MENU (ID 4)
 ; MENU-NEXT: Resource name (string): CHECKOPTS
 ; MENU-NEXT: Data version: 0
 ; MENU-NEXT: Memory flags: 0x1030
 ; MENU-NEXT: Language ID: 1025
 ; MENU-NEXT: Version (major): 0
 ; MENU-NEXT: Version (minor): 128
 ; MENU-NEXT: Characteristics: 500
 ; MENU-NEXT: Data size: 164

llvm/trunk/test/tools/llvm-rc/tag-stringtable.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-stringtable-basic.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 6
+; CHECK:      Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 32
 ; CHECK-NEXT: Characteristics: 50
 ; CHECK-NEXT: Data size: 40
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 01006100 01006200 01006300 01006400  |..a...b...c...d.|
 ; CHECK-NEXT:   0010: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 40
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 02006200 62000200 63006300 00000000  |..b.b...c.c.....|
 ; CHECK-NEXT:   0010: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0020: 00000000 00000000                    |........|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 2
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 7172
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 100
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 80
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 05006800 65006C00 6C006F00 05007700  |..h.e.l.l.o...w.|
 ; CHECK-NEXT:   0010: 6F007200 6C006400 00000000 00000000  |o.r.l.d.........|
 ; CHECK-NEXT:   0020: 00000E00 73006F00 6D006500 74006800  |....s.o.m.e.t.h.|
 ; CHECK-NEXT:   0030: 69006E00 67002000 65006C00 73006500  |i.n.g. .e.l.s.e.|
 ; CHECK-NEXT:   0040: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 3
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 50
 ; CHECK-NEXT: Characteristics: 50
 ; CHECK-NEXT: Data size: 38
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 03006300 63006300 00000000 00000000  |..c.c.c.........|
 ; CHECK-NEXT:   0010: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0020: 00000000 0000                        |......|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 6
+; CHECK-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; CHECK-NEXT: Resource name (int): 4096
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 7172
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 101
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 74
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000000 00000000 00000000 00000000  |................|
 ; CHECK-NEXT:   0010: 00000C00 6C006100 72006700 65002000  |....l.a.r.g.e. .|
 ; CHECK-NEXT:   0020: 6E007500 6D006200 65007200 00000000  |n.u.m.b.e.r.....|
 ; CHECK-NEXT:   0030: 00000000 00000900 6D006900 6E007500  |........m.i.n.u.|
 ; CHECK-NEXT:   0040: 73002000 6F006E00 6500               |s. .o.n.e.|
 ; CHECK-NEXT: )
 
 
 ; RUN: llvm-rc /N /FO %t0 -- %p/Inputs/tag-stringtable-basic.rc
 ; RUN: llvm-readobj %t0 | FileCheck %s --check-prefix=NULL
 
-; NULL:      Resource type (int): 6
+; NULL:      Resource type (int): STRINGTABLE (ID 6)
 ; NULL-NEXT: Resource name (int): 1
 ; NULL-NEXT: Data version: 0
 ; NULL-NEXT: Memory flags: 0x1030
 ; NULL-NEXT: Language ID: 1033
 ; NULL-NEXT: Version (major): 0
 ; NULL-NEXT: Version (minor): 32
 ; NULL-NEXT: Characteristics: 50
 ; NULL-NEXT: Data size: 52
 ; NULL-NEXT: Data: (
 ; NULL-NEXT:   0000: 02006100 00000200 62000000 02006300  |..a.....b.....c.|
 ; NULL-NEXT:   0010: 00000200 64000000 01000000 00000000  |....d...........|
 ; NULL-NEXT:   0020: 00000100 00000000 00000000 00000000  |................|
 ; NULL-NEXT:   0030: 00000000                             |....|
 ; NULL-NEXT: )
 
-; NULL-DAG:  Resource type (int): 6
+; NULL-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; NULL-NEXT: Resource name (int): 2
 ; NULL-NEXT: Data version: 0
 ; NULL-NEXT: Memory flags: 0x1030
 ; NULL-NEXT: Language ID: 1033
 ; NULL-NEXT: Version (major): 0
 ; NULL-NEXT: Version (minor): 0
 ; NULL-NEXT: Characteristics: 0
 ; NULL-NEXT: Data size: 44
 ; NULL-NEXT: Data: (
 ; NULL-NEXT:   0000: 03006200 62000000 03006300 63000000  |..b.b.....c.c...|
 ; NULL-NEXT:   0010: 00000000 00000000 00000000 00000000  |................|
 ; NULL-NEXT:   0020: 00000000 00000000 00000000           |............|
 ; NULL-NEXT: )
 
-; NULL-DAG:  Resource type (int): 6
+; NULL-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; NULL-NEXT: Resource name (int): 2
 ; NULL-NEXT: Data version: 0
 ; NULL-NEXT: Memory flags: 0x1030
 ; NULL-NEXT: Language ID: 7172
 ; NULL-NEXT: Version (major): 0
 ; NULL-NEXT: Version (minor): 100
 ; NULL-NEXT: Characteristics: 0
 ; NULL-NEXT: Data size: 86
 ; NULL-NEXT: Data: (
 ; NULL-NEXT:   0000: 06006800 65006C00 6C006F00 00000600  |..h.e.l.l.o.....|
 ; NULL-NEXT:   0010: 77006F00 72006C00 64000000 00000000  |w.o.r.l.d.......|
 ; NULL-NEXT:   0020: 00000000 00000F00 73006F00 6D006500  |........s.o.m.e.|
 ; NULL-NEXT:   0030: 74006800 69006E00 67002000 65006C00  |t.h.i.n.g. .e.l.|
 ; NULL-NEXT:   0040: 73006500 00000000 00000000 00000000  |s.e.............|
 ; NULL-NEXT:   0050: 00000000 0000                        |......|
 ; NULL-NEXT: )
 
-; NULL-DAG:  Resource type (int): 6
+; NULL-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; NULL-NEXT: Resource name (int): 3
 ; NULL-NEXT: Data version: 0
 ; NULL-NEXT: Memory flags: 0x1030
 ; NULL-NEXT: Language ID: 1033
 ; NULL-NEXT: Version (major): 0
 ; NULL-NEXT: Version (minor): 50
 ; NULL-NEXT: Characteristics: 50
 ; NULL-NEXT: Data size: 40
 ; NULL-NEXT: Data: (
 ; NULL-NEXT:   0000: 04006300 63006300 00000000 00000000  |..c.c.c.........|
 ; NULL-NEXT:   0010: 00000000 00000000 00000000 00000000  |................|
 ; NULL-NEXT:   0020: 00000000 00000000                    |........|
 ; NULL-NEXT: )
 
-; NULL-DAG:  Resource type (int): 6
+; NULL-DAG:  Resource type (int): STRINGTABLE (ID 6)
 ; NULL-NEXT: Resource name (int): 4096
 ; NULL-NEXT: Data version: 0
 ; NULL-NEXT: Memory flags: 0x1030
 ; NULL-NEXT: Language ID: 7172
 ; NULL-NEXT: Version (major): 0
 ; NULL-NEXT: Version (minor): 101
 ; NULL-NEXT: Characteristics: 0
 ; NULL-NEXT: Data size: 78

llvm/trunk/test/tools/llvm-rc/tag-user.test

 ; RUN: rm -rf %t
 ; RUN: mkdir %t
 ; RUN: cd %t
 ; RUN: cp %p/Inputs/bitmap.bmp .
 ; RUN: llvm-rc /FO %t/tag-user.res -- %p/Inputs/tag-user.rc
 ; RUN: llvm-readobj %t/tag-user.res | FileCheck %s
 
-; CHECK:      Resource type (int): 500
+; CHECK:      Resource type (int): ID 500
 ; CHECK-NEXT: Resource name (int): 500
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 38
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 01000200 03000400 05006461 74617700  |..........dataw.|
 ; CHECK-NEXT:   0010: 69006400 65002000 64006100 74006100  |i.d.e. .d.a.t.a.|
 ; CHECK-NEXT:   0020: CDAB01EF CDAB                        |......|
 ; CHECK-NEXT: )
 
-; CHECK-DAG:  Resource type (int): 10
+; CHECK-DAG:  Resource type (int): RCDATA (ID 10)
 ; CHECK-NEXT: Resource name (int): 501
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 38

 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 0
 ; CHECK-NEXT: Data:: ()
 
-; CHECK-DAG:  Resource type (int): 600
+; CHECK-DAG:  Resource type (int): ID 600
 ; CHECK-NEXT: Resource name (int): 600
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 110

llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-versioninfo.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 16
+; CHECK:      Resource type (int): VERSIONINFO (ID 16)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 672

llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/versioninfo-padding.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
-; CHECK:      Resource type (int): 16
+; CHECK:      Resource type (int): VERSIONINFO (ID 16)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 294

llvm/trunk/test/tools/llvm-readobj/res-resources.test

 // Check dumping of the resources stored in .res files.
 // The input was generated with the following commands, using the original Windows
 // rc.exe:
 // > rc /fo test_resource.res /nologo test_resource.rc
 
 // RUN: llvm-readobj %p/Inputs/resources/test_resource.res | FileCheck %s
 
-// CHECK:  Resource type (int): 9
+// CHECK:  Resource type (int): ACCELERATOR (ID 9)
 // CHECK-NEXT:  Resource name (string): MYACCELERATORS
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x30
 // CHECK-NEXT:  Language ID: 1033
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 24
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 11000300 E7030000 0D004400 4C040000  |..........D.L...|
 // CHECK-NEXT:    0010: 82001200 BC010000                    |........|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 2
+// CHECK-DAG:  Resource type (int): BITMAP (ID 2)
 // CHECK-NEXT:  Resource name (string): CURSOR
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x30
 // CHECK-NEXT:  Language ID: 1033
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 808

 // CHECK-NEXT:    02D0: FFFFFFFF C8C8C8C5 C5C5FFFF FFFFFFFF  |................|
 // CHECK-NEXT:    02E0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF  |................|
 // CHECK-NEXT:    02F0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF  |................|
 // CHECK-NEXT:    0300: FFFFFFFF CBCBCBFF FFFFFFFF FFFFFFFF  |................|
 // CHECK-NEXT:    0310: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF  |................|
 // CHECK-NEXT:    0320: FFFFFFFF FFFFFFFF                    |........|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 2
+// CHECK-DAG:  Resource type (int): BITMAP (ID 2)
 // CHECK-NEXT:  Resource name (string): OKAY
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x30
 // CHECK-NEXT:  Language ID: 1033
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 808
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 28000000 10000000 10000000 01001800  |(...............|
 // CHECK-NEXT:    0010: 00000000 00030000 C40E0000 C40E0000  |................|
 // (...)
 // CHECK-DAG:     0310: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF  |................|
 // CHECK-NEXT:    0320: FFFFFFFF FFFFFFFF                    |........|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 4
+// CHECK-DAG:  Resource type (int): MENU (ID 4)
 // CHECK-NEXT:  Resource name (int): 14432
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x1030
 // CHECK-NEXT:  Language ID: 2052
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 46
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 00000000 00006400 79007500 00000000  |......d.y.u.....|
 // CHECK-NEXT:    0010: 65007300 68006100 6C006100 00008000  |e.s.h.a.l.a.....|
 // CHECK-NEXT:    0020: 66006B00 61006F00 79006100 0000      |f.k.a.o.y.a...|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 5
+// CHECK-DAG:  Resource type (int): DIALOG (ID 5)
 // CHECK-NEXT:  Resource name (string): TESTDIALOG
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x1030
 // CHECK-NEXT:  Language ID: 1033
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 108
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 0000C080 00000000 02000A00 0A00C800  |................|
 // CHECK-NEXT:    0010: 2C010000 00005400 65007300 74000000  |,.....T.e.s.t...|
 // CHECK-NEXT:    0020: 01000250 00000000 0A000A00 E6000E00  |...P............|
 // CHECK-NEXT:    0030: 0100FFFF 82004300 6F006E00 74006900  |......C.o.n.t.i.|
 // CHECK-NEXT:    0040: 6E007500 65003A00 00000000 00000150  |n.u.e.:........P|
 // CHECK-NEXT:    0050: 00000000 42008600 A1000D00 0200FFFF  |....B...........|
 // CHECK-NEXT:    0060: 80002600 4F004B00 00000000           |..&.O.K.....|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 9
+// CHECK-DAG:  Resource type (int): ACCELERATOR (ID 9)
 // CHECK-NEXT:  Resource name (int): 12
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x30
 // CHECK-NEXT:  Language ID: 1033
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 24
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 11005800 A4000000 0D004800 2E160000  |..X.......H.....|
 // CHECK-NEXT:    0010: 82001200 BC010000                    |........|
 // CHECK-NEXT:  )
 
-// CHECK-DAG:  Resource type (int): 4
+// CHECK-DAG:  Resource type (int): MENU (ID 4)
 // CHECK-NEXT:  Resource name (string): "EAT"
 // CHECK-NEXT:  Data version: 0
 // CHECK-NEXT:  Memory flags: 0x1030
 // CHECK-NEXT:  Language ID: 3081
 // CHECK-NEXT:  Version (major): 0
 // CHECK-NEXT:  Version (minor): 0
 // CHECK-NEXT:  Characteristics: 0
 // CHECK-NEXT:  Data size: 48
 // CHECK-NEXT:  Data: (
 // CHECK-NEXT:    0000: 00000000 00006400 66006900 73006800  |......d.f.i.s.h.|
 // CHECK-NEXT:    0010: 00000000 65007300 61006C00 61006400  |....e.s.a.l.a.d.|
 // CHECK-NEXT:    0020: 00008000 66006400 75006300 6B000000  |....f.d.u.c.k...|
 // CHECK-NEXT:  )

llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp

Error Dumper::printData() {
   }
   return Error::success();
 }
 
 void Dumper::printEntry(const ResourceEntryRef &Ref) {
   if (Ref.checkTypeString()) {
     auto NarrowStr = stripUTF16(Ref.getTypeString());
     SW.printString("Resource type (string)", NarrowStr);
-  } else
-    SW.printNumber("Resource type (int)", Ref.getTypeID());
+  } else {
+    SmallString<20> IDStr;
+    raw_svector_ostream OS(IDStr);
+    printResourceTypeName(Ref.getTypeID(), OS);
+    SW.printString("Resource type (int)", IDStr);
+  }
 
   if (Ref.checkNameString()) {
     auto NarrowStr = stripUTF16(Ref.getNameString());
     SW.printString("Resource name (string)", NarrowStr);
   } else
     SW.printNumber("Resource name (int)", Ref.getNameID());
 
   SW.printNumber("Data version", Ref.getDataVersion());