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

Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-03-13 20:56:50 +01:00
commit 935fbe229e
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2
3

2
minipath/src/Config.cpp
View File

@ -79,7 +79,7 @@ HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
DWORD const flags = LOCKFILE_EXCLUSIVE_LOCK;
bool const bLocked = LockFileEx(hFile, flags, 0, MAXDWORD, 0, &rOvrLpd);

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

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

2
src/Config/Config.cpp
View File

@ -93,7 +93,7 @@ HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
{
HANDLE hFile = CreateFile(lpIniFilePath,
GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
DWORD const flags = LOCKFILE_EXCLUSIVE_LOCK;
bool const bLocked = LockFileEx(hFile, flags, 0, MAXDWORD, 0, &rOvrLpd);

2
src/VersionEx.h
View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 313
#define VERSION_BUILD 2
#define VERSION_BUILD 3
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27

1
test/test_files/others/Complex-script-samples (issue #2019).txt
View File

@ -9,6 +9,7 @@ Bengali, LTR:
Devanagari, LTR:
मैं काँच खा सकता हूँ और मुझे उससे कोई चोट नहीं पहुंचती
संस्कृत
Tamil, LTR:
நான் கண்ணாடி சாப்பிடுவேன், அதனால் எனக்கு ஒரு கேடும் வராது.