Latest HexCtrl and libpe. Added missing includes.

jovibor · Jan 26, 2023 · 5d59e16 · 5d59e16
1 parent 9ecd14a
commit 5d59e16
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 20 deletions.
diff --git a/Pepper/CFileLoader.h b/Pepper/CFileLoader.h
@@ -5,6 +5,7 @@
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
+#include <afxcontrolbars.h>
 #include "HexCtrl.h"
 
 using namespace HEXCTRL;

diff --git a/Pepper/CMainFrm.h b/Pepper/CMainFrm.h
@@ -5,6 +5,7 @@
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
+#include <afxcontrolbars.h>
 
 import Utility;
 using namespace util;
@@ -25,7 +26,6 @@ class CMainFrame : public CMDIFrameWndEx
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
 	LRESULT OnTabActivate(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnUpdateAppEditmode(CCmdUI* pCmdUI);
-	afx_msg void OnWindowManager();
 	BOOL PreCreateWindow(CREATESTRUCT& cs)override;
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	DECLARE_DYNAMIC(CMainFrame);

diff --git a/Pepper/CPepperDoc.h b/Pepper/CPepperDoc.h
@@ -5,6 +5,7 @@
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
+#include <afxcontrolbars.h>
 #include "libpe.h"
 #include "CFileLoader.h"
 

diff --git a/Pepper/CSplitterEx.h b/Pepper/CSplitterEx.h
@@ -25,6 +25,7 @@
 *	horzSplit.AddNested(1, 0, &botSplit); //Adding botpSplit as nested to horz(1, 0). *
 **************************************************************************************/
 #pragma once
+#include <afxcontrolbars.h>
 #include <vector>
 
 class CSplitterEx : public CSplitterWndEx

diff --git a/Pepper/CTreeEx.h b/Pepper/CTreeEx.h
@@ -5,6 +5,7 @@
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
+#include <afxcontrolbars.h>
 
 class CTreeEx : public CTreeCtrl
 {

diff --git a/Pepper/CViewLeft.h b/Pepper/CViewLeft.h
@@ -5,8 +5,8 @@
 * Pepper is a PE32 (x86) and PE32+ (x64) binares viewer/editor.                                     *
 ****************************************************************************************************/
 #pragma once
-#include "CTreeEx.h"
 #include "CPepperDoc.h"
+#include "CTreeEx.h"
 
 class CViewLeft : public CView
 {

diff --git a/Pepper/CViewRightBL.cpp b/Pepper/CViewRightBL.cpp
@@ -7,6 +7,7 @@
 #include "stdafx.h"
 #include "CViewRightBL.h"
 #include "res/resource.h"
+#include "strsafe.h"
 #include <format>
 
 import Utility;

diff --git a/Pepper/CViewRightBR.cpp b/Pepper/CViewRightBR.cpp
@@ -7,6 +7,7 @@
 #include "stdafx.h"
 #include "CMainFrm.h"
 #include "CViewRightBR.h"
+#include "strsafe.h"
 #include <format>
 #include <unordered_map>
 #pragma comment(lib, "Mincore.lib") //VerQueryValueW

diff --git a/Pepper/CViewRightTL.cpp b/Pepper/CViewRightTL.cpp
@@ -6,6 +6,7 @@
 ****************************************************************************************************/
 #include "stdafx.h"
 #include "CViewRightTL.h"
+#include "strsafe.h"
 #include <algorithm>
 #include <format>
 

diff --git a/Pepper/Pepper.vcxproj b/Pepper/Pepper.vcxproj
@@ -166,7 +166,6 @@
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\CHexSelection.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\CScrollEx.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmMgr.cpp" />
-    <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmProps.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgCallback.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgDataInterp.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgEncoding.cpp" />
@@ -204,13 +203,11 @@
     <ClInclude Include="CPepperDoc.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\dep\ListEx\ListEx.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\HexCtrl.h" />
-    <ClInclude Include="dep\HexCtrl\HexCtrl\HexCtrlDefs.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\res\HexCtrlRes.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\CHexCtrl.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\CHexSelection.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\CScrollEx.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmMgr.h" />
-    <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmProps.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgCallback.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgDataInterp.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgEncoding.h" />

diff --git a/Pepper/Pepper.vcxproj.filters b/Pepper/Pepper.vcxproj.filters
@@ -61,9 +61,6 @@
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmMgr.cpp">
       <Filter>HexCtrl</Filter>
     </ClCompile>
-    <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmProps.cpp">
-      <Filter>HexCtrl</Filter>
-    </ClCompile>
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgCallback.cpp">
       <Filter>HexCtrl</Filter>
     </ClCompile>
@@ -156,9 +153,6 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmMgr.h">
       <Filter>HexCtrl</Filter>
     </ClInclude>
-    <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgBkmProps.h">
-      <Filter>HexCtrl</Filter>
-    </ClInclude>
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgCallback.h">
       <Filter>HexCtrl</Filter>
     </ClInclude>
@@ -189,9 +183,6 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\HexCtrl.h">
       <Filter>HexCtrl</Filter>
     </ClInclude>
-    <ClInclude Include="dep\HexCtrl\HexCtrl\HexCtrlDefs.h">
-      <Filter>HexCtrl</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\Pepper.rc">

diff --git a/Pepper/Utility.ixx b/Pepper/Utility.ixx
@@ -11,7 +11,7 @@ module;
 #include <span>
 #include <string>
 #include <unordered_map>
-#include "HexCtrlDefs.h"
+#include "HexCtrl.h"
 #include "libpe.h"
 
 #define PEPPER_PRODUCT_NAME			L"Pepper"

diff --git a/Pepper/dep/HexCtrl b/Pepper/dep/HexCtrl
diff --git a/Pepper/dep/libpe b/Pepper/dep/libpe
diff --git a/Pepper/stdafx.h b/Pepper/stdafx.h
@@ -5,6 +5,4 @@
 // turns off MFC's hiding of some common and often safely ignored warning messages
 #define _AFX_ALL_WARNINGS
 
-#include <afxcontrolbars.h> // MFC support for ribbons and control bars
-#include "strsafe.h"
-#include "libpe.h"
+#include <afxcontrolbars.h> // MFC support for ribbons and control bars
+280 −1		HexCtrl/HexCtrl.h
+0 −286		HexCtrl/HexCtrlDefs.h
+22 −23		HexCtrl/dep/ListEx/CListEx.cpp
+103 −121		HexCtrl/res/HexCtrl.rc
+66 −53		HexCtrl/res/HexCtrlRes.h
+ −		HexCtrl/res/IDB_HEXCTRL_DATAINTERP.bmp
+ −		HexCtrl/res/IDB_HEXCTRL_FONTCHOOSE.bmp
+11 −11		HexCtrl/res/IDJ_HEXCTRL_KEYBIND.json
+267 −178		HexCtrl/src/CHexCtrl.cpp
+0 −2		HexCtrl/src/CHexCtrl.h
+13 −10		HexCtrl/src/CHexSelection.cpp
+4 −4		HexCtrl/src/CHexSelection.h
+214 −68		HexCtrl/src/Dialogs/CHexDlgBkmMgr.cpp
+21 −8		HexCtrl/src/Dialogs/CHexDlgBkmMgr.h
+0 −105		HexCtrl/src/Dialogs/CHexDlgBkmProps.cpp
+0 −30		HexCtrl/src/Dialogs/CHexDlgBkmProps.h
+5 −5		HexCtrl/src/Dialogs/CHexDlgDataInterp.cpp
+2 −2		HexCtrl/src/Dialogs/CHexDlgDataInterp.h
+2 −2		HexCtrl/src/Dialogs/CHexDlgFillData.cpp
+6 −3		HexCtrl/src/Dialogs/CHexDlgGoTo.cpp
+250 −158		HexCtrl/src/Dialogs/CHexDlgTemplMgr.cpp
+19 −16		HexCtrl/src/Dialogs/CHexDlgTemplMgr.h
+16 −14		README.md
+5 −8		VS Projects/DLL Project/DLL Project.vcxproj
+8 −17		VS Projects/DLL Project/DLL Project.vcxproj.filters
+19 −7		VS Projects/Sample Project/HexSampleDlg.cpp
+2 −1		VS Projects/Sample Project/HexSampleDlg.h
+3 −6		VS Projects/Sample Project/Sample Project.vcxproj
+3 −12		VS Projects/Sample Project/Sample Project.vcxproj.filters
+1 −6		VS Projects/Sample Project/stdafx.h