Merge branch 'Dev_RC' into Dev_ONIGURUMA

# Conflicts:
#	scioniguruma/OnigurumaRegExEngine.cxx
#	src/SciCall.h

Versions/build.txt

@@ -1 +1 @@
-1717
+1718

oniguruma/.gitignore

@@ -4,7 +4,6 @@ ltmain.sh
 stamp-h1
 configure
 config.status
-config.h
 config.h.in
 onig-config
 libtool

oniguruma/src/config.h

@@ -0,0 +1,94 @@
+#pragma once
+#ifndef _ONIGURUMA_CONFIG_H_
+#define _ONIGURUMA_CONFIG_H_
+
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_OFF_T 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF___INT64 8
+#define SIZEOF_OFF_T 4
+#if defined(_WIN64)
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+#ifndef NORETURN
+#if _MSC_VER > 1100
+#define NORETURN(x) __declspec(noreturn) x
+#else
+#define NORETURN(x) x
+#endif
+#endif
+#define HAVE_DECL_SYS_NERR 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_SYS_UTIME_H 1
+#define HAVE_MEMORY_H 1
+#define uid_t int
+#define gid_t int
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T int
+#define RETSIGTYPE void
+#define HAVE_ALLOCA 1
+#define HAVE_DUP2 1
+#define HAVE_MEMCMP 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOD 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_FLOCK 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_FINITE 1
+#define HAVE_FMOD 1
+#define HAVE_FREXP 1
+#define HAVE_HYPOT 1
+#define HAVE_MODF 1
+#define HAVE_WAITPID 1
+#define HAVE_CHSIZE 1
+#define HAVE_TIMES 1
+#define HAVE__SETJMP 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+#define HAVE_MKTIME 1
+#define HAVE_COSH 1
+#define HAVE_SINH 1
+#define HAVE_TANH 1
+#define HAVE_EXECVE 1
+#define HAVE_TZNAME 1
+#define HAVE_DAYLIGHT 1
+#define SETPGRP_VOID 1
+#define inline __inline
+#define NEED_IO_SEEK_BETWEEN_RW 1
+#define RSHIFT(x,y) ((x)>>(int)y)
+#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
+#define DEFAULT_KCODE KCODE_NONE
+#define DLEXT ".so"
+#define DLEXT2 ".dll"
+
+#endif //_ONIGURUMA_CONFIG_H_

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.521.1717"
+    version="5.19.522.1718"
     type="win32"
   />
   <description>Notepad3 ONIGURUMA</description>

scioniguruma/OnigurumaRegExEngine.cxx

@@ -774,7 +774,7 @@ extern "C"
 #ifdef SCINTILLA_DLL
 __declspec(dllexport)
 #endif
-ptrdiff_t APIENTRY OnigRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
+ptrdiff_t WINAPI OnigRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
 {
   const UChar* pattern = reinterpret_cast<const UChar*>(pchPattern);
   const UChar* string = reinterpret_cast<const UChar*>(pchText);

src/Edit.c

@@ -6528,7 +6528,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
         DocPos const iWordStart = SciCall_WordStartPosition(iCurrPos, true);
         DocPos const iWordEnd = SciCall_WordEndPosition(iCurrPos, true);
         iFindLength = (iWordEnd - iWordStart);
-        StringCchCopyNA(pszText, HUGE_BUFFER, SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
+        StringCchCopyNA(txtBuffer, COUNTOF(txtBuffer), SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
       }
       else {
         return; // no selection and no word mark chosen

src/Notepad3.c

@@ -6627,7 +6627,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               // clear marks only, if selection changed
               if (iUpd & SC_UPDATE_SELECTION)
               {
-                if (!SciCall_IsSelectionEmpty()) {
+                if (!SciCall_IsSelectionEmpty() || Settings.MarkOccurrencesCurrentWord) {
                   MarkAllOccurrences(Settings2.UpdateDelayMarkAllOccurrences, true);
                 }
                 else {
@@ -6637,8 +6637,8 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               else if (iUpd & SC_UPDATE_CONTENT) {
                 // ignoring SC_UPDATE_CONTENT cause Style and Marker are out of scope here
                 // using WM_COMMAND -> SCEN_CHANGE  instead!
-                //~~~UpdateVisibleUrlIndics();
                 //~~~MarkAllOccurrences(Settings2.UpdateDelayMarkAllCoccurrences, false);
+                //~~~UpdateVisibleUrlIndics();
               }
             }
             UpdateToolbar();

src/Version.h

@@ -67,7 +67,9 @@
 
 #if defined(_MSC_VER)
     #if (_MSC_VER >= 1920)
-        #if(_MSC_FULL_VER >= 192027508)
+        #if(_MSC_FULL_VER >= 192127702)
+            #define VER_CPL     MS Visual C++ 2019 v16.1.0
+        #elif(_MSC_FULL_VER >= 192027508)
             #define VER_CPL     MS Visual C++ 2019 v16.0.(0-4)
         #elif(_MSC_FULL_VER >= 192027027)
             #define VER_CPL     MS Visual C++ 2019 v16.0.Prev(1-4)

src/VersionEx.h

@@ -7,8 +7,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
-#define VERSION_REV 521
-#define VERSION_BUILD 1717
+#define VERSION_REV 522
+#define VERSION_BUILD 1718
 #define SCINTILLA_VER 415+
 #define ONIGURUMA_REGEX_VER 6.9.2
 #define VERSION_PATCH ONIGURUMA