Merge with 343-Win32-Fix.

11 files changed, 66 insertions, 45 deletions

diff --git a/.hgtags b/.hgtags
index fda86ee25..6346f0b84 100644
--- a/.hgtags
+++ b/.hgtags
@@ -98,3 +98,4 @@ d086394244f486c3f628518db177c265d694b8e7 rel-3-3-9
 eea0ac7e5c8ff58e3145ddbb8b271c51965780bf rel-3-4-0
 e73e34b23c598ab42e44e77141f6138555ed9d62 rel-3-4-1
 a4286bbf7081a4eb570bc62a9e5f7beef51e83a1 rel-3-4-2
+a3c10db89cc33783cf5a0c8d76d482bb1434af89 rel-3-4-3
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 9e8dc3832..9ed55c609 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -25,9 +25,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.zip?download">
+          <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.zip?download">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.tgz?download">
+	<a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.tgz?download">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -41,7 +41,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.4.2
+       Release 3.4.3
     </h3>
     <h4>
        Source Code
@@ -49,8 +49,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="http://prdownloads.sourceforge.net/scintilla/scintilla342.zip?download">zip format</a> (1450K) commonly used on Windows</li>
-       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla342.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.zip?download">zip format</a> (1450K) commonly used on Windows</li>
+       <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla343.tgz?download">tgz format</a> (1300K) 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/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 78cbeaa5d..b18da0f72 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -460,11 +460,11 @@
       </li>
     </ul>
     <h3>
-       <a href="http://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite344.zip?download">Release 3.4.4</a>
     </h3>
     <ul>
 	<li>
-	Released 22 May 2014.
+	Released 27 May 2014.
 	</li>
 	<li>
 	When multiple selections are active, autocompletion text may be inserted at each selection with new
@@ -475,6 +475,17 @@
 	</li>
     </ul>
     <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 May 2014.
+	</li>
+	<li>
+	Fix hangs and crashes in DLL at shutdown on Windows when using Direct2D.
+	</li>
+    </ul>
+    <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite342.zip?download">Release 3.4.2</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index 5c230fb36..48e71b5d6 100644
--- a/doc/index.html
+++ b/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="20140522" />
+    <meta name="Date.Modified" content="20140527" />
     <style type="text/css">
         #versionlist {
             margin: 0;
@@ -55,8 +55,8 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.4.2<br />
-           Site last modified May 22 2014</font>
+          <font color="#FFCC99" size="3"> Release version 3.4.3<br />
+           Site last modified May 27 2014</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -71,6 +71,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 3.4.3 fixes hangs and crashes at shutdown on Windows.</li>
       <li>Version 3.4.2 allows the application to filter input from typing, paste, drag &amp; drop and similar.</li>
       <li>Version 3.4.1 fixes a regression in 3.4.0 that stopped the caret moving when lines were wrapped.</li>
       <li>Version 3.4.0 finalises the Unicode line ends and substyles features provisionally added in 3.2.5.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index f4d2daabe..d69a2f5a8 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEdit
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.4.2
+VERSION = 3.4.3
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 27c7274a2..c873cebb2 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -11,7 +11,7 @@ TARGET = ScintillaEditBase
 TEMPLATE = lib
 CONFIG += lib_bundle
 
-VERSION = 3.4.2
+VERSION = 3.4.3
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index c9693eb7f..fe2cd8b00 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-342
+343
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 9eb45e804..fda07875a 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -3280,31 +3280,33 @@ void Platform_Initialise(void *hInstance) {
 #pragma warning(default: 4996)
 #endif
 
-void Platform_Finalise() {
+void Platform_Finalise(bool fromDllMain) {
 #if defined(USE_D2D)
-	if (defaultRenderingParams) {
-		defaultRenderingParams->Release();
-		defaultRenderingParams = 0;
-	}
-	if (customClearTypeRenderingParams) {
-		customClearTypeRenderingParams->Release();
-		customClearTypeRenderingParams = 0;
-	}
-	if (pIDWriteFactory) {
-		pIDWriteFactory->Release();
-		pIDWriteFactory = 0;
-	}
-	if (pD2DFactory) {
-		pD2DFactory->Release();
-		pD2DFactory = 0;
-	}
-	if (hDLLDWrite) {
-		FreeLibrary(hDLLDWrite);
-		hDLLDWrite = NULL;
-	}
-	if (hDLLD2D) {
-		FreeLibrary(hDLLD2D);
-		hDLLD2D = NULL;
+	if (!fromDllMain) {
+		if (defaultRenderingParams) {
+			defaultRenderingParams->Release();
+			defaultRenderingParams = 0;
+		}
+		if (customClearTypeRenderingParams) {
+			customClearTypeRenderingParams->Release();
+			customClearTypeRenderingParams = 0;
+		}
+		if (pIDWriteFactory) {
+			pIDWriteFactory->Release();
+			pIDWriteFactory = 0;
+		}
+		if (pD2DFactory) {
+			pD2DFactory->Release();
+			pD2DFactory = 0;
+		}
+		if (hDLLDWrite) {
+			FreeLibrary(hDLLDWrite);
+			hDLLDWrite = NULL;
+		}
+		if (hDLLD2D) {
+			FreeLibrary(hDLLD2D);
+			hDLLD2D = NULL;
+		}
 	}
 #endif
 	if (reverseArrowCursor != NULL)
diff --git a/win32/PlatWin.h b/win32/PlatWin.h
index 93e1d7253..c284d42d3 100644
--- a/win32/PlatWin.h
+++ b/win32/PlatWin.h
@@ -14,7 +14,7 @@ namespace Scintilla {
 
 extern bool IsNT();
 extern void Platform_Initialise(void *hInstance);
-extern void Platform_Finalise();
+extern void Platform_Finalise(bool fromDllMain);
 
 #if defined(USE_D2D)
 extern bool LoadD2D();
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index dd1099196..c7ccba757 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.4.2"
-#define VERSION_WORDS 3, 4, 2, 0
+#define VERSION_SCINTILLA "3.4.3"
+#define VERSION_WORDS 3, 4, 3, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index a83c92ef6..c3a6beefb 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -2909,25 +2909,31 @@ int Scintilla_RegisterClasses(void *hInstance) {
 	return result;
 }
 
-// This function is externally visible so it can be called from container when building statically.
-int Scintilla_ReleaseResources() {
+static int ResourcesRelease(bool fromDllMain) {
 	bool result = ScintillaWin::Unregister();
 	if (commctrl32) {
 		FreeLibrary(commctrl32);
 		commctrl32 = NULL;
 	}
-	Platform_Finalise();
+	Platform_Finalise(fromDllMain);
 	return result;
 }
 
+// This function is externally visible so it can be called from container when building statically.
+int Scintilla_ReleaseResources() {
+	return ResourcesRelease(false);
+}
+
 #ifndef STATIC_BUILD
-extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID) {
+extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved) {
 	//Platform::DebugPrintf("Scintilla::DllMain %d %d\n", hInstance, dwReason);
 	if (dwReason == DLL_PROCESS_ATTACH) {
 		if (!Scintilla_RegisterClasses(hInstance))
 			return FALSE;
 	} else if (dwReason == DLL_PROCESS_DETACH) {
-		Scintilla_ReleaseResources();
+		if (lpvReserved == NULL) {
+			ResourcesRelease(true);
+		}
 	}
 	return TRUE;
 }