[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/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/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());