[llvm] r370308 - [llvm-readobj] Print the resource type textually for .res files
Martin Storsjo via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 29 01:59:31 PDT 2019
Author: mstorsjo
Date: Thu Aug 29 01:59:31 2019
New Revision: 370308
URL: http://llvm.org/viewvc/llvm-project?rev=370308&view=rev
Log:
[llvm-readobj] Print the resource type textually for .res files
This already is done when dumping resources from coff objects.
Differential Revision: https://reviews.llvm.org/D66816
Modified:
llvm/trunk/test/tools/llvm-rc/codepage.test
llvm/trunk/test/tools/llvm-rc/cpp-output.test
llvm/trunk/test/tools/llvm-rc/include-paths.test
llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test
llvm/trunk/test/tools/llvm-rc/memoryflags.test
llvm/trunk/test/tools/llvm-rc/not-expr.test
llvm/trunk/test/tools/llvm-rc/tag-accelerators.test
llvm/trunk/test/tools/llvm-rc/tag-dialog.test
llvm/trunk/test/tools/llvm-rc/tag-escape.test
llvm/trunk/test/tools/llvm-rc/tag-html.test
llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test
llvm/trunk/test/tools/llvm-rc/tag-menu.test
llvm/trunk/test/tools/llvm-rc/tag-stringtable.test
llvm/trunk/test/tools/llvm-rc/tag-user.test
llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test
llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test
llvm/trunk/test/tools/llvm-readobj/res-resources.test
llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp
Modified: llvm/trunk/test/tools/llvm-rc/codepage.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/codepage.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/codepage.test (original)
+++ llvm/trunk/test/tools/llvm-rc/codepage.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
@@ -25,7 +25,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/cpp-output.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/cpp-output.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/cpp-output.test (original)
+++ llvm/trunk/test/tools/llvm-rc/cpp-output.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/include-paths.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/include-paths.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/include-paths.test (original)
+++ llvm/trunk/test/tools/llvm-rc/include-paths.test Thu Aug 29 01:59:31 2019
@@ -27,7 +27,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test (original)
+++ llvm/trunk/test/tools/llvm-rc/memoryflags-stringtable.test Thu Aug 29 01:59:31 2019
@@ -1,15 +1,15 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/memoryflags.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/memoryflags.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/memoryflags.test (original)
+++ llvm/trunk/test/tools/llvm-rc/memoryflags.test Thu Aug 29 01:59:31 2019
@@ -1,323 +1,323 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/not-expr.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/not-expr.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/not-expr.test (original)
+++ llvm/trunk/test/tools/llvm-rc/not-expr.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-accelerators.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-accelerators.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-accelerators.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-accelerators.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
@@ -29,7 +29,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-dialog.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-dialog.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-dialog.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-dialog.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
@@ -15,7 +15,7 @@
; 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
@@ -62,7 +62,7 @@
; 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
@@ -123,7 +123,7 @@
; 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
@@ -137,7 +137,7 @@
; 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
@@ -166,7 +166,7 @@
; 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
@@ -180,7 +180,7 @@
; 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
@@ -194,7 +194,7 @@
; 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
@@ -210,7 +210,7 @@
; 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
@@ -225,7 +225,7 @@
; 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
@@ -239,7 +239,7 @@
; 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
@@ -253,7 +253,7 @@
; 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
@@ -268,7 +268,7 @@
; 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
@@ -283,7 +283,7 @@
; 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
@@ -298,7 +298,7 @@
; 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
@@ -313,7 +313,7 @@
; 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
@@ -328,7 +328,7 @@
; 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
@@ -343,7 +343,7 @@
; 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
@@ -358,7 +358,7 @@
; 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
@@ -374,7 +374,7 @@
; 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
@@ -390,7 +390,7 @@
; 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
@@ -406,7 +406,7 @@
; 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
@@ -422,7 +422,7 @@
; 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
@@ -437,7 +437,7 @@
; 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
@@ -452,7 +452,7 @@
; 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
@@ -466,7 +466,7 @@
; 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
@@ -480,7 +480,7 @@
; 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
@@ -494,7 +494,7 @@
; 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
@@ -508,7 +508,7 @@
; 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
@@ -522,7 +522,7 @@
; 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
@@ -536,7 +536,7 @@
; 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
@@ -550,7 +550,7 @@
; 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
@@ -565,7 +565,7 @@
; 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
@@ -579,7 +579,7 @@
; 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
@@ -593,7 +593,7 @@
; 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
@@ -607,7 +607,7 @@
; 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
@@ -621,7 +621,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-escape.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-escape.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-escape.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-escape.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
@@ -32,7 +32,7 @@
; 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
@@ -98,7 +98,7 @@
; 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
@@ -136,7 +136,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-html.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-html.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-html.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-html.test Thu Aug 29 01:59:31 2019
@@ -3,7 +3,7 @@
; 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
@@ -18,7 +18,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test Thu Aug 29 01:59:31 2019
@@ -4,7 +4,7 @@
; 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
@@ -23,7 +23,7 @@
; 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
@@ -37,7 +37,7 @@
; 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
@@ -56,7 +56,7 @@
; 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
@@ -70,7 +70,7 @@
; 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
@@ -89,7 +89,7 @@
; 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
@@ -108,7 +108,7 @@
; 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
@@ -127,7 +127,7 @@
; 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
@@ -146,7 +146,7 @@
; 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
@@ -162,7 +162,7 @@
; 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
@@ -181,7 +181,7 @@
; 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
@@ -195,7 +195,7 @@
; 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
@@ -214,7 +214,7 @@
; 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
@@ -233,7 +233,7 @@
; 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
@@ -252,7 +252,7 @@
; 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
@@ -271,7 +271,7 @@
; 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
@@ -287,7 +287,7 @@
; 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
@@ -305,7 +305,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-menu.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-menu.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-menu.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-menu.test Thu Aug 29 01:59:31 2019
@@ -6,7 +6,7 @@
; 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
@@ -25,7 +25,7 @@
; 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
@@ -50,7 +50,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-stringtable.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-stringtable.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-stringtable.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-stringtable.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
@@ -16,7 +16,7 @@
; 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
@@ -31,7 +31,7 @@
; 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
@@ -48,7 +48,7 @@
; 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
@@ -63,7 +63,7 @@
; 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
@@ -84,7 +84,7 @@
; 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
@@ -100,7 +100,7 @@
; 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
@@ -115,7 +115,7 @@
; 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
@@ -133,7 +133,7 @@
; 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
@@ -148,7 +148,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-user.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-user.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-user.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-user.test Thu Aug 29 01:59:31 2019
@@ -5,7 +5,7 @@
; 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
@@ -20,7 +20,7 @@
; 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
@@ -46,7 +46,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-versioninfo.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test (original)
+++ llvm/trunk/test/tools/llvm-rc/versioninfo-padding.test Thu Aug 29 01:59:31 2019
@@ -1,7 +1,7 @@
; 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
Modified: llvm/trunk/test/tools/llvm-readobj/res-resources.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/res-resources.test?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/res-resources.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/res-resources.test Thu Aug 29 01:59:31 2019
@@ -5,7 +5,7 @@
// 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
@@ -19,7 +19,7 @@
// 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
@@ -82,7 +82,7 @@
// 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
@@ -99,7 +99,7 @@
// 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
@@ -114,7 +114,7 @@
// 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
@@ -133,7 +133,7 @@
// 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
@@ -147,7 +147,7 @@
// 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
Modified: llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp?rev=370308&r1=370307&r2=370308&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/WindowsResourceDumper.cpp Thu Aug 29 01:59:31 2019
@@ -56,8 +56,12 @@ void Dumper::printEntry(const ResourceEn
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());
More information about the llvm-commits
mailing list