From b50da74dbda67f6a8fb79dc49299f7f4ad6bc42e Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Sun, 8 Mar 2020 11:07:30 +0100
Subject: [PATCH] + upd: Scintilla v432 (bugfix: that treated all dropped text
 as rectangular)

---
 Versions/build.txt                   |  2 +-
 res/Notepad3.exe.manifest.conf       |  2 +-
 scintilla/doc/ScintillaDownload.html | 10 +++++-----
 scintilla/doc/ScintillaHistory.html  | 11 +++++++++++
 scintilla/doc/index.html             |  7 ++++---
 scintilla/src/Editor.cxx             |  4 ++--
 scintilla/version.txt                |  2 +-
 scintilla/win32/PlatWin.h            |  1 +
 scintilla/win32/ScintRes.rc          |  4 ++--
 scintilla/win32/ScintillaWin.cxx     |  4 +++-
 src/VersionEx.h                      |  6 +++---
 11 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4902fabd7..1d36c6d12 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.308.1"
+    version="5.20.308.2"
     type="win32"
   />
   <description>Notepad3 RC3</description>
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 97fb83049..2756014b6 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla431.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla432.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla431.tgz">
+	<a href="https://www.scintilla.org/scintilla432.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.3.1
+       Release 4.3.2
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla431.zip">zip format</a> (1.7M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla431.tgz">tgz format</a> (1.4M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla432.zip">zip format</a> (1.7M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla432.tgz">tgz format</a> (1.4M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index cb11ec5ca..96d5ed1e6 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -562,6 +562,17 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite432.zip">Release 4.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 March 2020.
+	</li>
+	<li>
+	On Win32 fix new bug that treated all dropped text as rectangular.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scite431.zip">Release 4.3.1</a>
     </h3>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 56f5ac8d5..1763e3eb8 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20200304" />
+    <meta name="Date.Modified" content="20200306" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.3.1<br />
-           Site last modified March 4 2020</font>
+          <font color="#FFCC99" size="3"> Release version 4.3.2<br />
+           Site last modified March 6 2020</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.3.2 fixes dragging text that cotains a new line on Win32.</li>
       <li>Version 4.3.1 automatically scrolls when dragging text near window border.</li>
       <li>Version 4.3.0 makes lexers available as Lexilla library.
       SCI_SETILEXER can use Lexilla or application-provided lexers</li>
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index 2df2a4c1d..96cde8591 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -4267,8 +4267,8 @@ void Editor::SetDragPosition(SelectionPosition newPos) {
 	}
 	if (!(posDrag == newPos)) {
 		// >>>>>>>>>>>>>>>   BEG NON STD SCI PATCH   >>>>>>>>>>>>>>>
-		int const slop_x = (caretPolicies.x.slop < 75) ? 75 : caretPolicies.x.slop;
-		int const slop_y = (caretPolicies.y.slop < 3) ? 3 : caretPolicies.y.slop;
+		int const slop_x = (caretPolicies.x.slop < 50) ? 50 : caretPolicies.x.slop;
+		int const slop_y = (caretPolicies.y.slop < 2) ? 2 : caretPolicies.y.slop;
 		const CaretPolicies dragCaretPolicies = {
 			CaretPolicy(CARET_SLOP | CARET_STRICT | CARET_EVEN, slop_x),
 			CaretPolicy(CARET_SLOP | CARET_STRICT | CARET_EVEN, slop_y)
diff --git a/scintilla/version.txt b/scintilla/version.txt
index ed4f16201..84796bf1c 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-431
+432
diff --git a/scintilla/win32/PlatWin.h b/scintilla/win32/PlatWin.h
index b74b53822..37b542a15 100644
--- a/scintilla/win32/PlatWin.h
+++ b/scintilla/win32/PlatWin.h
@@ -52,6 +52,7 @@ extern int GetSystemMetricsEx(int nIndex);
 extern "C" int GetSystemMetricsEx(int nIndex);
 #endif
 
+
 namespace Scintilla {
 
 extern void Platform_Initialise(void *hInstance) noexcept;
diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc
index 94ba130d4..cd2ebaaa1 100644
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@@ -6,8 +6,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.3.1"
-#define VERSION_WORDS 4, 3, 1, 0
+#define VERSION_SCINTILLA "4.3.2"
+#define VERSION_WORDS 4, 3, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
index 8e0603c93..99107caee 100644
--- a/scintilla/win32/ScintillaWin.cxx
+++ b/scintilla/win32/ScintillaWin.cxx
@@ -177,6 +177,8 @@ constexpr Point PointFromLParam(sptr_t lpoint) noexcept {
 }
 
 inline bool KeyboardIsKeyDown(int key) noexcept {
+    // the return value is a SHORT (16 bits), not a 32 bit value
+    // (in other words, 0x80000000 is not a valid bit mask)
 	return (::GetKeyState(key) & 0x8000) != 0;
 }
 
@@ -3486,7 +3488,7 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState, PO
 			NotifyURIDropped(putf.c_str());
 		} else {
 			FORMATETC fmtr = { cfColumnSelect, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-			const bool isRectangular = SUCCEEDED(pIDataSource->QueryGetData(&fmtr));
+			const bool isRectangular = (S_OK == pIDataSource->QueryGetData(&fmtr));
 
 			POINT rpt = { pt.x, pt.y };
 			::ScreenToClient(MainHWND(), &rpt);
diff --git a/src/VersionEx.h b/src/VersionEx.h
index a46e12733..81a036d78 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,11 +9,11 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 308
-#define VERSION_BUILD 1
-#define SCINTILLA_VER 431
+#define VERSION_BUILD 2
+#define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.4
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
 #define VERSION_PATCH RC3
-#define VERSION_COMMIT_ID dkt1-amr
+#define VERSION_COMMIT_ID nebukadn