CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'RC2_DEV' into NewFeatures

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-03-13 02:01:53 +01:00
commit 2069c44bc9
12 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
6
2

2
Versions/day.txt
View File

@ -1 +1 @@
312
313

51
minipath/src/Config.cpp
View File

@ -75,7 +75,7 @@ constexpr bool SI_Success(const SI_Error rc) noexcept {
// of complete file to preserve integrety of any transaction
// ----------------------------------------------------------------------------
HANDLE AcquireFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
@ -89,6 +89,20 @@ HANDLE AcquireFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
// ----------------------------------------------------------------------------
HANDLE AcquireReadFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ, FILE_SHARE_READ,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
DWORD const flags = LOCKFILE_EXCLUSIVE_LOCK;
bool const bLocked = LockFileEx(hFile, flags, 0, MAXDWORD, 0, &rOvrLpd);
return (bLocked ? hFile : INVALID_HANDLE_VALUE);
}
// ----------------------------------------------------------------------------
bool ReleaseFileLock(HANDLE hFile, OVERLAPPED& rOvrLpd)
{
bool bUnLocked = true;
@ -110,13 +124,15 @@ static HANDLE s_INI_Hndl = INVALID_HANDLE_VALUE;
static CSimpleIni s_INI(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
extern "C" BOOL LoadIniFile(LPCWSTR lpIniFilePath)
extern "C" BOOL LoadIniFile(LPCWSTR lpIniFilePath, BOOL bNeedReadWriteAccess)
{
s_INI.Reset();
s_INI.SetSpaces(s_bSetSpaces);
s_INI.SetMultiLine(s_bUseMultiLine);
s_INI_Hndl = AcquireFileLock(lpIniFilePath, s_OvrLpd);
s_INI_Hndl = bNeedReadWriteAccess ? AcquireWriteFileLock(lpIniFilePath, s_OvrLpd) :
AcquireReadFileLock(lpIniFilePath, s_OvrLpd);;
if (s_INI_Hndl == INVALID_HANDLE_VALUE) {
return false;
}
@ -316,7 +332,7 @@ extern "C" size_t IniFileGetString(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LP
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
StringCchCopyW(lpReturnedString, cchReturnedString, lpDefault);
return (size_t)lstrlen(lpReturnedString);
@ -344,7 +360,7 @@ extern "C" BOOL IniFileSetString(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCW
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -370,7 +386,7 @@ extern "C" int IniFileGetInt(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return iDefault;
}
@ -396,7 +412,7 @@ extern "C" BOOL IniFileSetInt(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -419,7 +435,7 @@ extern "C" BOOL IniFileGetBool(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWST
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return bDefault;
}
@ -445,7 +461,7 @@ extern "C" BOOL IniFileSetBool(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWST
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -469,7 +485,7 @@ extern "C" BOOL IniFileDelete(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -492,7 +508,7 @@ extern "C" BOOL IniFileIterateSection(LPCWSTR lpFilePath, LPCWSTR lpSectionName,
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -585,14 +601,15 @@ int CreateIniFile()
}
}
else {
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(g_wchIniFile, ovrLpd);
HANDLE hFile = CreateFile(g_wchIniFile,
GENERIC_READ, FILE_SHARE_READ,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (hFile == INVALID_HANDLE_VALUE) {
return result;
}
DWORD dwFSHigh = 0UL;
dwFileSize = GetFileSize(hFile, &dwFSHigh);
ReleaseFileLock(hFile, ovrLpd);
CloseHandle(hFile);
}
if ((dwFileSize == 0) && (dwFileSize != INVALID_FILE_SIZE)) {
@ -819,7 +836,7 @@ void LoadFlags()
{
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, FALSE);
const WCHAR* const Settings_Section2 = L"Settings2";
@ -875,7 +892,7 @@ void LoadSettings()
{
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, FALSE);
const WCHAR* const Settings_Section = L"Settings";
@ -1056,7 +1073,7 @@ void SaveSettings(BOOL bSaveSettingsNow)
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, TRUE);
const WCHAR* const Settings_Section = L"Settings";

2
minipath/src/Config.h
View File

@ -37,7 +37,7 @@ extern "C" {
// ----------------------------------------------------------------------------
BOOL LoadIniFile(LPCWSTR lpIniFilePath);
BOOL LoadIniFile(LPCWSTR lpIniFilePath, BOOL bNeedReadWriteAccess);
BOOL SaveIniFile();
void ReleaseIniFile();

2
minipath/src/Dialogs.c
View File

@ -2700,7 +2700,7 @@ INT_PTR CALLBACK FindTargetDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, TRUE);
const WCHAR* const TargetApp_Section = L"Target Application";

6
minipath/src/Helpers.c
View File

@ -1530,7 +1530,7 @@ BOOL MRU_Load(LPMRULIST pmru) {
MRU_Empty(pmru);
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, FALSE);
const WCHAR* const RegKey_Section = pmru->szRegKey;
@ -1555,7 +1555,7 @@ BOOL MRU_Load(LPMRULIST pmru) {
BOOL MRU_Save(LPMRULIST pmru) {
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, TRUE);
WCHAR tchName[32];
WCHAR tchItem[1024] = { L'\0' };
@ -1572,7 +1572,7 @@ BOOL MRU_Save(LPMRULIST pmru) {
}
}
__finally {
SaveIniFile(g_wchIniFile);
SaveIniFile();
}
return TRUE;
}

4
minipath/src/minipath.c
View File

@ -1163,7 +1163,7 @@ void CreateBars(HWND hwnd,HINSTANCE hInstance)
// Load toolbar labels
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, FALSE);
const WCHAR* const ToolbarLabels_Section = L"Toolbar Labels";
n = 0;
@ -3330,7 +3330,7 @@ void LoadTargetParamsOnce(void)
return;
__try {
LoadIniFile(g_wchIniFile);
LoadIniFile(g_wchIniFile, FALSE);
const WCHAR* const TargetApp_Section = L"Target Application";
if (IniSectionGetInt(TargetApp_Section, L"UseTargetApplication", 0xFB) != 0xFB) {

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.312.6"
version="5.20.313.2"
type="win32"
/>
<description>Notepad3 RC3</description>

49
src/Config/Config.cpp
View File

@ -89,7 +89,7 @@ constexpr bool SI_Success(const SI_Error rc) noexcept {
// of complete file to preserve integrety of any transaction
// ----------------------------------------------------------------------------
HANDLE AcquireFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
@ -103,6 +103,20 @@ HANDLE AcquireFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
// ----------------------------------------------------------------------------
HANDLE AcquireReadFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ, FILE_SHARE_READ,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
DWORD const flags = LOCKFILE_EXCLUSIVE_LOCK;
bool const bLocked = LockFileEx(hFile, flags, 0, MAXDWORD, 0, &rOvrLpd);
return (bLocked ? hFile : INVALID_HANDLE_VALUE);
}
// ----------------------------------------------------------------------------
bool ReleaseFileLock(HANDLE hFile, OVERLAPPED& rOvrLpd)
{
bool bUnLocked = true;
@ -124,13 +138,15 @@ static HANDLE s_INI_Hndl = INVALID_HANDLE_VALUE;
static CSimpleIni s_INI(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
extern "C" bool LoadIniFile(LPCWSTR lpIniFilePath)
extern "C" bool LoadIniFile(LPCWSTR lpIniFilePath, bool bNeedReadWriteAccess)
{
s_INI.Reset();
s_INI.SetSpaces(s_bSetSpaces);
s_INI.SetMultiLine(s_bUseMultiLine);
s_INI_Hndl = AcquireFileLock(lpIniFilePath, s_OvrLpd);
s_INI_Hndl = bNeedReadWriteAccess ? AcquireWriteFileLock(lpIniFilePath, s_OvrLpd) :
AcquireReadFileLock(lpIniFilePath, s_OvrLpd);;
if (s_INI_Hndl == INVALID_HANDLE_VALUE) {
return false;
}
@ -330,7 +346,7 @@ extern "C" size_t IniFileGetString(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LP
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
StringCchCopyW(lpReturnedString, cchReturnedString, lpDefault);
return StringCchLenW(lpReturnedString, cchReturnedString);
@ -358,7 +374,7 @@ extern "C" bool IniFileSetString(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCW
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -384,7 +400,7 @@ extern "C" int IniFileGetInt(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return iDefault;
}
@ -410,7 +426,7 @@ extern "C" bool IniFileSetInt(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -433,7 +449,7 @@ extern "C" bool IniFileGetBool(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWST
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return bDefault;
}
@ -459,7 +475,7 @@ extern "C" bool IniFileSetBool(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWST
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -483,7 +499,7 @@ extern "C" bool IniFileDelete(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR
Ini.SetSpaces(s_bSetSpaces);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireWriteFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -506,7 +522,7 @@ extern "C" bool IniFileIterateSection(LPCWSTR lpFilePath, LPCWSTR lpSectionName,
CSimpleIni Ini(s_bIsUTF8, s_bUseMultiKey, s_bUseMultiLine);
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(lpFilePath, ovrLpd);
HANDLE hFile = AcquireReadFileLock(lpFilePath, ovrLpd);
if (hFile == INVALID_HANDLE_VALUE) {
return false;
}
@ -790,16 +806,17 @@ extern "C" bool CreateIniFile()
}
}
else {
OVERLAPPED ovrLpd = { 0 };
HANDLE hFile = AcquireFileLock(Globals.IniFile, ovrLpd);
HANDLE hFile = CreateFile(Globals.IniFile,
GENERIC_READ, FILE_SHARE_READ,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (hFile == INVALID_HANDLE_VALUE) {
Globals.dwLastError = GetLastError();
MsgBoxLastError(L"Accessing Settings-File failed!", Globals.dwLastError);
MsgBoxLastError(L"Read Access to Settings-File failed!", Globals.dwLastError);
return result;
}
DWORD dwFSHigh = 0UL;
dwFileSize = GetFileSize(hFile, &dwFSHigh);
ReleaseFileLock(hFile, ovrLpd);
CloseHandle(hFile);
}
if ((dwFileSize == 0) && (dwFileSize != INVALID_FILE_SIZE)) {
@ -827,7 +844,7 @@ bool OpenSettingsFile()
if (StrIsNotEmpty(Globals.IniFile)) {
CreateIniFile();
if (!IsIniFileLoaded()) {
LoadIniFile(Globals.IniFile);
LoadIniFile(Globals.IniFile, true);
}
}
return IsIniFileLoaded();

2
src/Config/Config.h
View File

@ -37,7 +37,7 @@ bool CloseSettingsFile(bool bSaveChanges);
// ----------------------------------------------------------------------------
bool LoadIniFile(LPCWSTR lpIniFilePath);
bool LoadIniFile(LPCWSTR lpIniFilePath, bool bNeedReadWriteAccess);
bool IsIniFileLoaded();
void ReleaseIniFile();
bool SaveIniFile();

4
src/Styles.c
View File

@ -544,7 +544,7 @@ bool Style_ImportFromFile(const WCHAR* szFile)
if (bResetToDefault) {
ReleaseIniFile();
}
bool result = !bResetToDefault ? LoadIniFile(szFile) : true;
bool result = !bResetToDefault ? LoadIniFile(szFile, false) : true;
if (result) {
@ -825,7 +825,7 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
}
}
else {
LoadIniFile(szFilePathNorm); // reset
LoadIniFile(szFilePathNorm, true); // reset
Style_ToIniSection(bForceAll);
ok = SaveIniFile();
}

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 312
#define VERSION_BUILD 6
#define VERSION_REV 313
#define VERSION_BUILD 2
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27