Skip to content

Commit 6cbfbd5

Browse files
sdottakasdottaka
committed
Merge with default
--HG-- branch : 3way-diff
2 parents 516652e + e670dbf commit 6cbfbd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2719
-3853
lines changed

‎.hgtags

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ac1be08a59ecdbcf0b7550f0fbb29f23bb9acb9b 0.10902.2013
2+
ebdd372e049382e7243dabf03e3105186ab7abae 0.10903.2017

‎BuildArc.cmd

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set DISTDIR=.\Dist
44
set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path%
55

66
echo set args = WScript.Arguments: Set fso = CreateObject^("Scripting.FileSystemObject"^): WScript.Echo fso.GetFileVersion^(args^(0^)^): Wscript.Quit > get_file_version.vbs
7-
for /F %%f in ('cscript //nologo get_file_version.vbs Build\FRHED_vc10\Win32\UnicodeRelease\frhed.exe') do SET VERSION=%%f
7+
for /F %%f in ('cscript //nologo get_file_version.vbs Build\FRHED\Win32\UnicodeRelease\frhed.exe') do SET VERSION=%%f
88
echo %VERSION%
99
del get_file_version.vbs
1010

@@ -13,15 +13,15 @@ mkdir "%DISTDIR%\Win32\frhed\Languages" 2> NUL
1313
mkdir "%DISTDIR%\x64\frhed\Docs" 2> NUL
1414
mkdir "%DISTDIR%\x64\frhed\Languages" 2> NUL
1515

16-
copy Build\FRHED_vc10\Win32\UnicodeRelease\frhed.exe "%DISTDIR%\Win32\frhed\"
17-
copy Build\FRHED_vc10\Win32\UnicodeRelease\hekseditU.dll "%DISTDIR%\Win32\frhed\"
18-
copy Build\FRHED_vc10\Win32\UnicodeRelease\Docs\*.* "%DISTDIR%\Win32\frhed\Docs\"
19-
copy Build\FRHED_vc10\Win32\UnicodeRelease\Languages\*.* "%DISTDIR%\Win32\frhed\Languages\"
16+
copy Build\FRHED\Win32\UnicodeRelease\frhed.exe "%DISTDIR%\Win32\frhed\"
17+
copy Build\FRHED\Win32\UnicodeRelease\hekseditU.dll "%DISTDIR%\Win32\frhed\"
18+
copy Build\FRHED\Win32\UnicodeRelease\Docs\*.* "%DISTDIR%\Win32\frhed\Docs\"
19+
copy Build\FRHED\Win32\UnicodeRelease\Languages\*.* "%DISTDIR%\Win32\frhed\Languages\"
2020
copy GPL.txt "%DISTDIR%\Win32\frhed\"
21-
copy Build\FRHED_vc10\x64\UnicodeRelease\frhed.exe "%DISTDIR%\x64\frhed\"
22-
copy Build\FRHED_vc10\x64\UnicodeRelease\hekseditU.dll "%DISTDIR%\x64\frhed\"
23-
copy Build\FRHED_vc10\x64\UnicodeRelease\Docs\*.* "%DISTDIR%\x64\frhed\Docs\"
24-
copy Build\FRHED_vc10\x64\UnicodeRelease\Languages\*.* "%DISTDIR%\x64\frhed\Languages\"
21+
copy Build\FRHED\x64\UnicodeRelease\frhed.exe "%DISTDIR%\x64\frhed\"
22+
copy Build\FRHED\x64\UnicodeRelease\hekseditU.dll "%DISTDIR%\x64\frhed\"
23+
copy Build\FRHED\x64\UnicodeRelease\Docs\*.* "%DISTDIR%\x64\frhed\Docs\"
24+
copy Build\FRHED\x64\UnicodeRelease\Languages\*.* "%DISTDIR%\x64\frhed\Languages\"
2525
copy GPL.txt "%DISTDIR%\x64\frhed\"
2626

2727
7z.exe a -tzip "%DISTDIR%\frhed-%VERSION%-win32.zip" "%DISTDIR%\Win32\frhed\"

‎BuildBin.cmd

-21
This file was deleted.

‎BuildBin.vs2015.cmd

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
cd /d "%~dp0"
2+
3+
del /s Build\*.exe
4+
del /s BuildTmp\*.res
5+
6+
setlocal
7+
call "%VS140COMNTOOLS%vsvars32.bat"
8+
MSBuild FRHED.vs2015.sln /t:rebuild /p:Configuration=UnicodeRelease /p:Platform="Win32" || pause
9+
MSBuild FRHED.vs2015.sln /t:rebuild /p:Configuration=UnicodeRelease /p:Platform="x64" || pause
10+
11+
if exist "%SIGNBAT_PATH%" (
12+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\frhed.exe
13+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\hekseditU.dll
14+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\Languages\heksedit.lng
15+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\frhed.exe
16+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\hekseditU.dll
17+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\Languages\heksedit.lng
18+
)
19+
20+
endlocal
21+

‎BuildBin.vs2017.cmd

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cd /d "%~dp0"
2+
3+
del /s Build\*.exe
4+
del /s BuildTmp\*.res
5+
6+
setlocal
7+
for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
8+
set InstallDir=%%i
9+
)
10+
if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
11+
call "%InstallDir%\Common7\Tools\vsdevcmd.bat %*
12+
)
13+
MSBuild FRHED.vs2017.sln /t:rebuild /p:Configuration=UnicodeRelease /p:Platform="Win32" || pause
14+
MSBuild FRHED.vs2017.sln /t:rebuild /p:Configuration=UnicodeRelease /p:Platform="x64" || pause
15+
16+
if exist "%SIGNBAT_PATH%" (
17+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\frhed.exe
18+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\hekseditU.dll
19+
"%SIGNBAT_PATH%" Build\FRHED\Win32\UnicodeRelease\Languages\heksedit.lng
20+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\frhed.exe
21+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\hekseditU.dll
22+
"%SIGNBAT_PATH%" Build\FRHED\x64\UnicodeRelease\Languages\heksedit.lng
23+
)
24+
25+
endlocal
26+

‎FRHED_vc10.sln ‎FRHED.vs2015.sln

+7-24
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2015
3-
VisualStudioVersion = 14.0.24720.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "frhed", "FRHED\frhed.vcxproj", "{139D8239-98B4-4B29-A199-B27CDB8B4708}"
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "frhed.vs2015", "FRHED\frhed.vs2015.vcxproj", "{139D8239-98B4-4B29-A199-B27CDB8B4708}"
66
EndProject
7-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit", "FRHED\heksedit.vcxproj", "{488796F1-8E07-40FE-A006-B6252E958746}"
7+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit.vs2015", "FRHED\heksedit.vs2015.vcxproj", "{488796F1-8E07-40FE-A006-B6252E958746}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11-
Debug|Win32 = Debug|Win32
12-
Debug|x64 = Debug|x64
13-
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
1511
UnicodeDebug|Win32 = UnicodeDebug|Win32
1612
UnicodeDebug|x64 = UnicodeDebug|x64
1713
UnicodeRelease|Win32 = UnicodeRelease|Win32
1814
UnicodeRelease|x64 = UnicodeRelease|x64
1915
EndGlobalSection
2016
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|Win32.ActiveCfg = Debug|Win32
22-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|Win32.Build.0 = Debug|Win32
23-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|x64.ActiveCfg = Debug|x64
24-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|x64.Build.0 = Debug|x64
25-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|Win32.ActiveCfg = Release|Win32
26-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|Win32.Build.0 = Release|Win32
27-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x64.ActiveCfg = Release|x64
28-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x64.Build.0 = Release|x64
2917
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
3018
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
3119
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64
@@ -34,14 +22,6 @@ Global
3422
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
3523
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|x64.ActiveCfg = UnicodeRelease|x64
3624
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|x64.Build.0 = UnicodeRelease|x64
37-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|Win32.ActiveCfg = Debug|Win32
38-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|Win32.Build.0 = Debug|Win32
39-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|x64.ActiveCfg = Debug|x64
40-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|x64.Build.0 = Debug|x64
41-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|Win32.ActiveCfg = Release|Win32
42-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|Win32.Build.0 = Release|Win32
43-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|x64.ActiveCfg = Release|x64
44-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|x64.Build.0 = Release|x64
4525
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
4626
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
4727
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64
@@ -54,4 +34,7 @@ Global
5434
GlobalSection(SolutionProperties) = preSolution
5535
HideSolutionNode = FALSE
5636
EndGlobalSection
37+
GlobalSection(ExtensibilityGlobals) = postSolution
38+
SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}
39+
EndGlobalSection
5740
EndGlobal

‎FRHED.sln ‎FRHED.vs2017.sln

+9-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,19 @@
1-
Microsoft Visual Studio Solution File, Format Version 10.00
2-
# Visual C++ Express 2008
3-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Frhed", "FRHED\frhed.vcproj", "{139D8239-98B4-4B29-A199-B27CDB8B4708}"
4-
ProjectSection(ProjectDependencies) = postProject
5-
{488796F1-8E07-40FE-A006-B6252E958746} = {488796F1-8E07-40FE-A006-B6252E958746}
6-
EndProjectSection
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26730.15
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "frhed.vs2017", "FRHED\frhed.vs2017.vcxproj", "{139D8239-98B4-4B29-A199-B27CDB8B4708}"
76
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit", "FRHED\heksedit.vcproj", "{488796F1-8E07-40FE-A006-B6252E958746}"
7+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit.vs2017", "FRHED\heksedit.vs2017.vcxproj", "{488796F1-8E07-40FE-A006-B6252E958746}"
98
EndProject
109
Global
1110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Win32 = Debug|Win32
13-
Debug|x64 = Debug|x64
14-
Release|Win32 = Release|Win32
15-
Release|x64 = Release|x64
1611
UnicodeDebug|Win32 = UnicodeDebug|Win32
1712
UnicodeDebug|x64 = UnicodeDebug|x64
1813
UnicodeRelease|Win32 = UnicodeRelease|Win32
1914
UnicodeRelease|x64 = UnicodeRelease|x64
2015
EndGlobalSection
2116
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|Win32.ActiveCfg = Debug|Win32
23-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|Win32.Build.0 = Debug|Win32
24-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|x64.ActiveCfg = Debug|x64
25-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Debug|x64.Build.0 = Debug|x64
26-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|Win32.ActiveCfg = Release|Win32
27-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|Win32.Build.0 = Release|Win32
28-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x64.ActiveCfg = Release|x64
29-
{139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x64.Build.0 = Release|x64
3017
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
3118
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
3219
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64
@@ -35,14 +22,6 @@ Global
3522
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
3623
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|x64.ActiveCfg = UnicodeRelease|x64
3724
{139D8239-98B4-4B29-A199-B27CDB8B4708}.UnicodeRelease|x64.Build.0 = UnicodeRelease|x64
38-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|Win32.ActiveCfg = Debug|Win32
39-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|Win32.Build.0 = Debug|Win32
40-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|x64.ActiveCfg = Debug|x64
41-
{488796F1-8E07-40FE-A006-B6252E958746}.Debug|x64.Build.0 = Debug|x64
42-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|Win32.ActiveCfg = Release|Win32
43-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|Win32.Build.0 = Release|Win32
44-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|x64.ActiveCfg = Release|x64
45-
{488796F1-8E07-40FE-A006-B6252E958746}.Release|x64.Build.0 = Release|x64
4625
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
4726
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
4827
{488796F1-8E07-40FE-A006-B6252E958746}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64
@@ -55,4 +34,7 @@ Global
5534
GlobalSection(SolutionProperties) = preSolution
5635
HideSolutionNode = FALSE
5736
EndGlobalSection
37+
GlobalSection(ExtensibilityGlobals) = postSolution
38+
SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}
39+
EndGlobalSection
5840
EndGlobal

‎FRHED/AddBmkDlg.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ BOOL AddBmkDlg::OnCommand(HWindow *pDlg, WPARAM wParam, LPARAM lParam)
7070
MessageBox(pDlg, GetLangString(IDS_OFFSET_START_ERROR), MB_ICONERROR);
7171
return TRUE;
7272
}
73-
if (offset < 0 || offset > m_dataArray.GetLength())
73+
if (offset < 0 || offset > m_dataArray.size())
7474
{
7575
MessageBox(pDlg, GetLangString(IDS_BMK_INVALID_POSITION), MB_ICONERROR);
7676
return TRUE;

‎FRHED/AppendDlg.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,16 @@ BOOL AppendDlg::Apply(HWindow *pDlg)
4646
MessageBox(pDlg, GetLangString(IDS_APPEND_UNKNOWN_AMOUNT), MB_ICONERROR);
4747
return FALSE;
4848
}
49-
int oldupbound = m_dataArray.GetLength();
50-
if (!m_dataArray.SetSize(m_dataArray.GetSize() + iAppendbytes))
49+
int oldsize = m_dataArray.size();
50+
if (!m_dataArray.resize(oldsize + iAppendbytes))
5151
{
5252
MessageBox(pDlg, GetLangString(IDS_APPEND_NO_MEM), MB_ICONERROR);
5353
return FALSE;
5454
}
55-
m_dataArray.ExpandToSize();
5655
WaitCursor wc;
5756
for (int i = 0 ; i < iAppendbytes ; i++)
58-
m_dataArray[oldupbound + i] = 0;
59-
push_undorecord(oldupbound, NULL, 0, &m_dataArray[oldupbound], iAppendbytes);
57+
m_dataArray[oldsize + i] = 0;
58+
push_undorecord(oldsize, iAppendbytes, NULL);
6059
bFilestatusChanged = true;
6160
resize_window();
6261
return TRUE;

‎FRHED/BinTrans.cpp

+14-30
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ along with this program; see the file COPYING. If not, write to the Free
1616
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
1717
02111-1307, USA.
1818
19-
Last change: 2013-02-24 by Jochen Neubeck
19+
Last change: 2017-06-21 by Jochen Neubeck
2020
*/
2121
/**
2222
* @file BinTrans.cpp
@@ -25,7 +25,6 @@ Last change: 2013-02-24 by Jochen Neubeck
2525
*
2626
*/
2727
#include "precomp.h"
28-
#include "Simparr.h"
2928
#include "hexwnd.h"
3029
#include "BinTrans.h"
3130

@@ -72,25 +71,11 @@ int Text2BinTranslator::iFindBytePos(const char* src, char c)
7271
* @param [in] binmode BIG/LITTLE endian.
7372
* @return TRUE if translation succeeded, FALSE otherwise.
7473
*/
75-
int Text2BinTranslator::GetTrans2Bin(SimpleArray<BYTE>& sa, int charmode, int binmode)
74+
int Text2BinTranslator::GetTrans2Bin(Vector<BYTE> &sa, int charmode, int binmode)
7675
{
77-
sa.ClearAll();
78-
79-
int destlen = iLengthOfTransToBin(m_pT, m_nUpperBound);
80-
if (destlen > 0)
81-
{
82-
sa.SetSize(destlen);
83-
sa.ExpandToSize();
84-
iCreateBcTranslation(sa, m_pT, m_nUpperBound, charmode, binmode);
85-
return TRUE;
86-
}
87-
else
88-
{
89-
// Empty input string => don't allocate anything and return 0.
90-
return FALSE;
91-
}
92-
93-
return TRUE;
76+
int destlen = iLengthOfTransToBin(c_str(), length());
77+
sa.resize(destlen);
78+
return iCreateBcTranslation(sa.pointer(), c_str(), length(), charmode, binmode);
9479
}
9580

9681
/**
@@ -417,22 +402,21 @@ int Text2BinTranslator::iCreateBcTranslation(BYTE* dest, const char* src, int sr
417402
return di;
418403
}
419404

420-
//-------------------------------------------------------------------
405+
/**
406+
* @brief Create a Text2BinTranslator from a normal char array-string.
407+
*/
421408
Text2BinTranslator::Text2BinTranslator(const char* ps)
409+
: String(ps)
422410
{
423-
// Create a Text2BinTranslator from a normal char array-string.
424-
m_nGrowBy = 64;
425-
Clear();
426-
SetToString(ps);
427411
}
428412

429413
//-------------------------------------------------------------------
430-
int Text2BinTranslator::bCompareBin( Text2BinTranslator& tr2, int charmode, int binmode )
414+
int Text2BinTranslator::bCompareBin(Text2BinTranslator& tr2, int charmode, int binmode)
431415
{
432-
SimpleArray<BYTE> sa1, sa2;
433-
GetTrans2Bin(sa1, charmode, binmode);
434-
tr2.GetTrans2Bin(sa2, charmode, binmode);
435-
return (sa1 == sa2);
416+
Vector<BYTE> sa1, sa2;
417+
int const n = GetTrans2Bin(sa1, charmode, binmode);
418+
int const m = tr2.GetTrans2Bin(sa2, charmode, binmode);
419+
return n == m && memcmp(sa1.pointer(), sa2.pointer(), n) == 0;
436420
}
437421

438422
/**

‎FRHED/BinTrans.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ along with this program; see the file COPYING. If not, write to the Free
1616
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
1717
02111-1307, USA.
1818
19-
Last change: 2013-02-24 by Jochen Neubeck
19+
Last change: 2017-06-21 by Jochen Neubeck
2020
*/
2121
/**
2222
* @file BinTrans.h
@@ -27,14 +27,12 @@ Last change: 2013-02-24 by Jochen Neubeck
2727
#ifndef BinTrans_h
2828
#define BinTrans_h
2929

30-
#include "Simparr.h"
31-
3230
int create_bc_translation(BYTE** ppd, const char* src, int srclen, int charset, int binarymode);
3331

3432
/**
3533
* @brief A class translating between text export and binary data.
3634
*/
37-
class Text2BinTranslator : public SimpleString
35+
class Text2BinTranslator : public String
3836
{
3937
public:
4038
int bCompareBin(Text2BinTranslator& tr2, int charmode, int binmode);
@@ -48,7 +46,7 @@ class Text2BinTranslator : public SimpleString
4846
static int iTranslateBytesToBC(char* pd, const BYTE* src, int srclen);
4947

5048
private:
51-
int GetTrans2Bin(SimpleArray<BYTE>& sa, int charmode, int binmode);
49+
int GetTrans2Bin(Vector<BYTE>& sa, int charmode, int binmode);
5250
};
5351

5452
#endif // BinTrans_h

‎FRHED/BitManipDlg.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ BOOL BitManipDlg::Apply(HWindow *pDlg, WPARAM wParam)
8787
cBitValue |= 1;
8888
if (wParam == IDOK)
8989
{
90-
BYTE ch = m_dataArray[iCurByte];
90+
UndoRecord::Data *olddata = UndoRecord::alloc(&m_dataArray[iCurByte], 1);
9191
m_dataArray[iCurByte] = cBitValue;
92-
push_undorecord(iCurByte, &ch, 1, &m_dataArray[iCurByte], 1);
92+
push_undorecord(iCurByte, 1, olddata);
9393
bFilestatusChanged = true;
9494
repaint();
9595
return TRUE;

0 commit comments

Comments
 (0)