This is an archive of the discontinued LLVM Phabricator instance.

Differential D61086

llvm-cvtres: Make new dupe resource error a bit friendlier
ClosedPublic

Authored by thakis on Apr 24 2019, 12:58 PM.

Details

Reviewers
mstorsjo
Commits
rG23cb79ff93c6: llvm-cvtres: Make new dupe resource error a bit friendlier
rLLD359153: llvm-cvtres: Make new dupe resource error a bit friendlier
rL359153: llvm-cvtres: Make new dupe resource error a bit friendlier
Summary

For well-known type IDs, include the name of the type.

To not duplicate the ID->name map, make llvm-readobj call this new
function as well. It has slightly different output, so this also
requires updating a few tests.

Diff Detail

Repository
rL LLVM

Event Timeline

thakis created this revision.Apr 24 2019, 12:58 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 24 2019, 12:58 PM
Herald added subscribers: rupprecht, hiraditya. · View Herald Transcript
mstorsjo accepted this revision.Apr 24 2019, 1:05 PM

LGTM

This revision is now accepted and ready to land.Apr 24 2019, 1:05 PM
Closed by commit rL359153: llvm-cvtres: Make new dupe resource error a bit friendlier (authored by nico). · Explain WhyApr 24 2019, 4:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
test/
COFF/
2 lines
2 lines
llvm/
trunk/
include/
llvm/
Object/
6 lines
lib/
Object/
41 lines
test/
tools/
llvm-cvtres/
10 lines
2 lines
8 lines
llvm-readobj/
10 lines
tools/
llvm-cvtres/
1 line
llvm-readobj/
29 lines

Diff 196547

lld/trunk/test/COFF/manifestinput.test

# REQUIRES: manifest_tool # REQUIRES: manifest_tool
# RUN: yaml2obj %p/Inputs/ret42.yaml > %t.obj # RUN: yaml2obj %p/Inputs/ret42.yaml > %t.obj
# RUN: lld-link /out:%t.exe /entry:main \ # RUN: lld-link /out:%t.exe /entry:main \
# RUN: /manifest:embed \ # RUN: /manifest:embed \
# RUN: /manifestuac:"level='requireAdministrator'" \ # RUN: /manifestuac:"level='requireAdministrator'" \
# RUN: /manifestinput:%p/Inputs/manifestinput.test %t.obj # RUN: /manifestinput:%p/Inputs/manifestinput.test %t.obj
# RUN: llvm-readobj -coff-resources -file-headers %t.exe | FileCheck %s \ # RUN: llvm-readobj -coff-resources -file-headers %t.exe | FileCheck %s \
# RUN: -check-prefix TEST_EMBED # RUN: -check-prefix TEST_EMBED
TEST_EMBED: ResourceTableRVA: 0x2000 TEST_EMBED: ResourceTableRVA: 0x2000
TEST_EMBED-NEXT: ResourceTableSize: 0x2A0 TEST_EMBED-NEXT: ResourceTableSize: 0x2A0
TEST_EMBED-DAG: Resources [ TEST_EMBED-DAG: Resources [
TEST_EMBED-NEXT: Total Number of Resources: 1 TEST_EMBED-NEXT: Total Number of Resources: 1
TEST_EMBED-DAG: Number of String Entries: 0 TEST_EMBED-DAG: Number of String Entries: 0
TEST_EMBED-NEXT: Number of ID Entries: 1 TEST_EMBED-NEXT: Number of ID Entries: 1
TEST_EMBED-NEXT: Type: kRT_MANIFEST (ID 24) [ TEST_EMBED-NEXT: Type: MANIFEST (ID 24) [
TEST_EMBED-NEXT: Table Offset: 0x18 TEST_EMBED-NEXT: Table Offset: 0x18
TEST_EMBED-NEXT: Number of String Entries: 0 TEST_EMBED-NEXT: Number of String Entries: 0
TEST_EMBED-NEXT: Number of ID Entries: 1 TEST_EMBED-NEXT: Number of ID Entries: 1
TEST_EMBED-NEXT: Name: (ID 1) [ TEST_EMBED-NEXT: Name: (ID 1) [
TEST_EMBED-NEXT: Table Offset: 0x30 TEST_EMBED-NEXT: Table Offset: 0x30
TEST_EMBED-NEXT: Number of String Entries: 0 TEST_EMBED-NEXT: Number of String Entries: 0
TEST_EMBED-NEXT: Number of ID Entries: 1 TEST_EMBED-NEXT: Number of ID Entries: 1
TEST_EMBED-NEXT: Language: (ID 1033) [ TEST_EMBED-NEXT: Language: (ID 1033) [
TEST_EMBED-NEXT: Entry Offset: 0x48 TEST_EMBED-NEXT: Entry Offset: 0x48

lld/trunk/test/COFF/resource.test

Show All 11 Lines
RESOURCE_INFO: ResourceTableRVA: 0x2000 RESOURCE_INFO: ResourceTableRVA: 0x2000
RESOURCE_INFO-NEXT: ResourceTableSize: 0x90 RESOURCE_INFO-NEXT: ResourceTableSize: 0x90
RESOURCE_INFO-DAG: Resources [ RESOURCE_INFO-DAG: Resources [
RESOURCE_INFO-NEXT: Total Number of Resources: 1 RESOURCE_INFO-NEXT: Total Number of Resources: 1
RESOURCE_INFO-NEXT: Base Table Address: 0x600 RESOURCE_INFO-NEXT: Base Table Address: 0x600
RESOURCE_INFO-DAG: Number of String Entries: 0 RESOURCE_INFO-DAG: Number of String Entries: 0
RESOURCE_INFO-NEXT: Number of ID Entries: 1 RESOURCE_INFO-NEXT: Number of ID Entries: 1
RESOURCE_INFO-NEXT: Type: kRT_STRING (ID 6) [ RESOURCE_INFO-NEXT: Type: STRINGTABLE (ID 6) [
RESOURCE_INFO-NEXT: Table Offset: 0x18 RESOURCE_INFO-NEXT: Table Offset: 0x18
RESOURCE_INFO-NEXT: Number of String Entries: 0 RESOURCE_INFO-NEXT: Number of String Entries: 0
RESOURCE_INFO-NEXT: Number of ID Entries: 1 RESOURCE_INFO-NEXT: Number of ID Entries: 1
RESOURCE_INFO-NEXT: Name: (ID 1) [ RESOURCE_INFO-NEXT: Name: (ID 1) [
RESOURCE_INFO-NEXT: Table Offset: 0x30 RESOURCE_INFO-NEXT: Table Offset: 0x30
RESOURCE_INFO-NEXT: Number of String Entries: 0 RESOURCE_INFO-NEXT: Number of String Entries: 0
RESOURCE_INFO-NEXT: Number of ID Entries: 1 RESOURCE_INFO-NEXT: Number of ID Entries: 1
RESOURCE_INFO-NEXT: Language: (ID 1033) [ RESOURCE_INFO-NEXT: Language: (ID 1033) [
Show All 16 Lines

llvm/trunk/include/llvm/Object/WindowsResource.h

Show All 31 Lines
#include "llvm/BinaryFormat/COFF.h" #include "llvm/BinaryFormat/COFF.h"
#include "llvm/Object/Binary.h" #include "llvm/Object/Binary.h"
#include "llvm/Object/Error.h" #include "llvm/Object/Error.h"
#include "llvm/Support/BinaryByteStream.h" #include "llvm/Support/BinaryByteStream.h"
#include "llvm/Support/BinaryStreamReader.h" #include "llvm/Support/BinaryStreamReader.h"
#include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/Endian.h" #include "llvm/Support/Endian.h"
#include "llvm/Support/Error.h" #include "llvm/Support/Error.h"
#include "llvm/Support/ScopedPrinter.h"
#include <map> #include <map>
namespace llvm { namespace llvm {
class raw_ostream;
class ScopedPrinter;
namespace object { namespace object {
class WindowsResource; class WindowsResource;
const size_t WIN_RES_MAGIC_SIZE = 16; const size_t WIN_RES_MAGIC_SIZE = 16;
const size_t WIN_RES_NULL_ENTRY_SIZE = 16; const size_t WIN_RES_NULL_ENTRY_SIZE = 16;
const uint32_t WIN_RES_HEADER_ALIGNMENT = 4; const uint32_t WIN_RES_HEADER_ALIGNMENT = 4;
const uint32_t WIN_RES_DATA_ALIGNMENT = 4; const uint32_t WIN_RES_DATA_ALIGNMENT = 4;
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 Linesprivate:
std::vector<std::string> InputFilenames; std::vector<std::string> InputFilenames;
}; };
Expected<std::unique_ptr<MemoryBuffer>> Expected<std::unique_ptr<MemoryBuffer>>
writeWindowsResourceCOFF(llvm::COFF::MachineTypes MachineType, writeWindowsResourceCOFF(llvm::COFF::MachineTypes MachineType,
const WindowsResourceParser &Parser); const WindowsResourceParser &Parser);
void printResourceTypeName(uint16_t TypeID, raw_ostream &OS);
} // namespace object } // namespace object
} // namespace llvm } // namespace llvm
#endif #endif

llvm/trunk/lib/Object/WindowsResource.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Object/WindowsResource.h" #include "llvm/Object/WindowsResource.h"
#include "llvm/Object/COFF.h" #include "llvm/Object/COFF.h"
#include "llvm/Support/FileOutputBuffer.h" #include "llvm/Support/FileOutputBuffer.h"
#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "llvm/Support/ScopedPrinter.h"
#include <ctime> #include <ctime>
#include <queue> #include <queue>
#include <system_error> #include <system_error>
using namespace llvm; using namespace llvm;
using namespace object; using namespace object;
namespace llvm { namespace llvm {
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 LinesError ResourceEntryRef::loadNext() {
RETURN_IF_ERROR(Reader.padToAlignment(WIN_RES_DATA_ALIGNMENT)); RETURN_IF_ERROR(Reader.padToAlignment(WIN_RES_DATA_ALIGNMENT));
return Error::success(); return Error::success();
} }
WindowsResourceParser::WindowsResourceParser() : Root(false) {} WindowsResourceParser::WindowsResourceParser() : Root(false) {}
static Error duplicateResourceError(const ResourceEntryRef& Entry, void printResourceTypeName(uint16_t TypeID, raw_ostream &OS) {
switch (TypeID) {
case 1: OS << "CURSOR (ID 1)"; break;
case 2: OS << "BITMAP (ID 2)"; break;
case 3: OS << "ICON (ID 3)"; break;
case 4: OS << "MENU (ID 4)"; break;
case 5: OS << "DIALOG (ID 5)"; break;
case 6: OS << "STRINGTABLE (ID 6)"; break;
case 7: OS << "FONTDIR (ID 7)"; break;
case 8: OS << "FONT (ID 8)"; break;
case 9: OS << "ACCELERATOR (ID 9)"; break;
case 10: OS << "RCDATA (ID 10)"; break;
case 11: OS << "MESSAGETABLE (ID 11)"; break;
case 12: OS << "GROUP_CURSOR (ID 12)"; break;
case 14: OS << "GROUP_ICON (ID 14)"; break;
case 16: OS << "VERSIONINFO (ID 16)"; break;
case 17: OS << "DLGINCLUDE (ID 17)"; break;
case 19: OS << "PLUGPLAY (ID 19)"; break;
case 20: OS << "VXD (ID 20)"; break;
case 21: OS << "ANICURSOR (ID 21)"; break;
case 22: OS << "ANIICON (ID 22)"; break;
case 23: OS << "HTML (ID 23)"; break;
case 24: OS << "MANIFEST (ID 24)"; break;
default: OS << "ID " << TypeID; break;
}
}
static Error makeDuplicateResourceError(const ResourceEntryRef &Entry,
StringRef File1, StringRef File2) { StringRef File1, StringRef File2) {
std::string Ret; std::string Ret;
raw_string_ostream OS(Ret); raw_string_ostream OS(Ret);
OS << "duplicate resource:"; OS << "duplicate resource:";
OS << " type "; OS << " type ";
if (Entry.checkTypeString()) { if (Entry.checkTypeString()) {
std::string UTF8; std::string UTF8;
if (!convertUTF16ToUTF8String(Entry.getTypeString(), UTF8)) if (!convertUTF16ToUTF8String(Entry.getTypeString(), UTF8))
UTF8 = "(failed conversion from UTF16)"; UTF8 = "(failed conversion from UTF16)";
OS << '\"' << UTF8 << '\"'; OS << '\"' << UTF8 << '\"';
} else { } else
OS << "ID " << Entry.getTypeID(); printResourceTypeName(Entry.getTypeID(), OS);
}
OS << "/name "; OS << "/name ";
if (Entry.checkNameString()) { if (Entry.checkNameString()) {
std::string UTF8; std::string UTF8;
if (!convertUTF16ToUTF8String(Entry.getNameString(), UTF8)) if (!convertUTF16ToUTF8String(Entry.getNameString(), UTF8))
UTF8 = "(failed conversion from UTF16)"; UTF8 = "(failed conversion from UTF16)";
OS << '\"' << UTF8 << '\"'; OS << '\"' << UTF8 << '\"';
} else { } else {
Show All 31 Lines while (!End) {
bool IsNewTypeString = false; bool IsNewTypeString = false;
bool IsNewNameString = false; bool IsNewNameString = false;
TreeNode* Node; TreeNode* Node;
bool IsNewNode = Root.addEntry(Entry, InputFilenames.size(), bool IsNewNode = Root.addEntry(Entry, InputFilenames.size(),
IsNewTypeString, IsNewNameString, Node); IsNewTypeString, IsNewNameString, Node);
InputFilenames.push_back(WR->getFileName()); InputFilenames.push_back(WR->getFileName());
if (!IsNewNode) if (!IsNewNode)
return duplicateResourceError(Entry, InputFilenames[Node->Origin], return makeDuplicateResourceError(Entry, InputFilenames[Node->Origin],
WR->getFileName()); WR->getFileName());
if (IsNewTypeString) if (IsNewTypeString)
StringTable.push_back(Entry.getTypeString()); StringTable.push_back(Entry.getTypeString());
if (IsNewNameString) if (IsNewNameString)
StringTable.push_back(Entry.getNameString()); StringTable.push_back(Entry.getNameString());
RETURN_IF_ERROR(Entry.moveNext(End)); RETURN_IF_ERROR(Entry.moveNext(End));
▲ Show 20 Lines • Show All 571 Lines • Show Last 20 Lines

llvm/trunk/test/tools/llvm-cvtres/combined.test

Show All 26 Lines
CHECK-NEXT: Entry Offset: 0x1D8 CHECK-NEXT: Entry Offset: 0x1D8
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_BITMAP (ID 2) [ CHECK-NEXT: Type: BITMAP (ID 2) [
CHECK-NEXT: Table Offset: 0x58 CHECK-NEXT: Table Offset: 0x58
CHECK-NEXT: Number of String Entries: 2 CHECK-NEXT: Number of String Entries: 2
CHECK-NEXT: Number of ID Entries: 0 CHECK-NEXT: Number of ID Entries: 0
CHECK-NEXT: Name: CURSOR [ CHECK-NEXT: Name: CURSOR [
CHECK-NEXT: Table Offset: 0x100 CHECK-NEXT: Table Offset: 0x100
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
Show All 12 Lines
CHECK-NEXT: Entry Offset: 0x1F8 CHECK-NEXT: Entry Offset: 0x1F8
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_MENU (ID 4) [ CHECK-NEXT: Type: MENU (ID 4) [
CHECK-NEXT: Table Offset: 0x78 CHECK-NEXT: Table Offset: 0x78
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Name: "EAT" [ CHECK-NEXT: Name: "EAT" [
CHECK-NEXT: Table Offset: 0x130 CHECK-NEXT: Table Offset: 0x130
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 3081) [ CHECK-NEXT: Language: (ID 3081) [
Show All 12 Lines
CHECK-NEXT: Entry Offset: 0x218 CHECK-NEXT: Entry Offset: 0x218
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_DIALOG (ID 5) [ CHECK-NEXT: Type: DIALOG (ID 5) [
CHECK-NEXT: Table Offset: 0x98 CHECK-NEXT: Table Offset: 0x98
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 0 CHECK-NEXT: Number of ID Entries: 0
CHECK-NEXT: Name: TESTDIALOG [ CHECK-NEXT: Name: TESTDIALOG [
CHECK-NEXT: Table Offset: 0x160 CHECK-NEXT: Table Offset: 0x160
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
CHECK-NEXT: Entry Offset: 0x228 CHECK-NEXT: Entry Offset: 0x228
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_ACCELERATOR (ID 9) [ CHECK-NEXT: Type: ACCELERATOR (ID 9) [
CHECK-NEXT: Table Offset: 0xB0 CHECK-NEXT: Table Offset: 0xB0
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Name: MYACCELERATORS [ CHECK-NEXT: Name: MYACCELERATORS [
CHECK-NEXT: Table Offset: 0x178 CHECK-NEXT: Table Offset: 0x178
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 2 CHECK-NEXT: Number of ID Entries: 2
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
Show All 19 Lines
CHECK-NEXT: Entry Offset: 0x258 CHECK-NEXT: Entry Offset: 0x258
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_RCDATA (ID 10) [ CHECK-NEXT: Type: RCDATA (ID 10) [
CHECK-NEXT: Table Offset: 0xD0 CHECK-NEXT: Table Offset: 0xD0
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 0 CHECK-NEXT: Number of ID Entries: 0
CHECK-NEXT: Name: RANDOMDAT [ CHECK-NEXT: Name: RANDOMDAT [
CHECK-NEXT: Table Offset: 0x1B0 CHECK-NEXT: Table Offset: 0x1B0
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 3 CHECK-NEXT: Number of ID Entries: 3
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
▲ Show 20 Lines • Show All 159 Lines • Show Last 20 Lines

llvm/trunk/test/tools/llvm-cvtres/duplicate.test

// Check that cvtres rejects duplicate resources. // Check that cvtres rejects duplicate resources.
// The input was generated with the following command, using the original Windows // The input was generated with the following command, using the original Windows
// rc.exe: // rc.exe:
// > rc /fo id.res /nologo id.rc // > rc /fo id.res /nologo id.rc
// > rc /fo name.res /nologo name.rc // > rc /fo name.res /nologo name.rc
RUN: rm -rf %t.dir RUN: rm -rf %t.dir
RUN: mkdir %t.dir RUN: mkdir %t.dir
RUN: cp %S/Inputs/id.res %t.dir/id1.res RUN: cp %S/Inputs/id.res %t.dir/id1.res
RUN: cp %S/Inputs/id.res %t.dir/id2.res RUN: cp %S/Inputs/id.res %t.dir/id2.res
RUN: not llvm-cvtres /machine:X86 %t.dir/id1.res %t.dir/id2.res 2>&1 | \ RUN: not llvm-cvtres /machine:X86 %t.dir/id1.res %t.dir/id2.res 2>&1 | \
RUN: FileCheck -check-prefix=ID %s RUN: FileCheck -check-prefix=ID %s
ID: duplicate resource: type ID 6/name ID 3/language 1033, in {{.*}}id1.res and in {{.*}}id2.res ID: duplicate resource: type STRINGTABLE (ID 6)/name ID 3/language 1033, in {{.*}}id1.res and in {{.*}}id2.res
RUN: cp %S/Inputs/name.res %t.dir/name1.res RUN: cp %S/Inputs/name.res %t.dir/name1.res
RUN: cp %S/Inputs/name.res %t.dir/name2.res RUN: cp %S/Inputs/name.res %t.dir/name2.res
RUN: not llvm-cvtres /machine:X86 %t.dir/name1.res %t.dir/name2.res 2>&1 | \ RUN: not llvm-cvtres /machine:X86 %t.dir/name1.res %t.dir/name2.res 2>&1 | \
RUN: FileCheck -check-prefix=NAME %s RUN: FileCheck -check-prefix=NAME %s
NAME: duplicate resource: type "TYPEFOO"/name "NAMEBAR"/language 1033, in {{.*}}name1.res and in {{.*}}name2.res NAME: duplicate resource: type "TYPEFOO"/name "NAMEBAR"/language 1033, in {{.*}}name1.res and in {{.*}}name2.res

llvm/trunk/test/tools/llvm-cvtres/object.test

Show All 25 Lines
CHECK-NEXT: Entry Offset: 0x188 CHECK-NEXT: Entry Offset: 0x188
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_BITMAP (ID 2) [ CHECK-NEXT: Type: BITMAP (ID 2) [
CHECK-NEXT: Table Offset: 0x50 CHECK-NEXT: Table Offset: 0x50
CHECK-NEXT: Number of String Entries: 2 CHECK-NEXT: Number of String Entries: 2
CHECK-NEXT: Number of ID Entries: 0 CHECK-NEXT: Number of ID Entries: 0
CHECK-NEXT: Name: CURSOR [ CHECK-NEXT: Name: CURSOR [
CHECK-NEXT: Table Offset: 0xE0 CHECK-NEXT: Table Offset: 0xE0
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
Show All 12 Lines
CHECK-NEXT: Entry Offset: 0x1A8 CHECK-NEXT: Entry Offset: 0x1A8
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_MENU (ID 4) [ CHECK-NEXT: Type: MENU (ID 4) [
CHECK-NEXT: Table Offset: 0x70 CHECK-NEXT: Table Offset: 0x70
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Name: "EAT" [ CHECK-NEXT: Name: "EAT" [
CHECK-NEXT: Table Offset: 0x110 CHECK-NEXT: Table Offset: 0x110
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 3081) [ CHECK-NEXT: Language: (ID 3081) [
Show All 12 Lines
CHECK-NEXT: Entry Offset: 0x1C8 CHECK-NEXT: Entry Offset: 0x1C8
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_DIALOG (ID 5) [ CHECK-NEXT: Type: DIALOG (ID 5) [
CHECK-NEXT: Table Offset: 0x90 CHECK-NEXT: Table Offset: 0x90
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 0 CHECK-NEXT: Number of ID Entries: 0
CHECK-NEXT: Name: TESTDIALOG [ CHECK-NEXT: Name: TESTDIALOG [
CHECK-NEXT: Table Offset: 0x140 CHECK-NEXT: Table Offset: 0x140
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
CHECK-NEXT: Entry Offset: 0x1D8 CHECK-NEXT: Entry Offset: 0x1D8
CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
CHECK-NEXT: Major Version: 0 CHECK-NEXT: Major Version: 0
CHECK-NEXT: Minor Version: 0 CHECK-NEXT: Minor Version: 0
CHECK-NEXT: Characteristics: 0 CHECK-NEXT: Characteristics: 0
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: ] CHECK-NEXT: ]
CHECK-NEXT: Type: kRT_ACCELERATOR (ID 9) [ CHECK-NEXT: Type: ACCELERATOR (ID 9) [
CHECK-NEXT: Table Offset: 0xA8 CHECK-NEXT: Table Offset: 0xA8
CHECK-NEXT: Number of String Entries: 1 CHECK-NEXT: Number of String Entries: 1
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Name: MYACCELERATORS [ CHECK-NEXT: Name: MYACCELERATORS [
CHECK-NEXT: Table Offset: 0x158 CHECK-NEXT: Table Offset: 0x158
CHECK-NEXT: Number of String Entries: 0 CHECK-NEXT: Number of String Entries: 0
CHECK-NEXT: Number of ID Entries: 1 CHECK-NEXT: Number of ID Entries: 1
CHECK-NEXT: Language: (ID 1033) [ CHECK-NEXT: Language: (ID 1033) [
▲ Show 20 Lines • Show All 143 Lines • Show Last 20 Lines

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

// Check dumping of the .rsrc section(s) // Check dumping of the .rsrc section(s)
// The input was generated with the following commands, using the original Windows // The input was generated with the following commands, using the original Windows
// rc.exe and cvtres.exe: // rc.exe and cvtres.exe:
// > rc /fo test_resource.res /nologo test_resource.rc // > rc /fo test_resource.res /nologo test_resource.rc
// > cvtres /machine:X86 /readonly /nologo /out:test_resource.o test_resource.res // > cvtres /machine:X86 /readonly /nologo /out:test_resource.o test_resource.res
RUN: llvm-readobj -coff-resources -section-data %p/Inputs/zero-string-table.obj.coff-i386 \ RUN: llvm-readobj -coff-resources -section-data %p/Inputs/zero-string-table.obj.coff-i386 \
RUN: | FileCheck %s -check-prefix ZERO RUN: | FileCheck %s -check-prefix ZERO
RUN: llvm-readobj -coff-resources %p/Inputs/resources/test_resource.obj.coff \ RUN: llvm-readobj -coff-resources %p/Inputs/resources/test_resource.obj.coff \
RUN: | FileCheck %s -check-prefix TEST_RES RUN: | FileCheck %s -check-prefix TEST_RES
ZERO: Resources [ ZERO: Resources [
ZERO-NEXT: Total Number of Resources: 1 ZERO-NEXT: Total Number of Resources: 1
ZERO-NEXT: Base Table Address: 0x188 ZERO-NEXT: Base Table Address: 0x188
ZERO-DAG: Number of String Entries: 0 ZERO-DAG: Number of String Entries: 0
ZERO-NEXT: Number of ID Entries: 1 ZERO-NEXT: Number of ID Entries: 1
ZERO-NEXT: Type: kRT_STRING (ID 6) [ ZERO-NEXT: Type: STRINGTABLE (ID 6) [
ZERO-NEXT: Table Offset: 0x18 ZERO-NEXT: Table Offset: 0x18
ZERO-NEXT: Number of String Entries: 0 ZERO-NEXT: Number of String Entries: 0
ZERO-NEXT: Number of ID Entries: 1 ZERO-NEXT: Number of ID Entries: 1
ZERO-NEXT: Name: (ID 1) [ ZERO-NEXT: Name: (ID 1) [
ZERO-NEXT: Table Offset: 0x30 ZERO-NEXT: Table Offset: 0x30
ZERO-NEXT: Number of String Entries: 0 ZERO-NEXT: Number of String Entries: 0
ZERO-NEXT: Number of ID Entries: 1 ZERO-NEXT: Number of ID Entries: 1
ZERO-NEXT: Language: (ID 1033) [ ZERO-NEXT: Language: (ID 1033) [
ZERO-NEXT: Entry Offset: 0x48 ZERO-NEXT: Entry Offset: 0x48
ZERO-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) ZERO-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
ZERO-NEXT: Major Version: 0 ZERO-NEXT: Major Version: 0
ZERO-NEXT: Minor Version: 0 ZERO-NEXT: Minor Version: 0
ZERO-NEXT: Characteristics: 0 ZERO-NEXT: Characteristics: 0
ZERO-NEXT: ] ZERO-NEXT: ]
ZERO-NEXT: ] ZERO-NEXT: ]
ZERO-NEXT: ] ZERO-NEXT: ]
TEST_RES: Resources [ TEST_RES: Resources [
TEST_RES-NEXT: Total Number of Resources: 7 TEST_RES-NEXT: Total Number of Resources: 7
TEST_RES-NEXT: Base Table Address: 0x1C0 TEST_RES-NEXT: Base Table Address: 0x1C0
TEST_RES-DAG: Number of String Entries: 0 TEST_RES-DAG: Number of String Entries: 0
TEST_RES-NEXT: Number of ID Entries: 4 TEST_RES-NEXT: Number of ID Entries: 4
TEST_RES-NEXT: Type: kRT_BITMAP (ID 2) [ TEST_RES-NEXT: Type: BITMAP (ID 2) [
TEST_RES-NEXT: Table Offset: 0x30 TEST_RES-NEXT: Table Offset: 0x30
TEST_RES-NEXT: Number of String Entries: 2 TEST_RES-NEXT: Number of String Entries: 2
TEST_RES-NEXT: Number of ID Entries: 0 TEST_RES-NEXT: Number of ID Entries: 0
TEST_RES-NEXT: Name: CURSOR [ TEST_RES-NEXT: Name: CURSOR [
TEST_RES-NEXT: Table Offset: 0xA8 TEST_RES-NEXT: Table Offset: 0xA8
TEST_RES-NEXT: Number of String Entries: 0 TEST_RES-NEXT: Number of String Entries: 0
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Language: (ID 1033) [ TEST_RES-NEXT: Language: (ID 1033) [
Show All 12 Lines
TEST_RES-NEXT: Entry Offset: 0x160 TEST_RES-NEXT: Entry Offset: 0x160
TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
TEST_RES-NEXT: Major Version: 0 TEST_RES-NEXT: Major Version: 0
TEST_RES-NEXT: Minor Version: 0 TEST_RES-NEXT: Minor Version: 0
TEST_RES-NEXT: Characteristics: 0 TEST_RES-NEXT: Characteristics: 0
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: Type: kRT_MENU (ID 4) [ TEST_RES-NEXT: Type: MENU (ID 4) [
TEST_RES-NEXT: Table Offset: 0x50 TEST_RES-NEXT: Table Offset: 0x50
TEST_RES-NEXT: Number of String Entries: 1 TEST_RES-NEXT: Number of String Entries: 1
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Name: "EAT" [ TEST_RES-NEXT: Name: "EAT" [
TEST_RES-NEXT: Table Offset: 0xD8 TEST_RES-NEXT: Table Offset: 0xD8
TEST_RES-NEXT: Number of String Entries: 0 TEST_RES-NEXT: Number of String Entries: 0
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Language: (ID 3081) [ TEST_RES-NEXT: Language: (ID 3081) [
Show All 12 Lines
TEST_RES-NEXT: Entry Offset: 0x180 TEST_RES-NEXT: Entry Offset: 0x180
TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
TEST_RES-NEXT: Major Version: 0 TEST_RES-NEXT: Major Version: 0
TEST_RES-NEXT: Minor Version: 0 TEST_RES-NEXT: Minor Version: 0
TEST_RES-NEXT: Characteristics: 0 TEST_RES-NEXT: Characteristics: 0
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: Type: kRT_DIALOG (ID 5) [ TEST_RES-NEXT: Type: DIALOG (ID 5) [
TEST_RES-NEXT: Table Offset: 0x70 TEST_RES-NEXT: Table Offset: 0x70
TEST_RES-NEXT: Number of String Entries: 1 TEST_RES-NEXT: Number of String Entries: 1
TEST_RES-NEXT: Number of ID Entries: 0 TEST_RES-NEXT: Number of ID Entries: 0
TEST_RES-NEXT: Name: TESTDIALOG [ TEST_RES-NEXT: Name: TESTDIALOG [
TEST_RES-NEXT: Table Offset: 0x108 TEST_RES-NEXT: Table Offset: 0x108
TEST_RES-NEXT: Number of String Entries: 0 TEST_RES-NEXT: Number of String Entries: 0
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Language: (ID 1033) [ TEST_RES-NEXT: Language: (ID 1033) [
TEST_RES-NEXT: Entry Offset: 0x190 TEST_RES-NEXT: Entry Offset: 0x190
TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0) TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
TEST_RES-NEXT: Major Version: 0 TEST_RES-NEXT: Major Version: 0
TEST_RES-NEXT: Minor Version: 0 TEST_RES-NEXT: Minor Version: 0
TEST_RES-NEXT: Characteristics: 0 TEST_RES-NEXT: Characteristics: 0
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: ] TEST_RES-NEXT: ]
TEST_RES-NEXT: Type: kRT_ACCELERATOR (ID 9) [ TEST_RES-NEXT: Type: ACCELERATOR (ID 9) [
TEST_RES-NEXT: Table Offset: 0x88 TEST_RES-NEXT: Table Offset: 0x88
TEST_RES-NEXT: Number of String Entries: 1 TEST_RES-NEXT: Number of String Entries: 1
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Name: MYACCELERATORS [ TEST_RES-NEXT: Name: MYACCELERATORS [
TEST_RES-NEXT: Table Offset: 0x120 TEST_RES-NEXT: Table Offset: 0x120
TEST_RES-NEXT: Number of String Entries: 0 TEST_RES-NEXT: Number of String Entries: 0
TEST_RES-NEXT: Number of ID Entries: 1 TEST_RES-NEXT: Number of ID Entries: 1
TEST_RES-NEXT: Language: (ID 1033) [ TEST_RES-NEXT: Language: (ID 1033) [
Show All 20 Lines

llvm/trunk/tools/llvm-cvtres/llvm-cvtres.cpp

Show All 18 Lines
#include "llvm/Option/Option.h" #include "llvm/Option/Option.h"
#include "llvm/Support/BinaryStreamError.h" #include "llvm/Support/BinaryStreamError.h"
#include "llvm/Support/Error.h" #include "llvm/Support/Error.h"
#include "llvm/Support/InitLLVM.h" #include "llvm/Support/InitLLVM.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h" #include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
#include "llvm/Support/ScopedPrinter.h"
#include "llvm/Support/Signals.h" #include "llvm/Support/Signals.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include <system_error> #include <system_error>
using namespace llvm; using namespace llvm;
using namespace object; using namespace object;
▲ Show 20 Lines • Show All 179 Lines • Show Last 20 Lines

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

Show All 37 Lines
#include "llvm/DebugInfo/CodeView/TypeDumpVisitor.h" #include "llvm/DebugInfo/CodeView/TypeDumpVisitor.h"
#include "llvm/DebugInfo/CodeView/TypeHashing.h" #include "llvm/DebugInfo/CodeView/TypeHashing.h"
#include "llvm/DebugInfo/CodeView/TypeIndex.h" #include "llvm/DebugInfo/CodeView/TypeIndex.h"
#include "llvm/DebugInfo/CodeView/TypeRecord.h" #include "llvm/DebugInfo/CodeView/TypeRecord.h"
#include "llvm/DebugInfo/CodeView/TypeStreamMerger.h" #include "llvm/DebugInfo/CodeView/TypeStreamMerger.h"
#include "llvm/DebugInfo/CodeView/TypeTableCollection.h" #include "llvm/DebugInfo/CodeView/TypeTableCollection.h"
#include "llvm/Object/COFF.h" #include "llvm/Object/COFF.h"
#include "llvm/Object/ObjectFile.h" #include "llvm/Object/ObjectFile.h"
#include "llvm/Object/WindowsResource.h"
#include "llvm/Support/BinaryStreamReader.h" #include "llvm/Support/BinaryStreamReader.h"
#include "llvm/Support/Casting.h" #include "llvm/Support/Casting.h"
#include "llvm/Support/Compiler.h" #include "llvm/Support/Compiler.h"
#include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/LEB128.h" #include "llvm/Support/LEB128.h"
#include "llvm/Support/ScopedPrinter.h" #include "llvm/Support/ScopedPrinter.h"
#include "llvm/Support/Win64EH.h" #include "llvm/Support/Win64EH.h"
▲ Show 20 Lines • Show All 510 Lines • ▼ Show 20 Lines
static const EnumEntry<uint8_t> FileChecksumKindNames[] = { static const EnumEntry<uint8_t> FileChecksumKindNames[] = {
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, None), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, None),
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, MD5), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, MD5),
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA1), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA1),
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA256), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA256),
}; };
static const EnumEntry<COFF::ResourceTypeID> ResourceTypeNames[]{
{"kRT_CURSOR (ID 1)", COFF::RID_Cursor},
{"kRT_BITMAP (ID 2)", COFF::RID_Bitmap},
{"kRT_ICON (ID 3)", COFF::RID_Icon},
{"kRT_MENU (ID 4)", COFF::RID_Menu},
{"kRT_DIALOG (ID 5)", COFF::RID_Dialog},
{"kRT_STRING (ID 6)", COFF::RID_String},
{"kRT_FONTDIR (ID 7)", COFF::RID_FontDir},
{"kRT_FONT (ID 8)", COFF::RID_Font},
{"kRT_ACCELERATOR (ID 9)", COFF::RID_Accelerator},
{"kRT_RCDATA (ID 10)", COFF::RID_RCData},
{"kRT_MESSAGETABLE (ID 11)", COFF::RID_MessageTable},
{"kRT_GROUP_CURSOR (ID 12)", COFF::RID_Group_Cursor},
{"kRT_GROUP_ICON (ID 14)", COFF::RID_Group_Icon},
{"kRT_VERSION (ID 16)", COFF::RID_Version},
{"kRT_DLGINCLUDE (ID 17)", COFF::RID_DLGInclude},
{"kRT_PLUGPLAY (ID 19)", COFF::RID_PlugPlay},
{"kRT_VXD (ID 20)", COFF::RID_VXD},
{"kRT_ANICURSOR (ID 21)", COFF::RID_AniCursor},
{"kRT_ANIICON (ID 22)", COFF::RID_AniIcon},
{"kRT_HTML (ID 23)", COFF::RID_HTML},
{"kRT_MANIFEST (ID 24)", COFF::RID_Manifest}};
template <typename T> template <typename T>
static std::error_code getSymbolAuxData(const COFFObjectFile *Obj, static std::error_code getSymbolAuxData(const COFFObjectFile *Obj,
COFFSymbolRef Symbol, COFFSymbolRef Symbol,
uint8_t AuxSymbolIdx, const T *&Aux) { uint8_t AuxSymbolIdx, const T *&Aux) {
ArrayRef<uint8_t> AuxData = Obj->getSymbolAuxData(Symbol); ArrayRef<uint8_t> AuxData = Obj->getSymbolAuxData(Symbol);
AuxData = AuxData.slice(AuxSymbolIdx * Obj->getSymbolTableEntrySize()); AuxData = AuxData.slice(AuxSymbolIdx * Obj->getSymbolTableEntrySize());
Aux = reinterpret_cast<const T*>(AuxData.data()); Aux = reinterpret_cast<const T*>(AuxData.data());
return readobj_error::success; return readobj_error::success;
▲ Show 20 Lines • Show All 1,197 Lines • ▼ Show 20 Lines if (i < Table.NumberOfNameEntries) {
} }
std::string EntryNameString; std::string EntryNameString;
if (!llvm::convertUTF16ToUTF8String(RawEntryNameString, EntryNameString)) if (!llvm::convertUTF16ToUTF8String(RawEntryNameString, EntryNameString))
error(object_error::parse_failed); error(object_error::parse_failed);
OS << ": "; OS << ": ";
OS << EntryNameString; OS << EntryNameString;
} else { } else {
if (Level == "Type") { if (Level == "Type") {
ScopedPrinter Printer(OS); OS << ": ";
Printer.printEnum("", Entry.Identifier.ID, printResourceTypeName(Entry.Identifier.ID, OS);
makeArrayRef(ResourceTypeNames));
IDStr = IDStr.slice(0, IDStr.find_first_of(")", 0) + 1); IDStr = IDStr.slice(0, IDStr.find_first_of(")", 0) + 1);
} else { } else {
OS << ": (ID " << Entry.Identifier.ID << ")"; OS << ": (ID " << Entry.Identifier.ID << ")";
} }
} }
Name = StringRef(IDStr); Name = StringRef(IDStr);
ListScope ResourceType(W, Level.str() + Name.str()); ListScope ResourceType(W, Level.str() + Name.str());
if (Entry.Offset.isSubDir()) { if (Entry.Offset.isSubDir()) {
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines