Latest ListEx adaptation. Slow files loading due to the HexCtrl's Get…

…WndHandle method is fixed. This method by default did create requested dialog window, now it doesn't. g_vecHexDlgs from vector to plain array. Copyright year bumping.
jovibor · Jan 10, 2024 · c97bdc1 · c97bdc1
1 parent 588c3e9
commit c97bdc1
Show file tree

Hide file tree

Showing 26 changed files with 114 additions and 126 deletions.
diff --git a/Pepper/CChildFrm.cpp b/Pepper/CChildFrm.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <cmath>
 
+import Utility;
+
 IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWndEx)
 
 BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWndEx)

diff --git a/Pepper/CChildFrm.h b/Pepper/CChildFrm.h
@@ -1,14 +1,13 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
 #include "CSplitterEx.h"
 
-class CChildFrame : public CMDIChildWndEx
-{
+class CChildFrame : public CMDIChildWndEx {
 public:
 	[[nodiscard]] auto GetSplitRight() -> CSplitterEx&;
 	[[nodiscard]] auto GetSplitRightTop() -> CSplitterEx&;

diff --git a/Pepper/CFileLoader.cpp b/Pepper/CFileLoader.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
@@ -99,7 +99,7 @@ HRESULT CFileLoader::ShowOffsetInWholeFile(ULONGLONG ullOffset, ULONGLONG ullSel
 
 	//If floating HexCtrl is in use we bring it to the front.
 	if (pHexCtrl == m_pHex.get()) {
-		::SetForegroundWindow(pHexCtrl->GetWindowHandle(EHexWnd::WND_MAIN));
+		::SetForegroundWindow(pHexCtrl->GetWndHandle(EHexWnd::WND_MAIN));
 	}
 
 	return S_OK;
@@ -174,7 +174,7 @@ void CFileLoader::CreateHexCtrlWnd()
 {
 	m_pHex->Create(m_hcs);
 
-	const auto hWndHex = m_pHex->GetWindowHandle(EHexWnd::WND_MAIN);
+	const auto hWndHex = m_pHex->GetWndHandle(EHexWnd::WND_MAIN);
 	const auto iWidthActual = m_pHex->GetActualWidth() + GetSystemMetrics(SM_CXVSCROLL);
 	CRect rcHex(0, 0, iWidthActual, iWidthActual); //Square window.
 	AdjustWindowRectEx(rcHex, m_dwStyle, FALSE, m_dwExStyle);
@@ -187,8 +187,8 @@ void CFileLoader::CreateHexCtrlWnd()
 	const auto hIconSmall = static_cast<HICON>(LoadImageW(AfxGetInstanceHandle(), MAKEINTRESOURCEW(IDI_HEXCTRL_LOGO), IMAGE_ICON, 0, 0, 0));
 	const auto hIconBig = static_cast<HICON>(LoadImageW(AfxGetInstanceHandle(), MAKEINTRESOURCEW(IDI_HEXCTRL_LOGO), IMAGE_ICON, 96, 96, 0));
 	if (hIconSmall != nullptr) {
-		::SendMessageW(m_pHex->GetWindowHandle(EHexWnd::WND_MAIN), WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(hIconSmall));
-		::SendMessageW(m_pHex->GetWindowHandle(EHexWnd::WND_MAIN), WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hIconBig));
+		::SendMessageW(m_pHex->GetWndHandle(EHexWnd::WND_MAIN), WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(hIconSmall));
+		::SendMessageW(m_pHex->GetWndHandle(EHexWnd::WND_MAIN), WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hIconBig));
 	}
 }
 

diff --git a/Pepper/CFileLoader.h b/Pepper/CFileLoader.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CMainFrm.cpp b/Pepper/CMainFrm.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CMainFrm.h b/Pepper/CMainFrm.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
@@ -10,8 +10,7 @@
 import Utility;
 using namespace Utility;
 
-class CMainFrame : public CMDIFrameWndEx
-{
+class CMainFrame : public CMDIFrameWndEx {
 public:
 	BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE,
 		CWnd* pParentWnd = nullptr, CCreateContext* pContext = nullptr)override;

diff --git a/Pepper/CPepper.cpp b/Pepper/CPepper.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
@@ -14,8 +14,7 @@
 
 import Utility;
 
-class CAboutDlg : public CDialogEx
-{
+class CAboutDlg : public CDialogEx {
 public:
 	CAboutDlg() : CDialogEx(IDD_ABOUTBOX) {};
 protected:
@@ -152,7 +151,7 @@ void CPepperApp::OnFileOpen()
 			return fOpened;
 		}
 		return true;
-	};
+		};
 
 	while (!lmbFOD()) { }; //If no file has been opened (if multiple selection) we show the Open File Dialog again.
 }

diff --git a/Pepper/CPepper.h b/Pepper/CPepper.h
@@ -1,13 +1,12 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
 
-class CPepperApp : public CWinAppEx
-{
+class CPepperApp : public CWinAppEx {
 public:
 	void OpenNewFile();
 private:

diff --git a/Pepper/CPepperDoc.cpp b/Pepper/CPepperDoc.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CPepperDoc.h b/Pepper/CPepperDoc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CSplitterEx.cpp b/Pepper/CSplitterEx.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CSplitterEx.h b/Pepper/CSplitterEx.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CTreeEx.cpp b/Pepper/CTreeEx.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CTreeEx.h b/Pepper/CTreeEx.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CViewLeft.cpp b/Pepper/CViewLeft.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *

diff --git a/Pepper/CViewLeft.h b/Pepper/CViewLeft.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
-* Copyright © 2018-2023 Jovibor https://github.com/jovibor/                                         *
+* Copyright © 2018-2024 Jovibor https://github.com/jovibor/                                         *
 * This software is available under the Apache-2.0 License.                                          *
 * Official git repository: https://github.com/jovibor/Pepper/                                       *
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *