[LNK] # handle new GUID & missing ShowCommand value

gdt050579 · Aug 20, 2024 · d022d04 · d022d04
1 parent d621433
commit d022d04
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/Types/LNK/include/Internal.hpp b/Types/LNK/include/Internal.hpp
@@ -1635,7 +1635,8 @@ struct PropertyValueData_FMTID_InternetShortcut
     wchar_t URL[1];
 };
 
-constexpr MyGUID FMTID_InternetSite                  = { 0x000214a1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 };
+constexpr MyGUID Link_CLSID                          = { 0x00021401, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
+constexpr MyGUID FMTID_InternetSite                  = { 0x000214a1, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 constexpr MyGUID WPD_STORAGE_OBJECT_PROPERTIES_V1    = { 0x01a3057a, 0x74d6, 0x4e80, 0xbe, 0xa7, 0xdc, 0x4c, 0x21, 0x2c, 0xe5, 0x0a };
 constexpr MyGUID FMTID_SID                           = { 0x46588ae2, 0x4cbc, 0x4338, 0xbb, 0xfc, 0x13, 0x93, 0x26, 0x98, 0x6d, 0xce };
 constexpr MyGUID UNKNOWN_1                           = { 0x4d545058, 0x4fce, 0x4578, 0x95, 0xc8, 0x86, 0x98, 0xa9, 0xbc, 0x0f, 0x49 };
@@ -1798,6 +1799,7 @@ static std::string_view GetNameFromGUID(const MyGUID& guid)
     CHECK_GUID(guid, FOLDERID_AppDataFavorites);
     CHECK_GUID(guid, FOLDERID_AppDataProgramData);
 
+    CHECK_GUID(guid, Link_CLSID);
     CHECK_GUID(guid, FMTID_InternetSite);
     CHECK_GUID(guid, WPD_STORAGE_OBJECT_PROPERTIES_V1);
     CHECK_GUID(guid, FMTID_SID);
@@ -1827,4 +1829,19 @@ static std::string_view GetExtraDataSignaturesName(ExtraDataSignatures type) {
     return "?Signature";
 }
 
+static std::string_view GetShowWindowName(ShowWindow type) {
+    if (LNK::ShowWindowNames.contains(type)) {
+        return LNK::ShowWindowNames.at(type);
+    }
+
+    return "?Command";
+}
+
+static std::string_view GetShowWindowDescription(ShowWindow type) {
+    if (LNK::ShowWindowDescriptions.contains(type)) {
+        return LNK::ShowWindowDescriptions.at(type);
+    }
+
+    return "?Description";
+}
 } // namespace GView::Type::LNK
diff --git a/Types/LNK/src/Panels/Information.cpp b/Types/LNK/src/Panels/Information.cpp
@@ -66,8 +66,8 @@ void Information::UpdateGeneralInformation()
     AddDecAndHexElement("File size", "%-20s (%s)", lnk->header.filesize);
     AddDecAndHexElement("Icon Index", "%-20s (%s)", lnk->header.iconIndex);
 
-    const auto showCommandName        = LNK::ShowWindowNames.at(lnk->header.showCommand).data();
-    const auto showCommandDescription = LNK::ShowWindowDescriptions.at(lnk->header.showCommand).data();
+    const auto showCommandName        = LNK::GetShowWindowName(lnk->header.showCommand).data();
+    const auto showCommandDescription = LNK::GetShowWindowDescription(lnk->header.showCommand).data();
     const auto showCommandHex         = nf.ToString((uint32) lnk->header.showCommand, hex);
     general->AddItem({ "Show Command", ls.Format("%-20s (%s) %s", showCommandName, showCommandHex.data(), showCommandDescription) })
           .SetType(ListViewItem::Type::Emphasized_2);