parse string table resources

TotalPE/MainFrm.cpp

@@ -135,7 +135,7 @@ void CMainFrame::BuildTreeImageList() {
 		IDI_DELAY_IMPORT, IDI_EXCEPTION, IDI_SHIELD2, IDI_RELOC,
 
 		IDI_MANIFEST, IDI_VERSION, IDI_ICONS, IDI_CURSORS, IDI_DIALOGS,
-		IDI_BITMAP, IDI_FONT, IDI_HTML,
+		IDI_BITMAP, IDI_FONT, IDI_HTML, IDI_TEXT,
 	};
 
 	for (auto icon : icons)
@@ -234,7 +234,7 @@ void CMainFrame::ParseResources(HTREEITEM hRoot) {
 
 int CMainFrame::ResourceTypeIconIndex(WORD type) {
 	static const int indices[] = {
-		-1, 3, 5, 2, -1, 4, -1,		// string table
+		-1, 3, 5, 2, -1, 4, 8,		// string table
 		-1, 6, 6, -1, -1, 3,		// group cursor
 		-1, 2, -1, 1, 4, -1, -1,	// P&P
 		-1, -1, -1, 7, 0,			// manifest

TotalPE/MessageTableView.cpp

@@ -1,18 +1,60 @@
 #include "pch.h"
 #include "MessageTableView.h"
 #include "SortHelper.h"
+#include "ClipboardHelper.h"
 
-void CMessageTableView::SetData(uint8_t const* data) {
-	m_data = data;
-	BuildItems();
+void CMessageTableView::SetMessageTableData(uint8_t const* data) {
+	uint32_t index = 0;
+	m_Items.clear();
+	m_Items.reserve(32);
+	auto res = (MESSAGE_RESOURCE_DATA const*)data;
+	for (DWORD i = 0; i < res->NumberOfBlocks; i++) {
+		auto const& block = res->Blocks[i];
+		auto entries = (MESSAGE_RESOURCE_ENTRY*)((PBYTE const)res + block.OffsetToEntries);
+		for (DWORD id = block.LowId; id <= block.HighId; id++) {
+			Item item;
+			item.Index = ++index;
+			item.Id = id;
+			if (entries->Flags & 1)
+				item.Text = (PCWSTR)CString((PCWSTR)entries->Text, entries->Length / sizeof(WCHAR));
+			else
+				item.Text = (PCWSTR)CString(CStringA((PCSTR)entries->Text, entries->Length));
+			m_Items.push_back(std::move(item));
+			entries = (MESSAGE_RESOURCE_ENTRY*)((PBYTE)entries + entries->Length);
+		}
+	}
+	m_List.SetItemCount((int)m_Items.size());
+}
+
+void CMessageTableView::SetStringTableData(uint8_t const* data, int size, UINT id) {
+	m_Items.clear();
+	m_Items.reserve(32);
+
+	UINT index = 0;
+	auto st = (WORD const*)data;
+	id = (id - 1) * 16;
+	while (size > 0) {
+		while (*st == 0) {
+			st++;
+			id++;
+			size -= 2;
+		}
+		if (size <= 0)
+			break;
+		std::wstring s((PCWSTR)(st + 1), *st);
+		m_Items.push_back({ ++index, id++, std::move(s) });
+		size -= (*st + 1) * 2;
+		st += *st + 1;
+	}
+	m_List.SetItemCount((int)m_Items.size());
 }
 
 CString CMessageTableView::GetColumnText(HWND, int row, int col) const {
 	auto& item = m_Items[row];
 	switch (col) {
 		case 0: return std::to_wstring(item.Index).c_str();
 		case 1: return std::format(L"0x{:X}", item.Id).c_str();
-		case 2: return item.Text;
+		case 2: return item.Text.c_str();
 	}
 	return CString();
 }
@@ -42,33 +84,16 @@ LRESULT CMessageTableView::OnCreate(UINT, WPARAM, LPARAM, BOOL&) {
 	cm->AddColumn(L"Index", LVCFMT_RIGHT, 80);
 	cm->AddColumn(L"ID", LVCFMT_RIGHT, 80);
 	cm->AddColumn(L"Text", LVCFMT_LEFT, 600);
-	m_List.DeleteColumn(0);
+	cm->UpdateColumns();
 	cm->DeleteColumn(0);
 
 	return 0;
 }
 
-void CMessageTableView::BuildItems() {
-	ATLASSERT(m_data);
-	auto data = m_data;
-	uint32_t index = 0;
-	m_Items.clear();
-	m_Items.reserve(32);
-	auto res = (MESSAGE_RESOURCE_DATA*)data;
-	for (DWORD i = 0; i < res->NumberOfBlocks; i++) {
-		auto& block = res->Blocks[i];
-		auto entries = (MESSAGE_RESOURCE_ENTRY*)((PBYTE)res + block.OffsetToEntries);
-		for (DWORD id = block.LowId; id <= block.HighId; id++) {
-			Item item;
-			item.Index = ++index;
-			item.Id = id;
-			if (entries->Flags & 1)
-				item.Text = CString((PCWSTR)entries->Text, entries->Length / sizeof(WCHAR));
-			else
-				item.Text = CStringA((PCSTR)entries->Text, entries->Length);
-			m_Items.push_back(std::move(item));
-			entries = (MESSAGE_RESOURCE_ENTRY*)((PBYTE)entries + entries->Length);
-		}
-	}
-	m_List.SetItemCount((int)m_Items.size());
+LRESULT CMessageTableView::OnCopy(WORD, WORD, HWND, BOOL&) const {
+	auto text = ListViewHelper::GetSelectedRowsAsString(m_List);
+	if (!text.IsEmpty())
+		ClipboardHelper::CopyText(m_hWnd, text);
+	return 0;
 }
+

TotalPE/MessageTableView.h

@@ -10,30 +10,30 @@ class CMessageTableView :
 public:
 	using CView::CView;
 
-	void SetData(uint8_t const* data);
+	void SetMessageTableData(uint8_t const* data);
+	void SetStringTableData(uint8_t const* data, int size, UINT id);
 
 	CString GetColumnText(HWND, int row, int col) const;
 	void DoSort(SortInfo const* si);
 
 	BEGIN_MSG_MAP(CMessageTableView)
+		COMMAND_ID_HANDLER(ID_EDIT_COPY, OnCopy)
 		MESSAGE_HANDLER(WM_CREATE, OnCreate)
 		CHAIN_MSG_MAP(CView<CMessageTableView>)
 		CHAIN_MSG_MAP(CVirtualListView<CMessageTableView>)
 	END_MSG_MAP()
 
 	LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+	LRESULT OnCopy(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) const;
 
 private:
 	struct Item {
 		uint32_t Index;
 		uint32_t Id;
-		CString Text;
+		std::wstring Text;
 	};
 
-	void BuildItems();
-
 	CListViewCtrl m_List;
 	SortedFilteredVector<Item> m_Items;
-	uint8_t const* m_data{ nullptr };
 };
 

TotalPE/TotalPE.rc

@@ -226,6 +226,8 @@ IDI_SHIELD2             ICON                    "res\\shield.ico"
 
 IDI_RELOC               ICON                    "res\\relocation.ico"
 
+IDI_TEXT                ICON                    "res\\text.ico"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

TotalPE/TotalPE.vcxproj

@@ -88,7 +88,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDOWS;STRICT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\WTLHelper</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
@@ -121,7 +121,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\WTLHelper</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
@@ -154,7 +154,7 @@
       <DebugInformationFormat />
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\WTLHelper</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
@@ -186,7 +186,7 @@
       <DebugInformationFormat />
       <PreprocessorDefinitions>_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\WTLHelper</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
@@ -325,6 +325,7 @@
     <Image Include="res\section.ico" />
     <Image Include="res\sections.ico" />
     <Image Include="res\shield.ico" />
+    <Image Include="res\text.ico" />
     <Image Include="res\time-import.ico" />
     <Image Include="res\TotalPE.ico" />
     <Image Include="res\version.ico" />

TotalPE/TotalPE.vcxproj.filters

@@ -357,6 +357,9 @@
     <Image Include="res\relocation.ico">
       <Filter>Resource Files\Icons</Filter>
     </Image>
+    <Image Include="res\text.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

TotalPE/ViewManager.cpp

@@ -152,7 +152,13 @@ HWND ViewManager::CreateOrGetView(TreeItemType type, HWND hParent, pe_image_full
             else if (typeName == L"Message Table") {
                 auto view = new CMessageTableView(m_pFrame, pe);
                 hView = view->DoCreate(hParent);
-                view->SetData(data.data());
+                view->SetMessageTableData(data.data());
+            }
+            else if (typeName == L"String Table") {
+                auto view = new CMessageTableView(m_pFrame, pe);
+                hView = view->DoCreate(hParent);
+                auto sid = m_pFrame->GetTreeItemText(1);
+                view->SetStringTableData(data.data(), (ULONG)data.size(), _wtoi(sid.Mid(1)));
             }
             else {
                 auto view = new CReadOnlyHexView(m_pFrame);

TotalPE/resource.h

@@ -47,6 +47,8 @@
 #define IDI_CODE                        240
 #define IDI_SHIELD2                     241
 #define IDI_RELOC                       242
+#define IDI_ICON1                       243
+#define IDI_TEXT                        243
 #define IDC_EXTLINK                     1000
 #define IDC_LINK                        1001
 #define ID_OPTIONS_ALWAYSONTOP          32775
@@ -92,7 +94,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        243
+#define _APS_NEXT_RESOURCE_VALUE        244
 #define _APS_NEXT_COMMAND_VALUE         32813
 #define _APS_NEXT_CONTROL_VALUE         1002
 #define _APS_NEXT_SYMED_VALUE           102