jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 07:58:22 +08:00
Code Issues Projects Releases Wiki Activity

Display non-ASCII-named FPT partition table entry names as hex (fixing #215)

Browse Source
This commit is contained in:
Nikolaj Schlej 2020-11-22 18:01:44 -08:00
parent 5967865028
commit 115d338a70
4 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
UEFITool/Info.plist
View File

@ -2,32 +2,32 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>NSPrincipalClass</key> <key>CFBundleDocumentTypes</key>
<string>NSApplication</string> <array>
<key>CFBundleIconFile</key> <dict>
<string>uefitool</string> <key>CFBundleTypeExtensions</key>
<key>CFBundlePackageType</key> <array>
<string>APPL</string> <string>*</string>
<key>CFBundleGetInfoString</key> </array>
<string>UEFITool NE</string> <key>CFBundleTypeRole</key>
<key>CFBundleSignature</key> <string>Viewer</string>
<string>????</string> <key>LSHandlerRank</key>
<key>CFBundleExecutable</key> <string>None</string>
<string>UEFITool</string> </dict>
<key>CFBundleIdentifier</key> </array>
<string>org.longsoft.UEFITool</string> <key>CFBundleExecutable</key>
<key>CFBundleDocumentTypes</key> <string>UEFITool</string>
<array> <key>CFBundleGetInfoString</key>
<dict> <string>UEFITool NE</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleIconFile</key>
<array> <string>uefitool</string>
<string>*</string> <key>CFBundleIdentifier</key>
</array> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleTypeRole</key> <key>CFBundlePackageType</key>
<string>Viewer</string> <string>APPL</string>
<key>LSHandlerRank</key> <key>CFBundleSignature</key>
<string>None</string> <string>????</string>
</dict> <key>NSPrincipalClass</key>
</array> <string>NSApplication</string>
</dict> </dict>
</plist> </plist>

4
common/meparser.cpp
View File

@ -171,7 +171,7 @@ USTATUS MeParser::parseFptRegion(const UByteArray & region, const UModelIndex &
const FPT_HEADER_ENTRY* ptEntry = firstPtEntry + i; const FPT_HEADER_ENTRY* ptEntry = firstPtEntry + i;
// Get info // Get info
name = usprintf("%c%c%c%c", ptEntry->Name[0], ptEntry->Name[1], ptEntry->Name[2], ptEntry->Name[3]); name = visibleAsciiOrHex((UINT8*)ptEntry->Name, 4);
info = usprintf("Full size: %Xh (%u)\nPartition offset: %Xh\nPartition length: %Xh\nPartition type: %02Xh", info = usprintf("Full size: %Xh (%u)\nPartition offset: %Xh\nPartition length: %Xh\nPartition type: %02Xh",
sizeof(FPT_HEADER_ENTRY), sizeof(FPT_HEADER_ENTRY), sizeof(FPT_HEADER_ENTRY), sizeof(FPT_HEADER_ENTRY),
ptEntry->Offset, ptEntry->Offset,
@ -275,7 +275,7 @@ make_partition_table_consistent:
if (partitions[i].type == Types::FptPartition) { if (partitions[i].type == Types::FptPartition) {
UModelIndex partitionIndex; UModelIndex partitionIndex;
// Get info // Get info
name = usprintf("%c%c%c%c", partitions[i].ptEntry.Name[0], partitions[i].ptEntry.Name[1], partitions[i].ptEntry.Name[2], partitions[i].ptEntry.Name[3]); name = visibleAsciiOrHex((UINT8*) partitions[i].ptEntry.Name, 4);
info = usprintf("Full size: %Xh (%u)\nPartition type: %02Xh\n", info = usprintf("Full size: %Xh (%u)\nPartition type: %02Xh\n",
partition.size(), partition.size(), partition.size(), partition.size(),
partitions[i].ptEntry.Type); partitions[i].ptEntry.Type);

26
common/utility.cpp
View File

@ -23,6 +23,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "LZMA/LzmaCompress.h" #include "LZMA/LzmaCompress.h"
#include "LZMA/LzmaDecompress.h" #include "LZMA/LzmaDecompress.h"
// Returns bytes as string when all bytes are ascii visible, hex representation otherwise
UString visibleAsciiOrHex(UINT8* bytes, UINT32 length)
{
bool ascii = true;
UString asciiString;
UString hexString;
for (UINT32 i = 0; i < length; i++) {
hexString += usprintf("%02X", bytes[i]);
if (bytes[i] < '\x20' || bytes[i] > '\x7E') { // Explicit ascii codes to avoid locale dependency
ascii = false;
}
if (ascii) {
asciiString += usprintf("%c", bytes[i]);
}
}
if (ascii) {
return asciiString;
}
return hexString;
}
// Returns unique name string based for tree item // Returns unique name string based for tree item
UString uniqueItemName(const UModelIndex & index) UString uniqueItemName(const UModelIndex & index)
{ {

3
common/utility.h
View File

@ -23,6 +23,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "treemodel.h" #include "treemodel.h"
#include "parsingdata.h" #include "parsingdata.h"
// Returns bytes as string when all bytes are ascii visible, hex representation otherwise
UString visibleAsciiOrHex(UINT8* bytes, UINT32 length);
// Returns unique name for tree item // Returns unique name for tree item
UString uniqueItemName(const UModelIndex & index); UString uniqueItemName(const UModelIndex & index);