From 63f15d7585fc844613b9ab0c1ba296e13ccc7e7b Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 8 Nov 2023 21:33:46 +0900
Subject: [PATCH 01/58] Replace the source code written in VBScript with
 JScript

---
 Plugins/dlls/insert datetime.sct | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Plugins/dlls/insert datetime.sct b/Plugins/dlls/insert datetime.sct
index ea14b73ee96..0fa8ec66415 100644
--- a/Plugins/dlls/insert datetime.sct	
+++ b/Plugins/dlls/insert datetime.sct	
@@ -17,33 +17,33 @@
 	<method name="InsertTime"/>
 </implements>
 
-<script language="VBS">
-Option Explicit
+<script language="JScript">
 
-Function get_PluginEvent()
-	get_PluginEvent = "EDITOR_SCRIPT"
-End Function
+function get_PluginEvent() {
+	return "EDITOR_SCRIPT";
+}
 
-Function get_PluginDescription()
-	get_PluginDescription = "Basic text functions for the context menu"
-End Function
+function get_PluginDescription() {
+	return "Basic text functions for the context menu";
+}
 
-Function get_PluginFileFilters()
-	get_PluginFileFilters= ".*"
-End Function
+function get_PluginFileFilters() {
+	return ".*";
+}
 
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "InsertDate.MenuCaption=Insert Date;InsertTime.MenuCaption=Insert Time"
-End Function
+function get_PluginExtendedProperties() {
+	return "InsertDate.MenuCaption=Insert Date;InsertTime.MenuCaption=Insert Time";
+}
 
-' transformation functions
-Function InsertDate(Text)
-	InsertDate = Text + FormatDateTime(Date, 1)
-End Function
+// transformation functions
+function InsertDate(Text) {
+	return Text + (new Date()).toLocaleString().split(/[ ,]/)[0];
+}
 
-Function InsertTime(Text)
-	InsertTime = Text + FormatDateTime(Time, 4)
-End Function
+function InsertTime(Text) {
+	var ary = (new Date()).toLocaleString().split(/[ ,]/);
+	return Text + ary[ary.length - 1];
+}
 
 </script>
 </scriptlet>

From 2f2aae44dcdefd4d4453b9baaeb81859e74cd5f7 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 15 Jan 2024 23:11:26 +0900
Subject: [PATCH 02/58] WIP

---
 ALL.vs2022.sln                            |   1 +
 Plugins/dlls/IgnoreLeadingLineNumbers.sct | 166 ++++++++++------------
 Src/Plugins.cpp                           |  24 +++-
 3 files changed, 101 insertions(+), 90 deletions(-)

diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
index 962d42912d2..001a1b9ab81 100644
--- a/ALL.vs2022.sln
+++ b/ALL.vs2022.sln
@@ -204,6 +204,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{32E7
 		Plugins\dlls\CompareMSVisioFiles.sct = Plugins\dlls\CompareMSVisioFiles.sct
 		Plugins\dlls\CompareMSWordFiles.sct = Plugins\dlls\CompareMSWordFiles.sct
 		Plugins\dlls\editor addin.sct = Plugins\dlls\editor addin.sct
+		Plugins\dlls\IgnoreLeadingLineNumbers.sct = Plugins\dlls\IgnoreLeadingLineNumbers.sct
 		Plugins\dlls\insert datetime.sct = Plugins\dlls\insert datetime.sct
 		Plugins\dlls\PrediffLineFilter.sct = Plugins\dlls\PrediffLineFilter.sct
 	EndProjectSection
diff --git a/Plugins/dlls/IgnoreLeadingLineNumbers.sct b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
index 1de507d270e..f6db638aaa2 100644
--- a/Plugins/dlls/IgnoreLeadingLineNumbers.sct
+++ b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
@@ -19,107 +19,95 @@
   <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
+<script language="JScript">
 
-'+----------------------------------------------------------------------+
-'| This is a plugin for WinMerge <www.winmerge.org>.                    |
-'| It will ignores leading line numbers in text files.                  |
-'| Copyright (C) 2007 by Tim Gerundt                                    |
-'+----------------------------------------------------------------------+
-'| This program is free software; you can redistribute it and/or modify |
-'| it under the terms of the GNU General Public License as published by |
-'| the Free Software Foundation; either version 2 of the License, or    |
-'| (at your option) any later version.                                  |
-'|                                                                      |
-'| This program is distributed in the hope that it will be useful,      |
-'| but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-'| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-'| GNU General Public License for more details.                         |
-'|                                                                      |
-'| You should have received a copy of the GNU General Public License    |
-'| along with this program; if not, write to the Free Software          |
-'| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            |
-'+----------------------------------------------------------------------+
-Option Explicit
+/*
++----------------------------------------------------------------------+
+| This is a plugin for WinMerge <www.winmerge.org>.                    |
+| It will ignores leading line numbers in text files.                  |
+| Copyright (C) 2007 by Tim Gerundt                                    |
++----------------------------------------------------------------------+
+| This program is free software; you can redistribute it and/or modify |
+| it under the terms of the GNU General Public License as published by |
+| the Free Software Foundation; either version 2 of the License, or    |
+| (at your option) any later version.                                  |
+|                                                                      |
+| This program is distributed in the hope that it will be useful,      |
+| but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+| GNU General Public License for more details.                         |
+|                                                                      |
+| You should have received a copy of the GNU General Public License    |
+| along with this program; if not, write to the Free Software          |
+| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            |
++----------------------------------------------------------------------+
+*/
 
-Function get_PluginEvent()
-  get_PluginEvent = "BUFFER_PREDIFF"
-End Function
+function get_PluginEvent() {
+  return "BUFFER_PREDIFF";
+}
 
-Function get_PluginDescription()
-  get_PluginDescription = "This plugin ignores the leading line numbers in text files (e.g. NC and BASIC files)."
-End Function
+function get_PluginDescription() {
+  return "This plugin ignores the leading line numbers in text files (e.g. NC and BASIC files).";
+}
 
-Function get_PluginFileFilters()
-  get_PluginFileFilters = "\.nc$"
-End Function
+function get_PluginFileFilters() {
+  return "\.nc$";
+}
 
-Function get_PluginIsAutomatic()
-  get_PluginIsAutomatic = True
-End Function
+function get_PluginIsAutomatic() {
+  return true;
+}
 
-Function get_PluginExtendedProperties()
-  get_PluginExtendedProperties = "MenuCaption=Ignore Leading Line Numbers"
-End Function
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Ignore Leading Line Numbers";
+}
 
-Function SafeUBound(ary)
-  On Error Resume Next
-  SafeUBound = -1
-  SafeUBound = UBound(ary)
-End Function
-
-Function SplitLines(text, eol)
-	Dim re, matches
-	Set re = New RegExp
-	re.Global = False
-	re.IgnoreCase = False
-	re.Pattern = "\r\n|\n|\r"
-	Set matches = re.Execute(text)
-	If matches.Count > 0 Then
-		eol = matches(0).Value
-	End If
-	SplitLines = Split(text, eol)
-End Function
-
-Function PrediffBufferW(text, size, bChanged)
-  Dim sTemp, bLineHasStarted
-  Dim i, l, sChar, lines, eol, line
+function PrediffBufferW(text, size, bChanged) {
   
-  bChanged = False
+  bChanged = false;
 
-  lines = SplitLines(text, eol)
-  For l = 0 To SafeUBound(lines)
-    bLineHasStarted = True
-    sTemp = ""
-    line = lines(l)
-    For i = 0 To Len(line) - 1 'For all chars...
-      sChar = Mid(line, i + 1, 1)
-      Select Case sChar
-        Case "N", "n", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" 'N or number...
-          If (bLineHasStarted = True) Then 'If line has started...
-            sChar = ""
-            bChanged = True
-          End If
-        Case Else
-          bLineHasStarted = False
-      End Select
-      sTemp = sTemp & sChar
-    Next
-    lines(l) = sTemp
-  Next
+  var matches = text.match(/\r\n|\n|\r/);
+  var eol = (matches != null) ? matches[0] : "\r\n";
+  var lines = text.split(eol);
+  for (var l = 0; l < lines.length; l++) {
+    var bLineHasStarted = true;
+    var sTemp = "";
+    var line = lines[l];
+    for (var i = 0; i < line.length; i++) { // For all chars...
+      var sChar = line.substr(i, 1);
+      switch (sChar) {
+        case "N": case "n": case "1": case "2": case "3": case "4": case "5": case "6": case "7": case "8": case "9": case "0": // N or number...
+          if (bLineHasStarted) { // if line has started...
+            sChar = "";
+            bChanged = true;
+          }
+          break;
+        default:
+          bLineHasStarted = false;
+          break;
+      }
+      sTemp += sChar;
+    }
+    lines[l] = sTemp;
+  }
   
-  If (bChanged = True) Then 'If text has changed...
-    text = Join(lines, eol)
-    size = Len(text)
-  End If
-  PrediffBufferW = True
-End Function
+  if (bChanged) { // if text has changed...
+    text = lines.join(eol);
+    size = text.length;
+  }
 
-Function ShowSettingsDialog()
-    ShowSettingsDialog = False
-    Err.Raise 30001, , "Not Implemented"
-End Function
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, text);
+  result.Add(2, size);
+  result.Add(3, bChanged);
+  return result.Items();
+}
 
+function ShowSettingsDialog() {
+  throw new Error(30001, "Not Implemented");
+}
 
 </script>
 </scriptlet>
diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 6d56dc3692a..51ab3eba7f8 100644
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -1358,7 +1358,29 @@ bool InvokePrediffBuffer(BSTR & bstrBuf, int & nChanged, IDispatch *piScript)
 	// VARIANT_BOOL DiffingPreprocessW(BSTR * buffer, UINT * nSize, VARIANT_BOOL * bChanged)
 	HRESULT h = ::safeInvokeW(piScript,	&vboolHandled, L"PrediffBufferW", opFxn[3], 
                             vpboolChanged, vpiSize, vpbstrBuf);
-	bool bSuccess = ! FAILED(h) && vboolHandled.boolVal;
+	bool bSuccess = !FAILED(h);
+	if (bSuccess)
+	{
+		if (vboolHandled.vt == (VT_ARRAY | VT_VARIANT))
+		{
+			long ubound = 0;
+			SafeArrayGetUBound(vboolHandled.parray, 1, &ubound);
+			VARIANT* p;
+			SafeArrayAccessData(vboolHandled.parray, reinterpret_cast<void**>(&p));
+			if (ubound >= 3)
+			{
+				bSuccess = p[0].boolVal;
+				SysFreeString(bstrBuf);
+				bstrBuf = SysAllocStringLen(p[1].bstrVal, SysStringLen(p[1].bstrVal));
+				nBufSize = p[2].iVal;
+				changed = p[3].boolVal;
+			}
+		}
+		else
+		{
+			bSuccess = vboolHandled.boolVal;
+		}
+	}
 	if (bSuccess && changed)
 	{
 		// remove trailing charracters in the rare case that bstrBuf was not resized 

From 68788d226466dd9782f4633afc91f5e5c0e8e884 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 16 Jan 2024 09:16:30 +0900
Subject: [PATCH 03/58] WIP

---
 Src/Common/lwdisp.c | 171 ++++++++++++++++++++++++++++----------------
 Src/Plugins.cpp     |  24 +------
 2 files changed, 112 insertions(+), 83 deletions(-)

diff --git a/Src/Common/lwdisp.c b/Src/Common/lwdisp.c
index 3830cc70ff8..1273edaad56 100644
--- a/Src/Common/lwdisp.c
+++ b/Src/Common/lwdisp.c
@@ -350,6 +350,93 @@ LPDISPATCH NTAPI CreateDispatchBySource(LPCTSTR source, LPCWSTR progid)
 	return (LPDISPATCH)pv;
 }
 
+static BOOL NeedsConversion(LPDISPATCH pi, DISPID id, VARIANT *argv, int cArgs)
+{
+	BOOL bParamByRef = FALSE;
+	BOOL bNeedToConv = FALSE;
+	int i;
+
+	for (i = 0; i < cArgs; i++)
+	{
+		if (V_ISBYREF(&argv[i]))
+		{
+			bParamByRef = TRUE;
+			break;
+		}
+	}
+	if (bParamByRef)
+	{
+		ITypeInfo* pTypeInfo;
+		HRESULT hr;
+
+		hr = pi->lpVtbl->GetTypeInfo(pi, 0, 0, &pTypeInfo);
+		if (SUCCEEDED(hr))
+		{
+			FUNCDESC* pFuncDesc = NULL;
+			ITypeInfo2* pTypeInfo2 = NULL;
+			pTypeInfo->lpVtbl->QueryInterface(pTypeInfo, &IID_ITypeInfo2, &pTypeInfo2);
+			if (pTypeInfo2 != NULL)
+			{
+				UINT nIndex;
+				hr = pTypeInfo2->lpVtbl->GetFuncIndexOfMemId(pTypeInfo2, id, INVOKE_FUNC, &nIndex);
+				if (SUCCEEDED(hr))
+				{
+					hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, nIndex, &pFuncDesc);
+					if (SUCCEEDED(hr))
+					{
+						if (pFuncDesc->oVft == 0)
+							bNeedToConv = TRUE;
+						pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+					}
+				}
+				pTypeInfo2->lpVtbl->Release(pTypeInfo2);
+			}
+			pTypeInfo->lpVtbl->Release(pTypeInfo);
+		}
+	}
+	return bNeedToConv;
+}
+
+static void MoveVariantValue(VARIANT* dst, VARIANT* src)
+{
+	if ((V_VT(dst) & ~VT_BYREF) == VT_BSTR && V_VT(src) == VT_BSTR)
+	{
+		SysFreeString(*V_BSTRREF(dst));
+		*V_BSTRREF(dst) = V_BSTR(src);
+		V_VT(src) = VT_EMPTY;
+		return;
+	}
+	VARIANT varTemp;
+	VariantInit(&varTemp);
+	VariantChangeType(&varTemp, src, 0, (unsigned short)(V_VT(dst) & ~VT_BYREF));
+	switch (V_VT(dst) & ~VT_BYREF) {
+	case VT_BOOL:
+		*V_BOOLREF(dst) = V_BOOL(&varTemp);
+		break;
+	case VT_I1:
+		*V_I2REF(dst) = V_I1(&varTemp);
+		break;
+	case VT_I2:
+		*V_I2REF(dst) = V_I2(&varTemp);
+		break;
+	case VT_I4:
+		*V_I4REF(dst) = V_I4(&varTemp);
+		break;
+	case VT_R4:
+		*V_R4REF(dst) = V_R4(&varTemp);
+		break;
+	case VT_R8:
+		*V_R8REF(dst) = V_R8(&varTemp);
+		break;
+	case VT_BSTR:
+		SysFreeString(*V_BSTRREF(dst));
+		*V_BSTRREF(dst) = V_BSTR(&varTemp);
+		V_VT(&varTemp) = VT_EMPTY;
+		break;
+	}
+	VariantClear(&varTemp);
+}
+
 STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 {
 	HRESULT sc = E_FAIL;
@@ -368,51 +455,10 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 	}
 	if (pi != NULL)
 	{
-		BOOL bParamByRef = FALSE;
-		BOOL bNeedToConv = FALSE;
 		VARIANT varParams[12] = { 0 };
 		VARIANT varData[12] = { 0 };
+		BOOL bNeedToConv = NeedsConversion(pi, id, argv, dispparams.cArgs);
 		int i;
-
-		for (i = 0; i < (int)dispparams.cArgs; i++)
-		{
-			if (V_ISBYREF(&argv[i]))
-			{
-				bParamByRef = TRUE;
-				break;
-			}
-		}
-		if (bParamByRef)
-		{
-			ITypeInfo *pTypeInfo;
-			HRESULT hr;
-
-			hr = pi->lpVtbl->GetTypeInfo(pi, 0, 0, &pTypeInfo);
-			if (SUCCEEDED(hr))
-			{
-				FUNCDESC* pFuncDesc = NULL;
-				ITypeInfo2 *pTypeInfo2 = NULL;
-				pTypeInfo->lpVtbl->QueryInterface(pTypeInfo, &IID_ITypeInfo2, &pTypeInfo2);
-				if (pTypeInfo2 != NULL)
-				{
-					UINT nIndex;
-					hr = pTypeInfo2->lpVtbl->GetFuncIndexOfMemId(pTypeInfo2, id, INVOKE_FUNC, &nIndex);
-					if (SUCCEEDED(hr))
-					{
-						hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, nIndex, &pFuncDesc);
-						if (SUCCEEDED(hr))
-						{
-							if (pFuncDesc->oVft == 0)
-								bNeedToConv = TRUE;
-							pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-						}
-					}
-					pTypeInfo2->lpVtbl->Release(pTypeInfo2);
-				}
-				pTypeInfo->lpVtbl->Release(pTypeInfo);
-			}
-		}
-
 		if (bNeedToConv)
 		{
 			for (i = 0; i < (int)dispparams.cArgs; i++)
@@ -453,27 +499,32 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 		{
 			if (bNeedToConv)
 			{
-				for (i = 0; i < (int)dispparams.cArgs; i++)
+				if (V_VT(ret) == (VT_ARRAY | VT_VARIANT))
 				{
-					if (V_ISBYREF(&argv[i]))
+					long ubound = 0;
+					SafeArrayGetUBound(V_ARRAY(ret), 1, &ubound);
+					VARIANT* p = NULL;
+					int j = ubound;
+					SafeArrayAccessData(V_ARRAY(ret), (void**)(&p));
+					for (i = 0; i < (int)dispparams.cArgs; i++)
 					{
-						VARIANT varTemp;
-						VariantInit(&varTemp);
-						VariantChangeType(&varTemp, &varData[i], 0, (unsigned short)(V_VT(&argv[i]) & ~VT_BYREF));
-						switch(V_VT(&varTemp)) {
-						case VT_BOOL: *V_BOOLREF(&argv[i]) = V_BOOL(&varTemp); break;
-						case VT_I1: *V_I2REF(&argv[i]) = V_I1(&varTemp); break;
-						case VT_I2: *V_I2REF(&argv[i]) = V_I2(&varTemp); break;
-						case VT_I4: *V_I4REF(&argv[i]) = V_I4(&varTemp); break;
-						case VT_R4: *V_R4REF(&argv[i]) = V_R4(&varTemp); break;
-						case VT_R8: *V_R8REF(&argv[i]) = V_R8(&varTemp); break;
-						case VT_BSTR: 
-							SysFreeString(*V_BSTRREF(&argv[i]));
-							*V_BSTRREF(&argv[i]) = V_BSTR(&varTemp);
-							break;
-						}
+						if (V_ISBYREF(&argv[i]) && j > 0)
+							MoveVariantValue(&argv[i], &p[j--]);
+						VariantClear(&varParams[i]);
+					}
+					VARIANT_BOOL bResult = V_BOOL(&p[0]);
+					VariantClear(ret);
+					V_BOOL(ret) = bResult;
+					V_VT(ret) = VT_BOOL;
+				}
+				else
+				{
+					for (i = 0; i < (int)dispparams.cArgs; i++)
+					{
+						if (V_ISBYREF(&argv[i]))
+							MoveVariantValue(&argv[i], &varData[i]);
+						VariantClear(&varParams[i]);
 					}
-					VariantClear(&varParams[i]);
 				}
 			}
 		}
diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 51ab3eba7f8..6d56dc3692a 100644
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -1358,29 +1358,7 @@ bool InvokePrediffBuffer(BSTR & bstrBuf, int & nChanged, IDispatch *piScript)
 	// VARIANT_BOOL DiffingPreprocessW(BSTR * buffer, UINT * nSize, VARIANT_BOOL * bChanged)
 	HRESULT h = ::safeInvokeW(piScript,	&vboolHandled, L"PrediffBufferW", opFxn[3], 
                             vpboolChanged, vpiSize, vpbstrBuf);
-	bool bSuccess = !FAILED(h);
-	if (bSuccess)
-	{
-		if (vboolHandled.vt == (VT_ARRAY | VT_VARIANT))
-		{
-			long ubound = 0;
-			SafeArrayGetUBound(vboolHandled.parray, 1, &ubound);
-			VARIANT* p;
-			SafeArrayAccessData(vboolHandled.parray, reinterpret_cast<void**>(&p));
-			if (ubound >= 3)
-			{
-				bSuccess = p[0].boolVal;
-				SysFreeString(bstrBuf);
-				bstrBuf = SysAllocStringLen(p[1].bstrVal, SysStringLen(p[1].bstrVal));
-				nBufSize = p[2].iVal;
-				changed = p[3].boolVal;
-			}
-		}
-		else
-		{
-			bSuccess = vboolHandled.boolVal;
-		}
-	}
+	bool bSuccess = ! FAILED(h) && vboolHandled.boolVal;
 	if (bSuccess && changed)
 	{
 		// remove trailing charracters in the rare case that bstrBuf was not resized 

From 0037eea5e08d7c38727708372e673bb2c094552d Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 16 Jan 2024 21:02:13 +0900
Subject: [PATCH 04/58] WIP

---
 Plugins/dlls/IgnoreLeadingLineNumbers.sct | 22 ++++------------------
 Src/Common/lwdisp.c                       |  1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Plugins/dlls/IgnoreLeadingLineNumbers.sct b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
index f6db638aaa2..28410b09427 100644
--- a/Plugins/dlls/IgnoreLeadingLineNumbers.sct
+++ b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
@@ -71,25 +71,11 @@ function PrediffBufferW(text, size, bChanged) {
   var eol = (matches != null) ? matches[0] : "\r\n";
   var lines = text.split(eol);
   for (var l = 0; l < lines.length; l++) {
-    var bLineHasStarted = true;
-    var sTemp = "";
-    var line = lines[l];
-    for (var i = 0; i < line.length; i++) { // For all chars...
-      var sChar = line.substr(i, 1);
-      switch (sChar) {
-        case "N": case "n": case "1": case "2": case "3": case "4": case "5": case "6": case "7": case "8": case "9": case "0": // N or number...
-          if (bLineHasStarted) { // if line has started...
-            sChar = "";
-            bChanged = true;
-          }
-          break;
-        default:
-          bLineHasStarted = false;
-          break;
-      }
-      sTemp += sChar;
+    var line = lines[l].replace(/^[Nn0123456789]+/, '');
+    if (line !== lines[l]) {
+      lines[l] = line;
+      bChanged = true;
     }
-    lines[l] = sTemp;
   }
   
   if (bChanged) { // if text has changed...
diff --git a/Src/Common/lwdisp.c b/Src/Common/lwdisp.c
index 1273edaad56..ca0b5dd294d 100644
--- a/Src/Common/lwdisp.c
+++ b/Src/Common/lwdisp.c
@@ -511,6 +511,7 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 						if (V_ISBYREF(&argv[i]) && j > 0)
 							MoveVariantValue(&argv[i], &p[j--]);
 						VariantClear(&varParams[i]);
+						VariantClear(&varData[i]);
 					}
 					VARIANT_BOOL bResult = V_BOOL(&p[0]);
 					VariantClear(ret);

From 2e2ea851221262b967e74010143ed95cff9042fc Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 18 Jan 2024 09:19:30 +0900
Subject: [PATCH 05/58] WIP

---
 Plugins/dlls/IgnoreLeadingLineNumbers.sct |   2 +-
 Plugins/dlls/PrediffLineFilter.sct        | 380 ++++++++++------------
 Src/MergeAppCOMClass.cpp                  |   8 +-
 Src/MergeAppCOMClass.h                    |  19 +-
 4 files changed, 190 insertions(+), 219 deletions(-)

diff --git a/Plugins/dlls/IgnoreLeadingLineNumbers.sct b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
index 28410b09427..7c6889970c7 100644
--- a/Plugins/dlls/IgnoreLeadingLineNumbers.sct
+++ b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
@@ -52,7 +52,7 @@ function get_PluginDescription() {
 }
 
 function get_PluginFileFilters() {
-  return "\.nc$";
+  return "\\.nc$";
 }
 
 function get_PluginIsAutomatic() {
diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index 75cd77fe777..73cdc410bec 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -20,221 +20,185 @@
   <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It does almost the same thing as Substitution filters.
-'    Copyright (C) 2018-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\PrediffLineFilter.sct/"
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function get_PluginEvent()
-  get_PluginEvent = "BUFFER_PREDIFF"
-End Function
-
-Function get_PluginDescription()
-  get_PluginDescription = "Prediff Line Filter"
-End Function
-
-Function get_PluginFileFilters()
-  get_PluginFileFilters = "\.nomatch(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-  get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-  get_PluginExtendedProperties = "MenuCaption=Apply Prediff Substitution Filters"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-  Set mergeApp = obj
-End Sub
-
-Function SafeUBound(ary)
-  On Error Resume Next
-  SafeUBound = -1
-  SafeUBound = UBound(ary)
-End Function
-
-Function PrediffBufferW(pText, pSize, pbChanged)
-  On Error Resume Next
-  Dim re, pattern, replaceText, ignoreCase
-  Dim count, i, j
-  Dim lines
-  Set re = New RegExp
-  If pText = "" Then
-    pbChanged = False
-    PrediffBufferW = True
-    Exit Function
-  End If
-  lines = Split(pText, vbLf)
-  count = regRead(RegKeyPath & "Count", 0)
-  For i = 1 To count
-    If regRead(RegKeyPath & "Enabled" & i, True) Then
-      If regRead(RegKeyPath & "UseRegExp" & i, True) Then
-        re.Global = True
-        re.Pattern = regRead(RegKeyPath & "Pattern" & i, "")
-        re.IgnoreCase = regRead(RegKeyPath & "IgnoreCase" & i, False)
-        replaceText = regRead(RegKeyPath & "ReplaceText" & i, "")
-        For j = 0 To SafeUBound(lines)
-          lines(j) = re.Replace(lines(j), replaceText)
-        Next
-      Else
-        pattern = regRead(RegKeyPath & "Pattern" & i, "")
-        replaceText = regRead(RegKeyPath & "ReplaceText" & i, "")
-        ignoreCase = regRead(RegKeyPath & "IgnoreCase" & i, False)
-        For j = 0 To SafeUBound(lines)
-          If ignoreCase Then
-            lines(j) = Replace(lines(j), pattern, replaceText, 1, -1, vbTextCompare)
-          Else
-            lines(j) = Replace(lines(j), pattern, replaceText, 1, -1, vbBinaryCompare)
-          End If
-        Next
-      End If
-    End If
-  Next
-  pText = Join(lines, vbLf)
-  pSize = Len(pText)
-  pbChanged = True
-  PrediffBufferW = True
-End Function
-
-Function Translate(text)
-  Dim re: Set re = CreateObject("VBScript.RegExp")
-  re.Pattern = "\${([^}]+)}"
-  re.Global = True
-  Translate = text
-  Dim match
-  Dim matches:Set matches = re.Execute(text)
-  if IsEmpty(mergeApp) Then
-    For Each match in matches
-      Translate = Replace(Translate, match.Value, match.Submatches(0))
-    Next
-  Else
-    For Each match in matches
-      Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-    Next
-  End If
-End Function
-
-Function ShowSettingsDialog()
-  Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-  Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-  Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-  Dim mshta
-  tfile.Write Translate(getResource("dialog1"))
-  tfile.Close
-  exportSettingsToXMLFile xmlfile
-  mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-  If Not fso.FileExists(mshta) Then
-    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-  End If
-  Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-  importSettingsFromXMLFile xmlfile
-  fso.DeleteFile tname
-  fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-  sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It does almost the same thing as Substitution filters.
+    Copyright (C) 2018-2023 Takashi Sawanaka
 
-<script language="JScript">
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 var REGKEY_PATH = "Plugins\\PrediffLineFilter.sct/";
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function get_PluginEvent() {
+  return "BUFFER_PREDIFF";
+}
+
+function get_PluginDescription() {
+  return "Prediff Line Filter";
+}
+
+function get_PluginFileFilters() {
+  return "\\.nomatch(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Apply Prediff Substitution Filters";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function PrediffBufferW(pText, pSize, pbChanged) {
+  if (pText == "") {
+    pbChanged = false
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, pText);
+    result.Add(2, pSize);
+    result.Add(3, pbChanged);
+    return result.Items();
+  }
+  var pattern, replaceText, ignoreCase;
+  var lines = pText.split(pText, "\n");
+  var count = regRead(REGKEY_PATH & "Count", 0);
+  for (var i = 1; i <= count; i++) {
+    if (regRead(REGKEY_PATH & "Enabled" & i, true)) {
+      pattern = regRead(REGKEY_PATH & "Pattern" & i, "");
+      ignoreCase = regRead(REGKEY_PATH & "IgnoreCase" & i, false);
+      replaceText = regRead(REGKEY_PATH & "ReplaceText" & i, "");
+      if (regRead(REGKEY_PATH & "UseRegExp" & i, true)) {
+        var re = new RegExp(pattern, ignoreCase ? "gi" : "g");
+        for (var j = 0; j < lines.length; j++)
+          lines[j] = lines[j].replace(re, replaceText);
+      } else {
+        for (var j = 0; j < lines.length; j++)
+          lines[j] = replacei(lines[j], pattern, replaceText, ignoreCase);
+      }
+    }
+  }
+  pbChanged = true;
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, lines.join('\n'));
+  result.Add(2, pText.length);
+  result.Add(3, pbChanged);
+  return result.Items();
+}
+
+function replacei(text, find, replace, ignorecase) {
+  if (!ignorecase)
+    return this.split(str).join(replace);
+  var textLower = text.toLowerCase();
+  var findLower = find.toLowerCase();
+  var pos = textLower.length;
+  while ((pos = textLower.lastIndexOf(findLower, pos)) != -1) {
+    text = text.substr(0, pos) + replace + text.substr(pos + findLower.length);
+    pos--;
+  }
+  return text;
+}
+
+function Translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(Translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  Run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function Run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {"Count" : 0};
-	var count = regRead(REGKEY_PATH + "Count", 0);
-	for (var i = 1; i < count + 1; i++) {
-		key_defvalues["Enabled" + i] = true;
-		key_defvalues["IgnoreCase" + i] = false;
-		key_defvalues["UseRegExp" + i] = false;
-		key_defvalues["Pattern" + i] = "";
-		key_defvalues["ReplaceText" + i] = "";
-	}
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {"Count" : 0};
+  var count = regRead(REGKEY_PATH + "Count", 0);
+  for (var i = 1; i < count + 1; i++) {
+    key_defvalues["Enabled" + i] = true;
+    key_defvalues["IgnoreCase" + i] = false;
+    key_defvalues["UseRegExp" + i] = false;
+    key_defvalues["Pattern" + i] = "";
+    key_defvalues["ReplaceText" + i] = "";
+  }
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 0112e1fe37f..94055a34d75 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -8,9 +8,9 @@
 static PARAMDATA paramData_Translate[] =
 { { L"text", VT_BSTR, }, };
 static PARAMDATA paramData_GetOption[] =
-{ { L"name", VT_BSTR }, { L"defaultValue", VT_VARIANT|VT_BYREF }, };
+{ { L"name", VT_BSTR }, { L"defaultValue", VT_VARIANT}, };
 static PARAMDATA paramData_SaveOption[] =
-{ { L"name", VT_BSTR }, { L"value", VT_VARIANT|VT_BYREF }, };
+{ { L"name", VT_BSTR }, { L"value", VT_VARIANT}, };
 static METHODDATA methodData_MergeApp[] =
 {
 	{ L"Translate",  paramData_Translate,  DISPID_Translate,  3, CC_STDCALL, 1, DISPATCH_METHOD, VT_BSTR },
@@ -34,7 +34,7 @@ BSTR STDMETHODCALLTYPE MergeAppCOMClass::Translate(BSTR text)
 	return SysAllocString(tr(text).c_str());
 }
 
-VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, const VARIANT& varDefault)
+VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefault)
 {
 	VARIANT varResult;
 	VariantInit(&varResult);
@@ -85,7 +85,7 @@ VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, const VARIANT&
 	return varResult;
 }
 
-void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, const VARIANT& varValue)
+void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 {
 	auto value = GetOptionsMgr()->Get(name);
 	const VARIANT* pvar = ((varValue.vt & VT_BYREF) != 0) ? varValue.pvarVal : &varValue;
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index cd7b9c19686..d8a5b8c4be3 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -33,7 +33,14 @@ class MyDispatch : public T, public IDispatch
 
 	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override
 	{
-		return E_NOTIMPL;
+		if (riid == IID_IUnknown || riid == IID_IDispatch)
+		{
+			*ppvObject = static_cast<IDispatch*>(this);
+			AddRef();
+			return S_OK;
+		}
+		*ppvObject = nullptr;
+		return E_NOINTERFACE;
 	}
 
 	ULONG STDMETHODCALLTYPE AddRef(void) override
@@ -68,7 +75,7 @@ class MyDispatch : public T, public IDispatch
 
 	HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) override
 	{
-		return m_pTypeInfo->Invoke(this, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+		return m_pTypeInfo->Invoke(static_cast<T*>(this), dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 	}
 protected:
 	ULONG m_cRef;
@@ -78,8 +85,8 @@ class MyDispatch : public T, public IDispatch
 struct IMergeApp : public IUnknown
 {
 	virtual BSTR STDMETHODCALLTYPE Translate(BSTR text) = 0;
-	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, const VARIANT& varDefault) = 0;
-	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, const VARIANT& varValue) = 0;
+	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) = 0;
+	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) = 0;
 };
 
 class MergeAppCOMClass : public MyDispatch<IMergeApp>
@@ -91,7 +98,7 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	MergeAppCOMClass& operator=(const MergeAppCOMClass&) = delete;
 
 	BSTR STDMETHODCALLTYPE Translate(BSTR text) override;
-	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, const VARIANT& varDefault) override;
-	void STDMETHODCALLTYPE SaveOption(BSTR name, const VARIANT& varValue) override;
+	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) override;
+	void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
 };
 

From ae998ff8aca1f194d52ee6cd23f7cf98dceef067 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 18 Jan 2024 19:42:33 +0900
Subject: [PATCH 06/58] WIP

---
 Plugins/dlls/PrediffLineFilter.sct | 37 ++++++++++++++++--------------
 Src/MergeAppCOMClass.cpp           | 10 +++++++-
 Src/MergeAppCOMClass.h             |  3 +++
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index 73cdc410bec..0621939ee78 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -81,48 +81,51 @@ function PluginOnEvent(eventType, obj) {
 
 function PrediffBufferW(pText, pSize, pbChanged) {
   if (pText == "") {
-    pbChanged = false
     var result = new ActiveXObject("Scripting.Dictionary");
     result.Add(0, true);
-    result.Add(1, pText);
-    result.Add(2, pSize);
-    result.Add(3, pbChanged);
+    result.Add(1, "");
+    result.Add(2, 0);
+    result.Add(3, false);
     return result.Items();
   }
   var pattern, replaceText, ignoreCase;
-  var lines = pText.split(pText, "\n");
-  var count = regRead(REGKEY_PATH & "Count", 0);
+  var lines = pText.split("\n");
+  var count = regRead(REGKEY_PATH + "Count", 0);
   for (var i = 1; i <= count; i++) {
-    if (regRead(REGKEY_PATH & "Enabled" & i, true)) {
-      pattern = regRead(REGKEY_PATH & "Pattern" & i, "");
-      ignoreCase = regRead(REGKEY_PATH & "IgnoreCase" & i, false);
-      replaceText = regRead(REGKEY_PATH & "ReplaceText" & i, "");
-      if (regRead(REGKEY_PATH & "UseRegExp" & i, true)) {
+    if (regRead(REGKEY_PATH + "Enabled" + i, true)) {
+      pattern = regRead(REGKEY_PATH + "Pattern" + i, "");
+      ignoreCase = regRead(REGKEY_PATH + "IgnoreCase" + i, false);
+      replaceText = regRead(REGKEY_PATH + "ReplaceText" + i, "");
+      if (regRead(REGKEY_PATH + "UseRegExp" + i, true)) {
         var re = new RegExp(pattern, ignoreCase ? "gi" : "g");
-        for (var j = 0; j < lines.length; j++)
+        for (var j = 0; j < lines.length; j++) {
           lines[j] = lines[j].replace(re, replaceText);
+        }
       } else {
-        for (var j = 0; j < lines.length; j++)
+        for (var j = 0; j < lines.length; j++) {
           lines[j] = replacei(lines[j], pattern, replaceText, ignoreCase);
+        }
       }
     }
   }
   pbChanged = true;
   var result = new ActiveXObject("Scripting.Dictionary");
+  pText = lines.join("\n");
+  pSize = pText.length;
   result.Add(0, true);
-  result.Add(1, lines.join('\n'));
-  result.Add(2, pText.length);
+  result.Add(1, pText);
+  result.Add(2, pSize);
   result.Add(3, pbChanged);
   return result.Items();
 }
 
 function replacei(text, find, replace, ignorecase) {
   if (!ignorecase)
-    return this.split(str).join(replace);
+    return text.split(find).join(replace);
   var textLower = text.toLowerCase();
   var findLower = find.toLowerCase();
   var pos = textLower.length;
-  while ((pos = textLower.lastIndexOf(findLower, pos)) != -1) {
+  while (pos >= 0 && (pos = textLower.lastIndexOf(findLower, pos)) >= 0) {
     text = text.substr(0, pos) + replace + text.substr(pos + findLower.length);
     pos--;
   }
diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 94055a34d75..3513af99c0c 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -6,16 +6,19 @@
 #include "MergeApp.h"
 
 static PARAMDATA paramData_Translate[] =
-{ { L"text", VT_BSTR, }, };
+{ { L"text", VT_BSTR }, };
 static PARAMDATA paramData_GetOption[] =
 { { L"name", VT_BSTR }, { L"defaultValue", VT_VARIANT}, };
 static PARAMDATA paramData_SaveOption[] =
 { { L"name", VT_BSTR }, { L"value", VT_VARIANT}, };
+static PARAMDATA paramData_Log[] =
+{ { L"level", VT_I4 }, { L"text", VT_BSTR }, };
 static METHODDATA methodData_MergeApp[] =
 {
 	{ L"Translate",  paramData_Translate,  DISPID_Translate,  3, CC_STDCALL, 1, DISPATCH_METHOD, VT_BSTR },
 	{ L"GetOption",  paramData_GetOption,  DISPID_GetOption,  4, CC_STDCALL, 2, DISPATCH_METHOD, VT_VARIANT },
 	{ L"SaveOption", paramData_SaveOption, DISPID_SaveOption, 5, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
+	{ L"Log", paramData_Log, DISPID_Log, 6, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
 };
 
 static INTERFACEDATA idata_MergeApp = { methodData_MergeApp, static_cast<UINT>(std::size(methodData_MergeApp)) }; 
@@ -138,3 +141,8 @@ void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 	}
 	return;
 }
+
+void STDMETHODCALLTYPE MergeAppCOMClass::Log(int level, BSTR text)
+{
+	LogErrorString(text);
+}
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index d8a5b8c4be3..cb611bfaa66 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -7,6 +7,7 @@ enum
 	DISPID_Translate = 1,
 	DISPID_GetOption = 2,
 	DISPID_SaveOption = 3,
+	DISPID_Log = 4,
 };
 
 
@@ -87,6 +88,7 @@ struct IMergeApp : public IUnknown
 	virtual BSTR STDMETHODCALLTYPE Translate(BSTR text) = 0;
 	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) = 0;
 	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) = 0;
+	virtual void STDMETHODCALLTYPE Log(int level, BSTR text) = 0;
 };
 
 class MergeAppCOMClass : public MyDispatch<IMergeApp>
@@ -100,5 +102,6 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	BSTR STDMETHODCALLTYPE Translate(BSTR text) override;
 	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) override;
 	void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
+	void STDMETHODCALLTYPE Log(int level, BSTR text) override;
 };
 

From 39444fe0dfd11aa0dbfdf3f46f94a7b53bdcaf3d Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 18 Jan 2024 21:14:03 +0900
Subject: [PATCH 07/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 1495 +++++++++++++-------------
 Plugins/dlls/PrediffLineFilter.sct   |    2 +-
 2 files changed, 735 insertions(+), 762 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 7067ed201e7..01f1821dd6c 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -1,739 +1,712 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginUnpackedFileExtension">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginUnpackedFileExtension">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Excel files.
-'    Copyright (C) 2005-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSExcelFiles.sct/"
-Const pbGroup = 6
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(wbk)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = wbk.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function QuoteIfNeeded(str)
-	Dim fQuote
-	If InStr(str, vbTab) > 0 Then
-		fQuote = True
-	ElseIf InStr(str, """") > 0 Then
-		fQuote = True
-	ElseIf InStr(str, vbLf) > 0 Then
-		fQuote = True
-	End If
-	If fQuote Then
-		QuoteIfNeeded = """" & Replace(str, """", """""") & """"
-	Else
-		QuoteIfNeeded = str
-	End If
-End Function
-
-Function writeCellValues(fo, sht)
-	Dim varCells, row, col, ary()
-	varCells = sht.UsedRange.Value
-	If TypeName(varCells) = "String" Then
-		fo.WriteLine QuoteIfNeeded(varCells)
-	ElseIf Not IsEmpty(varCells) Then
-		ReDim ary(UBound(varCells, 2))
-		On Error Resume Next
-		For row = 1 To UBound(varCells, 1)
-			For col = 1 To UBound(varCells, 2)
-				ary(col - 1) = QuoteIfNeeded(CStr(varCells(row, col)))
-				If Err.Number <> 0 Then
-					ary(col - 1) = "Error" & Err.Number
-					Err.Clear
-				End If
-			Next
-			fo.WriteLine Join(ary, vbTab)
-		Next
-	End If
-End Function
-
-Function GetAddr(row, col)
-    Dim c
-    c = col - 1
-    Do
-        GetAddr = Chr(65 + (c Mod 26)) & GetAddr
-        c = (c \ 26) - 1
-    Loop While c >= 0
-    GetAddr = GetAddr & row
-End Function
-
-Function writeFormulas(fo, sht)
-	Dim row, col, rowOffset, colOffset, varCells, formula
-	rowOffset = sht.UsedRange.Row
-	colOffset = sht.UsedRange.Column
-	varCells = sht.UsedRange.Formula
-	If TypeName(varCells) = "String" Then
-		fo.WriteLine GetAddr(rowOffset - 1, colOffset - 1) & ": " & varCells
-	Else
-		For row = 1 To UBound(varCells, 1)
-			For col = 1 To UBound(varCells, 2)
-				formula = varCells(row, col)
-				If Left(formula, 1) = "=" Then 
-					fo.WriteLine GetAddr(row + rowOffset - 1, col + colOffset - 1) & ": " & formula
-				End If
-			Next
-		Next
-	End If
-End Function
-
-Function getUsedRangeIncludingShapes(sht)
-	Dim shp, rng
-	Dim col_max, row_max
-	col_max = 0
-	row_max = 0
-	For Each shp In sht.Shapes
-		Set rng = shp.BottomRightCell
-		If row_max < rng.Row + rng.Rows.Count - 1 Then row_max = rng.Row + rng.Rows.Count - 1
-		If col_max < rng.Column + rng.Columns.Count - 1 Then col_max = rng.Column + rng.Columns.Count - 1
-	Next
-	Set rng = sht.UsedRange
-	If row_max < rng.Row + rng.Rows.Count - 1 Then row_max = rng.Row + rng.Rows.Count - 1
-	If col_max < rng.Column + rng.Columns.Count - 1 Then col_max = rng.Column + rng.Columns.Count - 1
-	Set getUsedRangeIncludingShapes = sht.Range("A1", sht.Cells(row_max, col_max))
-End Function
-
-Sub ungroupShapes(sht)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = sht.Shapes.Count
-        For Each shp In sht.Shapes
-            If shp.Type = pbGroup Then shp.ungroup
-        Next
-    Loop While cnt <> sht.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, sht)
-	Dim shp
-	On Error Resume Next
-	For Each shp In sht.Shapes
-		fo.WriteLine shp.Name & ": " & shp.TextFrame.Characters.Text
-	Next
-	On Error GoTo 0
-End Function
-
-Function writeHeadersAndFooters(fo, sht)
-	On Error Resume Next
-	fo.WriteLine "LeftHeader: " & sht.PageSetup.LeftHeader
-	fo.WriteLine "CenterHeader: " & sht.PageSetup.CenterHeader
-	fo.WriteLine "RightHeader: " & sht.PageSetup.RightHeader
-	fo.WriteLine "LeftFooter: " & sht.PageSetup.LeftFooter
-	fo.WriteLine "CenterFooter: " & sht.PageSetup.CenterFooter
-	fo.WriteLine "RightFooter: " & sht.PageSetup.RightFooter
-	On Error GoTo 0
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Sub Sleep(sec)
-	if sec = 0 Then Exit Sub
-	wsh.Run "ping.exe localhost -n " & sec, 0, True
-End Sub
-
-Function saveRangeAsImage(sht, rng, filename)
-	Dim obj
-	Dim shtNew
-	Dim wbkNew
-	Dim oldSheetsInNewWorkbook
-	Dim i
-
-	saveRangeAsImage = True
-
-	On Error Resume Next
-	Err.Clear
-
-	sht.Activate
-	With sht.Parent.Windows(1)
-		.DisplayGridlines = False
-		.View = 1
-	End With
-
-	oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook
-	sht.Application.SheetsInNewWorkbook = 1
-	set wbkNew = sht.Application.Workbooks.Add
-	sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook
-	Set shtNew = wbkNew.Sheets(1)
-	Set obj = wbkNew.Charts.Add
-	Set obj = obj.Location(2, shtNew.Name) ' xlLocationAsObject=2
-
-	If sht.Application.Version <= 11 Then
-		obj.Parent.Width = rng.Width + 8
-		obj.Parent.Height = rng.Height + 8
-	Else
-		obj.Parent.Width = rng.Width
-		obj.Parent.Height = rng.Height
-	End If
-
-	For i = 0 to 1
-		If sht.Application.Version < 14 Then
-			rng.CopyPicture 1, 2 ' xlScreen=1, xlBitmap=2
-			If Err.Number = 0 Then
-				Sleep i
-				obj.Paste
-				obj.Export filename, "PNG"
-			ElseIf i = 0 Then
-				Sleep 1
-			End If
-		Else
-			rng.Copy
-			If Err.Number = 0 Then
-				Sleep i
-				shtNew.Pictures.Paste
-				obj.Export filename, "PNG"
-			ElseIf i = 0 Then
-				Sleep 1
-			End If
-		End If
-
-		If Err.Number = 0 Then Exit For
-		If i = 0 Then Err.Clear
-	Next
-
-	wbkNew.Close False
-
-	saveRangeAsImage = (Err.Number = 0)
-
-End Function
-
-Function getTimeStamp()
-    Dim dt, tm, ms
+<script language="JScript">
+
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Excel files.
+    Copyright (C) 2005-2023 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+var REGKEY_PATH = "Plugins\CompareMSExcelFiles.sct/";
+var pbGroup = 6;
+var MsgCannotGetMacros = "${Cannot get Macros.\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\n}";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(wbk) {
+  var count = -1;
+  try {
+    count = wbk.VBProject.VBComponents.Count;
+  } catch (e) {}
+  return (count > 0);
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function get_PluginEvent() {
+  return "BUFFER_PREDIFF";
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var o = new Enumerator(items); !o.atEnd(); o.moveNext()) {
+      fo.WriteLine(o.item().Name + ": " + o.item().Value);
+    }
+  } catch (e) {}
+}
+
+/*
+function QuoteIfNeeded(str) {
+  var fQuote;
+  if (InStr(str, vbTab) > 0) {
+    fQuote = true;
+  } else if (InStr(str, """") > 0) {
+    fQuote = true;
+  } else if (InStr(str, vbLf) > 0) {
+    fQuote = true;
+  }
+  if (fQuote) {
+    return """" + Replace(str, """", """""") + """";
+  } else { {
+    return str;
+  }
+}
+
+function writeCellValues(fo, sht) {
+  var varCells, row, col, ary()
+  varCells = sht.UsedRange.Value
+  if (TypeName(varCells) = "String") {
+    fo.WriteLine QuoteIfNeeded(varCells)
+  } else if ( (Not IsEmpty(varCells)) {
+    Revar ary(UBound(varCells, 2))
+    try {
+    For row = 1 To UBound(varCells, 1)
+      For col = 1 To UBound(varCells, 2)
+        ary(col - 1) = QuoteIfNeeded(CStr(varCells(row, col)))
+        if (Err.Number <> 0) {
+          ary(col - 1) = "Error" + Err.Number
+          Err.Clear
+        }
+      }
+      fo.WriteLine Join(ary, vbTab)
+    }
+  }
+}
+
+function GetAddr(row, col) {
+  var c
+  c = col - 1
+  Do
+    GetAddr = Chr(65 + (c Mod 26)) + GetAddr
+    c = (c \ 26) - 1
+  Loop While c >= 0
+  GetAddr = GetAddr + row
+}
+
+function writeFormulas(fo, sht) {
+  var row, col, rowOffset, colOffset, varCells, formula
+  rowOffset = sht.UsedRange.Row
+  colOffset = sht.UsedRange.Column
+  varCells = sht.UsedRange.Formula
+  if (TypeName(varCells) = "String") {
+    fo.WriteLine GetAddr(rowOffset - 1, colOffset - 1) + ": " + varCells
+  } else {
+    For row = 1 To UBound(varCells, 1)
+      For col = 1 To UBound(varCells, 2)
+        formula = varCells(row, col)
+        if (Left(formula, 1) = "=") { 
+          fo.WriteLine GetAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula
+        }
+      }
+    }
+  }
+}
+
+function getUsedRangeIncludingShapes(sht) {
+  var shp, rng
+  var col_max, row_max
+  col_max = 0
+  row_max = 0
+  For Each shp In sht.Shapes
+    rng = shp.BottomRightCell
+    if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1
+    if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1
+  }
+  rng = sht.UsedRange
+  if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1
+  if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1
+  getUsedRangeIncludingShapes = sht.Range("A1", sht.Cells(row_max, col_max))
+}
+
+Sub ungroupShapes(sht) {
+  try {
+  var cnt, shp
+  Do
+    cnt = sht.Shapes.Count
+    For Each shp In sht.Shapes
+      if (shp.Type == pbGroup) { shp.ungroup
+    }
+  Loop While cnt <> sht.Shapes.Count
+}
+
+function writeTextsInShapes(fo, sht) {
+  var shp
+  try {
+  For Each shp In sht.Shapes
+    fo.WriteLine shp.Name + ": " + shp.TextFrame.Characters.Text
+  }
+  On Error GoTo 0
+}
+
+function writeHeadersAndFooters(fo, sht) {
+  try {
+    fo.WriteLine "LeftHeader: " + sht.PageSetup.LeftHeader
+    fo.WriteLine "CenterHeader: " + sht.PageSetup.CenterHeader
+    fo.WriteLine "RightHeader: " + sht.PageSetup.RightHeader
+    fo.WriteLine "LeftFooter: " + sht.PageSetup.LeftFooter
+    fo.WriteLine "CenterFooter: " + sht.PageSetup.CenterFooter
+    fo.WriteLine "RightFooter: " + sht.PageSetup.RightFooter
+  } catch(e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function Sleep(sec) {
+  if (sec == 0)
+    return;
+  wsh.Run("ping.exe localhost -n " + sec, 0, true);
+}
+
+function saveRangeAsImage(sht, rng, filename) {
+  var obj
+  var shtNew
+  var wbkNew
+  var oldSheetsInNewWorkbook
+  var i
+
+  saveRangeAsImage = true
+
+  try {
+  Err.Clear
+
+  sht.Activate
+  With sht.Parent.Windows(1)
+    .DisplayGridlines = false
+    .View = 1
+  End With
+
+  oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook
+  sht.Application.SheetsInNewWorkbook = 1
+  set wbkNew = sht.Application.Workbooks.Add
+  sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook
+  shtNew = wbkNew.Sheets(1)
+  obj = wbkNew.Charts.Add
+  obj = obj.Location(2, shtNew.Name) ' xlLocationAsObject=2
+
+  if (sht.Application.Version <= 11) {
+    obj.Parent.Width = rng.Width + 8
+    obj.Parent.Height = rng.Height + 8
+  } else {
+    obj.Parent.Width = rng.Width
+    obj.Parent.Height = rng.Height
+  }
+
+  For i = 0 to 1
+    if (sht.Application.Version < 14) {
+      rng.CopyPicture 1, 2 ' xlScreen=1, xlBitmap=2
+      if (Err.Number == 0) {
+        Sleep i
+        obj.Paste
+        obj.Export filename, "PNG"
+      } else if ( (i == 0) {
+        Sleep 1
+      }
+    } else {
+      rng.Copy
+      if (Err.Number == 0) {
+        Sleep i
+        shtNew.Pictures.Paste
+        obj.Export filename, "PNG"
+      } else if ( (i == 0) {
+        Sleep 1
+      }
+    }
+
+    if (Err.Number == 0) { Exit For
+    if (i == 0) { Err.Clear
+  }
+
+  wbkNew.Close false
+
+  saveRangeAsImage = (Err.Number = 0)
+
+}
+
+function getTimeStamp() {
+    var dt, tm, ms
     tm = Timer
     ms = Fix((tm - Fix(tm)) * 1000)
     tm = Fix(tm)
-    getTimeStamp = (tm \ (60 * 60)) & ":" & ((tm \ 60) Mod 60) & ":" & (tm Mod 60) & "." & ms
-End Function
+    getTimeStamp = (tm \ (60 * 60)) + ":" + ((tm \ 60) Mod 60) + ":" + (tm Mod 60) + "." + ms
+}
 
-Function findRowByPosition(sht, ByVal rowBegin, ByVal rowEnd, ByVal pos)
-    Dim height, rowPrev, row, rowBeginOrg
+function findRowByPosition(sht, rowBegin, rowEnd, pos) {
+    var height, rowPrev, row, rowBeginOrg
     row = rowEnd
     rowBeginOrg = rowBegin
     rowPrev = row
     Do
-        height = sht.Range("A" & rowBeginOrg & ":A" & row).height
-        If height < pos Then
+        height = sht.Range("A" + rowBeginOrg + ":A" + row).height
+        if (height < pos) {
             rowBegin = row
-        Else
+        } else {
             rowEnd = row
-        End If
+        }
         row = (rowEnd - rowBegin) \ 2 + rowBegin
-        If row = rowPrev Then
+        if (row == rowPrev) {
             findRowByPosition = row
             Exit Function
-        End If
+        }
         rowPrev = row
     Loop
-End Function
+}
 
-Function findColumnByPosition(sht, ByVal columnBegin, ByVal columnEnd, ByVal pos)
-    Dim width, columnPrev, column, columnBeginOrg
+function findColumnByPosition(sht, columnBegin, columnEnd, pos) {
+    var width, columnPrev, column, columnBeginOrg
     column = columnEnd
     columnBeginOrg = columnBegin
     columnPrev = column
     Do
         width = sht.Range(sht.Cells(1, columnBeginOrg), sht.Cells(1, column)).width
-        If width < pos Then
+        if (width < pos) {
             columnBegin = column
-        Else
+        } else {
             columnEnd = column
-        End If
+        }
         column = (columnEnd - columnBegin) \ 2 + columnBegin
-        If column = columnPrev Then
+        if (column == columnPrev) {
             findColumnByPosition = column
             Exit Function
-        End If
+        }
         columnPrev = column
     Loop
-End Function
-
-Function saveSheetAsImage(sht, basefilename)
-	Dim rngUsed, rngImage, row, rowEnd, column, columnEnd, filename, numX, numY, imageWidth, imageHeight
-	imageWidth = regRead(RegKeyPath & "ImageWidth", 1000)
-	imageHeight = regRead(RegKeyPath & "ImageHeight", 3000)
-	Set rngUsed = getUsedRangeIncludingShapes(sht)
-	numX = 1
-	column = rngUsed.Column
-	Do 
-		columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth)
-		numY = 1
-		row = rngUsed.Row
-		Do 
-			rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight)
-			Set rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd))
-			filename = basefilename & "(" & numX & "-" & numY & ").png"
-			If Not saveRangeAsImage(sht, rngImage, filename) Then
-				Dim shtNew
-				Set shtNew = sht.Parent.Sheets.Add
-				shtNew.Range("A1") = getTimeStamp() & ": Error" & Err.Number & ": " & Err.Description
-				shtNew.Columns.AutoFit
-				saveRangeAsImage shtNew, shtNew.Range("A1"), filename
-				shtNew.Delete
-			End If
-			row = rowEnd + 1
-			numY = numY + 1
-		Loop While row < rngUsed.row + rngUsed.Rows.Count - 1 
-		column = columnEnd + 1
-		numX = numX + 1
-	Loop While column < rngUsed.column + rngUsed.Columns.Count - 1 
-End Function
-
-Function saveSheetAsHTML(sht, filename)
-    Dim pobj
-    Set pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", "") ' 1 = xlSourceSheet, 0 = xlHtmlStatic
-    pobj.Publish True
-    pobj.AutoRepublish = False
-End Function
-
-Function escape(sheetName)
-    escape = Replace(sheetName, "%", "%25")
-    escape = Replace(escape, "<", "%3C")
-    escape = Replace(escape, ">", "%3E")
-    escape = Replace(escape, "|", "%7C")
-    Select Case Left(UCase(escape), 3)
-    Case "CON", "AUX", "NUL"
-        If Len(escape) = 3 Then
-            escape = "%" & escape
-        End If
-    Case "COM", "LPT"
-        If Len(escape) = 4 And IsNumeric(Mid(escape, 4, 1)) Then
-            escape = "%" & escape
-        End If
-    End Select
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Excel files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlax(\..*)?$;\.xltx(\..*)?$;\.xltm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginUnpackedFileExtension()
-	get_PluginUnpackedFileExtension = ".tsv"
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Excel;MenuCaption=MS-Excel"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim xl
-	Dim wbk
-	Dim sht
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set xl = CreateObject("Excel.Application")
-	xl.EnableEvents = False
-	xl.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set wbk = xl.Workbooks.Open(fileSrc2, regRead(RegKeyPath & "UpdateLinks", 0),,,,,,,,,,,,True)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, wbk.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareNames", True) Then
-		fo.WriteLine "[Names]"
-		writeObjectProperties fo, wbk.Names
-		fo.WriteLine ""
-	End If
-
-	For Each sht In wbk.Worksheets
-		If regRead(RegKeyPath & "CompareCellValues", True) Then
-			fo.WriteLine "[" & sht.Name & "]"
-			writeCellValues fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareFormulas", False) Then
-			fo.WriteLine "[" & sht.Name & ".Formulas]"
-			writeFormulas fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & sht.Name & ".Shapes]"
-			ungroupShapes sht
-			writeTextsInShapes fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
-			fo.WriteLine "[" & sht.Name & ".HeadersAndFooters]"
-			writeHeadersAndFooters fo, sht
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(wbk) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In wbk.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set sht = Nothing
-	wbk.Close
-	Set wbk = Nothing
-	xl.Quit
-	Set xl = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim xl
-	Dim wbk
-	Dim sht
-	Dim cmp
-	Dim digit
-	Dim zf
-	Dim No
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set xl = CreateObject("Excel.Application")
-	xl.EnableEvents = False
-	xl.DisplayAlerts = False
-
-	Dim backgroundChecking
-	backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking
-	xl.ErrorCheckingOptions.BackgroundChecking = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set wbk = xl.Workbooks.Open(fileSrc2, regRead(RegKeyPath & "UpdateLinks", 0),,,,,,,,,,,,True)
-
-	On Error Resume Next
-
-	digit = Len(CStr(wbk.Worksheets.Count))
-	If digit <= 0 Then digit = 1
-	zf = String(digit, "0")
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & zf & ")DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, wbk.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareNames", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & zf & ")Names.txt"), True, True)
-		writeObjectProperties fo, wbk.Names
-		fo.Close
-	End If
-
-	No = 1
-	For Each sht In wbk.Worksheets
-		No = Right(zf & CInt(No), digit)
-		If regRead(RegKeyPath & "CompareCellValues", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & ".tsv"), True, True)
-			writeCellValues fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareFormulas", False) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_Formulas.txt"), True, True)
-			writeFormulas fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_Shapes.txt"), True, True)
-			ungroupShapes sht
-			writeTextsInShapes fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_HeadersAndFooters.txt"), True, True)
-			writeHeadersAndFooters fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareWorksheetsAsImage", True) Then
-			saveSheetAsImage sht, fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name))
-		End If
-
-		If regRead(RegKeyPath & "CompareWorksheetsAsHTML", False) Then
-			saveSheetAsHTML sht, fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & ".html")
-		End If
-		No = CInt(No) + 1
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(wbk) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-
-		For Each cmp In wbk.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set sht = Nothing
-	wbk.Close
-	Set wbk = Nothing
-	xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking
-	xl.Quit
-	Set xl = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+}
 
-</script>
+function saveSheetAsImage(sht, basefilename) {
+  var rngUsed, rngImage, row, rowEnd, column, columnEnd, filename, numX, numY, imageWidth, imageHeight
+  imageWidth = regRead(REGKEY_PATH + "ImageWidth", 1000)
+  imageHeight = regRead(REGKEY_PATH + "ImageHeight", 3000)
+  rngUsed = getUsedRangeIncludingShapes(sht)
+  numX = 1
+  column = rngUsed.Column
+  Do 
+    columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth)
+    numY = 1
+    row = rngUsed.Row
+    Do 
+      rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight)
+      rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd))
+      filename = basefilename + "(" + numX + "-" + numY + ").png"
+      if (Not saveRangeAsImage(sht, rngImage, filename)) {
+        var shtNew
+        shtNew = sht.Parent.Sheets.Add
+        shtNew.Range("A1") = getTimeStamp() + ": Error" + Err.Number + ": " + Err.Description
+        shtNew.Columns.AutoFit
+        saveRangeAsImage shtNew, shtNew.Range("A1"), filename
+        shtNew.Delete
+      }
+      row = rowEnd + 1
+      numY = numY + 1
+    Loop While row < rngUsed.row + rngUsed.Rows.Count - 1 
+    column = columnEnd + 1
+    numX = numX + 1
+  Loop While column < rngUsed.column + rngUsed.Columns.Count - 1 
+}
 
-<script language="JScript">
+function saveSheetAsHTML(sht, filename) {
+    var pobj
+    pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", "") ' 1 = xlSourceSheet, 0 = xlHtmlStatic
+    pobj.Publish true
+    pobj.AutoRepublish = false
+}
+
+function escape(sheetName) {
+  escape = Replace(sheetName, "%", "%25")
+  escape = Replace(escape, "<", "%3C")
+  escape = Replace(escape, ">", "%3E")
+  escape = Replace(escape, "|", "%7C")
+  Select Case Left(UCase(escape), 3)
+  Case "CON", "AUX", "NUL"
+      if (Len(escape) == 3) {
+          escape = "%" + escape
+      }
+  Case "COM", "LPT"
+      if (Len(escape) == 4 And IsNumeric(Mid(escape, 4, 1))) {
+          escape = "%" + escape
+      }
+  End Select
+}
+
+*/
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Excel files";
+}
+
+function get_PluginFileFilters() {
+  return "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlax(\..*)?$;\.xltx(\..*)?$;\.xltm(\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginUnpackedFileExtension() {
+  return ".tsv";
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Excel;MenuCaption=MS-Excel";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+    /*
+  var fo
+  var xl
+  var wbk
+  var sht
+  var cmp
+  var fileSrc2
+
+  fo = fso.CreateTextFile(fileDst, true, true)
+
+  xl = new ActiveXObject("Excel.Application")
+  xl.EnableEvents = false
+  xl.DisplayAlerts = false
+
+  fileSrc2 = fileSrc
+  if (fso.GetExtensionName(fileSrc2) == "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
+    if (Not fso.FileExists(fileSrc2)) {
+      Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found"
+    } (
+  }
+  wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0),,,,,,,,,,,,true)
+
+  try {
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine "[Document Properties]"
+    writeObjectProperties fo, wbk.BuiltinDocumentProperties
+    fo.WriteLine ""
+  }
+
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    fo.WriteLine "[Names]"
+    writeObjectProperties fo, wbk.Names
+    fo.WriteLine ""
+  }
+
+  For Each sht In wbk.Worksheets
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      fo.WriteLine "[" + sht.Name + "]"
+      writeCellValues fo, sht
+      fo.WriteLine ""
+    }
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      fo.WriteLine "[" + sht.Name + ".Formulas]"
+      writeFormulas fo, sht
+      fo.WriteLine ""
+    }
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine "[" + sht.Name + ".Shapes]"
+      ungroupShapes sht
+      writeTextsInShapes fo, sht
+      fo.WriteLine ""
+    }
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      fo.WriteLine "[" + sht.Name + ".HeadersAndFooters]"
+      writeHeadersAndFooters fo, sht
+      fo.WriteLine ""
+    }
+  }
+
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (Not isAccessibleVBAProject(wbk)) {
+      fo.WriteLine Translate(MsgCannotGetMacros)
+    }
+    For Each cmp In wbk.VBProject.VBComponents
+      fo.WriteLine "[CodeModule." + cmp.Name + "]"
+      if (cmp.CodeModule.CountOfLines > 0) {
+        fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
+      }
+      fo.WriteLine ""
+    }
+  }
+
+  sht = null;
+  wbk.Close
+  wbk = null;
+  xl.Quit
+  xl = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true
+  pSubcode = 0
+  UnpackFile = true
+*/
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+/*
+  var fo
+  var xl
+  var wbk
+  var sht
+  var cmp
+  var digit
+  var zf
+  var No
+  var fileSrc2
+
+  if (Not fso.FolderExists(folderDst)) { fso.CreateFolder folderDst
+
+  xl = new ActiveXObject("Excel.Application")
+  xl.EnableEvents = false
+  xl.DisplayAlerts = false
+
+  var backgroundChecking
+  backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking
+  xl.ErrorCheckingOptions.BackgroundChecking = false
+
+  fileSrc2 = fileSrc
+  if (fso.GetExtensionName(fileSrc2) == "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
+    if (Not fso.FileExists(fileSrc2)) {
+      Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found"
+    } (
+  }
+  wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0),,,,,,,,,,,,true)
+
+  try {
+
+  digit = Len(CStr(wbk.Worksheets.Count))
+  if (digit <= 0) { digit = 1
+  zf = String(digit, "0")
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true)
+    writeObjectProperties fo, wbk.BuiltinDocumentProperties
+    fo.Close();
+  }
+
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true)
+    writeObjectProperties fo, wbk.Names
+    fo.Close();
+  }
+
+  No = 1
+  For Each sht In wbk.Worksheets
+    No = Right(zf + CInt(No), digit)
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true)
+      writeCellValues fo, sht
+      fo.Close();
+    }
+
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true)
+      writeFormulas fo, sht
+      fo.Close();
+    }
+
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true)
+      ungroupShapes sht
+      writeTextsInShapes fo, sht
+      fo.Close();
+    }
+
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true)
+      writeHeadersAndFooters fo, sht
+      fo.Close();
+    }
+
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
+      saveSheetAsImage sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name))
+    }
+
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
+      saveSheetAsHTML sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html")
+    }
+    No = CInt(No) + 1
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (Not isAccessibleVBAProject(wbk)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true)
+      fo.WriteLine Translate(MsgCannotGetMacros)
+      fo.Close();
+    }
+
+    For Each cmp In wbk.VBProject.VBComponents
+      cmp.Export fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp))
+    }
+  }
+
+  sht = null;
+  wbk.Close
+  wbk = null;
+  xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking
+  xl.Quit
+  xl = null;
+  fo = null;
+
+  pbChanged = true
+  pSubcode = 0
+  UnpackFolder = true
+  */
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false
+}
+
+function Translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(Translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  Run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function Run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
+
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "UpdateLinks" : false,
+    "CompareDocumentProperties" : false,
+    "CompareNames" : true,
+    "CompareCellValues" : true,
+    "CompareWorksheetsAsImage" : true,
+    "CompareWorksheetsAsHTML" : false,
+    "ImageWidth" : 1000,
+    "ImageHeight" : 3000,
+    "CompareFormulas" : false,
+    "CompareTextsInShapes" : true,
+    "CompareHeadersAndFooters" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
+}
 
-var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
-
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"UpdateLinks" : false,
-		"CompareDocumentProperties" : false,
-		"CompareNames" : true,
-		"CompareCellValues" : true,
-		"CompareWorksheetsAsImage" : true,
-		"CompareWorksheetsAsHTML" : false,
-		"ImageWidth" : 1000,
-		"ImageHeight" : 3000,
-		"CompareFormulas" : false,
-		"CompareTextsInShapes" : true,
-		"CompareHeadersAndFooters" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
-}
-
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -913,66 +886,66 @@ function importSettingsFromXMLFile(filepath)
     </script>
   </head>
   <body onload="onload();">
-		<div class="container">
-			<ul>
-				<li>
-					<input id="chkUnpackToFolder" type="checkbox" onclick="chkUnpackToFolder_onclick();"/>
-					<label>${Extract workbook data to multiple files}</label>
-				</li>
-				<li>
-					<input id="chkUpdateLinks" type="checkbox" />
-					<label>${Update external references(links)}</label>
-				</li>
-				<li>
-					<input id="chkCompareDocumentProperties" type="checkbox" />
-					<label>${Compare document properties}</label>
-				</li>
-				<li>
-					<input id="chkCompareNames" type="checkbox" />
-					<label>${Compare names}</label>
-				</li>
-				<li>
-					<input id="chkCompareCellValues" type="checkbox" />
-					<label>${Compare cell values}</label>
-				</li>
-				<li>
-					<input id="chkCompareWorksheetsAsImage" type="checkbox" onclick="chkCompareWorksheetsAsImage_onclick();"/>
-					<label>${Compare worksheets as image (very slow)}</label>
-					<ul>
-						<li>
-							<label>${ - Image split size: }</label>
-							<input id="txtImageWidth"  type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
-							<span> x </span>
-							<input id="txtImageHeight" type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
-						</li>
-					</ul>
-				</li>
-				<li>
-					<input id="chkCompareWorksheetsAsHTML" type="checkbox" onclick="chkCompareWorksheetsAsHTML_onclick();"/>
-					<label>${Compare worksheets as HTML}</label>
-				</li>
-				<li>
-					<input id="chkCompareFormulas" type="checkbox" />
-					<label>${Compare formulas}</label>
-				</li>
-				<li>
-					<input id="chkCompareTextsInShapes" type="checkbox" />
-					<label>${Compare texts in shapes}</label>
-				</li>
-				<li>
-					<input id="chkCompareHeadersAndFooters" type="checkbox" />
-					<label>${Compare headers and footers}</label>
-				</li>
-				<li>
-					<input id="chkCompareVBAMacros" type="checkbox" />
-					<label>${Compare VBA macros}</label>
-				</li>
-			</ul>
-			<div class="btn-container">
-				<input type="button" class="btn-ok" onclick="btnOk_onclick();" value="${OK}" />
-				<input type="button" class="btn-cancel" onclick="btnCancel_onclick();" value="${Cancel}" />
-			</div>
-		</div>
+    <div class="container">
+      <ul>
+        <li>
+          <input id="chkUnpackToFolder" type="checkbox" onclick="chkUnpackToFolder_onclick();"/>
+          <label>${Extract workbook data to multiple files}</label>
+        </li>
+        <li>
+          <input id="chkUpdateLinks" type="checkbox" />
+          <label>${Update external references(links)}</label>
+        </li>
+        <li>
+          <input id="chkCompareDocumentProperties" type="checkbox" />
+          <label>${Compare document properties}</label>
+        </li>
+        <li>
+          <input id="chkCompareNames" type="checkbox" />
+          <label>${Compare names}</label>
+        </li>
+        <li>
+          <input id="chkCompareCellValues" type="checkbox" />
+          <label>${Compare cell values}</label>
+        </li>
+        <li>
+          <input id="chkCompareWorksheetsAsImage" type="checkbox" onclick="chkCompareWorksheetsAsImage_onclick();"/>
+          <label>${Compare worksheets as image (very slow)}</label>
+          <ul>
+            <li>
+              <label>${ - Image split size: }</label>
+              <input id="txtImageWidth"  type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
+              <span> x </span>
+              <input id="txtImageHeight" type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
+            </li>
+          </ul>
+        </li>
+        <li>
+          <input id="chkCompareWorksheetsAsHTML" type="checkbox" onclick="chkCompareWorksheetsAsHTML_onclick();"/>
+          <label>${Compare worksheets as HTML}</label>
+        </li>
+        <li>
+          <input id="chkCompareFormulas" type="checkbox" />
+          <label>${Compare formulas}</label>
+        </li>
+        <li>
+          <input id="chkCompareTextsInShapes" type="checkbox" />
+          <label>${Compare texts in shapes}</label>
+        </li>
+        <li>
+          <input id="chkCompareHeadersAndFooters" type="checkbox" />
+          <label>${Compare headers and footers}</label>
+        </li>
+        <li>
+          <input id="chkCompareVBAMacros" type="checkbox" />
+          <label>${Compare VBA macros}</label>
+        </li>
+      </ul>
+      <div class="btn-container">
+        <input type="button" class="btn-ok" onclick="btnOk_onclick();" value="${OK}" />
+        <input type="button" class="btn-cancel" onclick="btnCancel_onclick();" value="${Cancel}" />
+      </div>
+    </div>
   </body>
 </html>
 ]]>
diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index 0621939ee78..a7856427fa9 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -253,7 +253,7 @@ function importSettingsFromXMLFile(filepath) {
         ts.Close();
         var nodes = doc.documentElement.childNodes;
         for (var i = 0; i < nodes.length; i++) {
-        	regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+          regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
         }
         return settings;
       }

From c4709947b82026280c8683a580293f095f9b11f9 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 19 Jan 2024 08:56:05 +0900
Subject: [PATCH 08/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 133 +++++++++++++--------------
 1 file changed, 66 insertions(+), 67 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 01f1821dd6c..49d4e556960 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -60,11 +60,11 @@ var wsh = new ActiveXObject("WScript.Shell");
 var mergeApp;
 
 function isAccessibleVBAProject(wbk) {
-  var count = -1;
   try {
-    count = wbk.VBProject.VBComponents.Count;
-  } catch (e) {}
-  return (count > 0);
+    return (wbk.VBProject.VBComponents.Count > 0);
+  } catch (e) {
+    return false;
+  }
 }
 
 function regRead(Key, DefaultValue) {
@@ -87,67 +87,67 @@ function writeObjectProperties(fo, items) {
   } catch (e) {}
 }
 
-/*
-function QuoteIfNeeded(str) {
+function quoteIfNeeded(str) {
   var fQuote;
-  if (InStr(str, vbTab) > 0) {
+  if (str.indexOf("\t") >= 0) {
     fQuote = true;
-  } else if (InStr(str, """") > 0) {
+  } else if (str.indexOf("\"") >= 0) {
     fQuote = true;
-  } else if (InStr(str, vbLf) > 0) {
+  } else if (str.indexOf("\n") >= 0) {
     fQuote = true;
   }
   if (fQuote) {
-    return """" + Replace(str, """", """""") + """";
-  } else { {
+    return "\"" + str.replace(/\"/g, "\"\"") + "\"";
+  } else {
     return str;
   }
 }
 
 function writeCellValues(fo, sht) {
-  var varCells, row, col, ary()
-  varCells = sht.UsedRange.Value
-  if (TypeName(varCells) = "String") {
-    fo.WriteLine QuoteIfNeeded(varCells)
-  } else if ( (Not IsEmpty(varCells)) {
-    Revar ary(UBound(varCells, 2))
+  var varCells = sht.UsedRange.Value;
+  if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+    fo.WriteLine(quoteIfNeeded(varCells));
+  } else if (varCells !== undefined) {
+    var ary = new Array(varCells.ubound(2));
     try {
-    For row = 1 To UBound(varCells, 1)
-      For col = 1 To UBound(varCells, 2)
-        ary(col - 1) = QuoteIfNeeded(CStr(varCells(row, col)))
-        if (Err.Number <> 0) {
-          ary(col - 1) = "Error" + Err.Number
-          Err.Clear
+      for (var row = 1; row <= varCells.ubound(1); row++) {
+        for (var col = 1; col <= varCells.ubound(2); col++) {
+          try {
+            var val = varCells.getItem(row, col);
+            ary[col - 1] = (val !== undefined) ? quoteIfNeeded(val.toString()) : "";
+          } catch (e) {
+            ary[col - 1] = "Error" + e.number;
+          }
         }
+        fo.WriteLine(ary.join("\t"));
       }
-      fo.WriteLine Join(ary, vbTab)
-    }
+    } catch (e) {}
   }
 }
 
-function GetAddr(row, col) {
-  var c
-  c = col - 1
-  Do
-    GetAddr = Chr(65 + (c Mod 26)) + GetAddr
-    c = (c \ 26) - 1
-  Loop While c >= 0
-  GetAddr = GetAddr + row
+function getAddr(row, col) {
+  var addr = "";
+  var c = col - 1;
+  do {
+    addr = String.fromCharCode(65 + (c % 26)) + addr;
+    c = Math.floor(c / 26) - 1;
+  } while (c >= 0);
+  return addr + row;
 }
 
 function writeFormulas(fo, sht) {
-  var row, col, rowOffset, colOffset, varCells, formula
-  rowOffset = sht.UsedRange.Row
-  colOffset = sht.UsedRange.Column
-  varCells = sht.UsedRange.Formula
-  if (TypeName(varCells) = "String") {
-    fo.WriteLine GetAddr(rowOffset - 1, colOffset - 1) + ": " + varCells
+  var row, col, formula
+  var rowOffset = sht.UsedRange.Row;
+  var colOffset = sht.UsedRange.Column;
+  var varCells = sht.UsedRange.Formula;
+  if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+    fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + varCells);
   } else {
-    For row = 1 To UBound(varCells, 1)
-      For col = 1 To UBound(varCells, 2)
-        formula = varCells(row, col)
-        if (Left(formula, 1) = "=") { 
-          fo.WriteLine GetAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula
+    for (var row = 1; row <= varCells.ubound(1); row++) {
+      for (var col = 1; col <= varCells.ubound(2); col++) {
+        var formula = varCells.getItem(row, col);
+        if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
+          fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
         }
       }
     }
@@ -155,21 +155,20 @@ function writeFormulas(fo, sht) {
 }
 
 function getUsedRangeIncludingShapes(sht) {
-  var shp, rng
-  var col_max, row_max
-  col_max = 0
-  row_max = 0
-  For Each shp In sht.Shapes
-    rng = shp.BottomRightCell
-    if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1
-    if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1
+  var col_max = 0;
+  var row_max = 0;
+  for (var shp = new Enumerator(sht.Shapes); !shp.atEnd(); shp.moveNext()) {
+    rng = shp.item().BottomRightCell;
+    if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1 }
+    if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1 }
   }
-  rng = sht.UsedRange
-  if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1
-  if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1
-  getUsedRangeIncludingShapes = sht.Range("A1", sht.Cells(row_max, col_max))
+  var rng = sht.UsedRange;
+  if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1; }
+  if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1; }
+  return sht.Range("A1", sht.Cells(row_max, col_max));
 }
 
+/*
 Sub ungroupShapes(sht) {
   try {
   var cnt, shp
@@ -192,12 +191,12 @@ function writeTextsInShapes(fo, sht) {
 
 function writeHeadersAndFooters(fo, sht) {
   try {
-    fo.WriteLine "LeftHeader: " + sht.PageSetup.LeftHeader
-    fo.WriteLine "CenterHeader: " + sht.PageSetup.CenterHeader
-    fo.WriteLine "RightHeader: " + sht.PageSetup.RightHeader
-    fo.WriteLine "LeftFooter: " + sht.PageSetup.LeftFooter
-    fo.WriteLine "CenterFooter: " + sht.PageSetup.CenterFooter
-    fo.WriteLine "RightFooter: " + sht.PageSetup.RightFooter
+    fo.WriteLine("LeftHeader: " + sht.PageSetup.LeftHeader);
+    fo.WriteLine("CenterHeader: " + sht.PageSetup.CenterHeader);
+    fo.WriteLine("RightHeader: " + sht.PageSetup.RightHeader);
+    fo.WriteLine("LeftFooter: " + sht.PageSetup.LeftFooter);
+    fo.WriteLine("CenterFooter: " + sht.PageSetup.CenterFooter);
+    fo.WriteLine("RightFooter: " + sht.PageSetup.RightFooter);
   } catch(e) {}
 }
 
@@ -212,7 +211,7 @@ function getModuleExtension(cmp) {
   }
 }
 
-function Sleep(sec) {
+function sleep(sec) {
   if (sec == 0)
     return;
   wsh.Run("ping.exe localhost -n " + sec, 0, true);
@@ -256,20 +255,20 @@ function saveRangeAsImage(sht, rng, filename) {
     if (sht.Application.Version < 14) {
       rng.CopyPicture 1, 2 ' xlScreen=1, xlBitmap=2
       if (Err.Number == 0) {
-        Sleep i
+        sleep i
         obj.Paste
         obj.Export filename, "PNG"
       } else if ( (i == 0) {
-        Sleep 1
+        sleep 1
       }
     } else {
       rng.Copy
       if (Err.Number == 0) {
-        Sleep i
+        sleep i
         shtNew.Pictures.Paste
         obj.Export filename, "PNG"
       } else if ( (i == 0) {
-        Sleep 1
+        sleep 1
       }
     }
 

From 18d11aebc63d4f49709377524ccebb4515cc4cbc Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 19 Jan 2024 22:34:59 +0900
Subject: [PATCH 09/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 262 +++++++++++++--------------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 49d4e556960..0c8108bfaa8 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -32,7 +32,7 @@
 /*
     This is a plugin for WinMerge.
     It will display the text content of MS Excel files.
-    Copyright (C) 2005-2023 Takashi Sawanaka
+    Copyright (C) 2005-2024 Takashi Sawanaka
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -81,8 +81,8 @@ function get_PluginEvent() {
 
 function writeObjectProperties(fo, items) {
   try {
-    for (var o = new Enumerator(items); !o.atEnd(); o.moveNext()) {
-      fo.WriteLine(o.item().Name + ": " + o.item().Value);
+    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+      fo.WriteLine(o.Name + ": " + o.Value);
     }
   } catch (e) {}
 }
@@ -157,8 +157,8 @@ function writeFormulas(fo, sht) {
 function getUsedRangeIncludingShapes(sht) {
   var col_max = 0;
   var row_max = 0;
-  for (var shp = new Enumerator(sht.Shapes); !shp.atEnd(); shp.moveNext()) {
-    rng = shp.item().BottomRightCell;
+  for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+    rng = shp.BottomRightCell;
     if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1 }
     if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1 }
   }
@@ -168,25 +168,26 @@ function getUsedRangeIncludingShapes(sht) {
   return sht.Range("A1", sht.Cells(row_max, col_max));
 }
 
-/*
-Sub ungroupShapes(sht) {
+function ungroupShapes(sht) {
   try {
-  var cnt, shp
-  Do
-    cnt = sht.Shapes.Count
-    For Each shp In sht.Shapes
-      if (shp.Type == pbGroup) { shp.ungroup
-    }
-  Loop While cnt <> sht.Shapes.Count
+    var cnt;
+    do {
+      cnt = sht.Shapes.Count;
+      for (var it = new Enumerator(sht.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
+        if (shp.Type == pbGroup) {
+          shp.Ungroup();
+        }
+      }
+    } while (cnt != sht.Shapes.Count);
+  } catch (e) {}
 }
 
 function writeTextsInShapes(fo, sht) {
-  var shp
   try {
-  For Each shp In sht.Shapes
-    fo.WriteLine shp.Name + ": " + shp.TextFrame.Characters.Text
-  }
-  On Error GoTo 0
+    for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      fo.WriteLine(shp.Name + ": " + shp.TextFrame.Characters.Text);
+    }
+  } catch (e) {}
 }
 
 function writeHeadersAndFooters(fo, sht) {
@@ -218,78 +219,73 @@ function sleep(sec) {
 }
 
 function saveRangeAsImage(sht, rng, filename) {
-  var obj
-  var shtNew
-  var wbkNew
-  var oldSheetsInNewWorkbook
-  var i
-
-  saveRangeAsImage = true
-
+  var result = true;
   try {
-  Err.Clear
-
-  sht.Activate
-  With sht.Parent.Windows(1)
-    .DisplayGridlines = false
-    .View = 1
-  End With
-
-  oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook
-  sht.Application.SheetsInNewWorkbook = 1
-  set wbkNew = sht.Application.Workbooks.Add
-  sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook
-  shtNew = wbkNew.Sheets(1)
-  obj = wbkNew.Charts.Add
-  obj = obj.Location(2, shtNew.Name) ' xlLocationAsObject=2
-
-  if (sht.Application.Version <= 11) {
-    obj.Parent.Width = rng.Width + 8
-    obj.Parent.Height = rng.Height + 8
-  } else {
-    obj.Parent.Width = rng.Width
-    obj.Parent.Height = rng.Height
-  }
-
-  For i = 0 to 1
-    if (sht.Application.Version < 14) {
-      rng.CopyPicture 1, 2 ' xlScreen=1, xlBitmap=2
-      if (Err.Number == 0) {
-        sleep i
-        obj.Paste
-        obj.Export filename, "PNG"
-      } else if ( (i == 0) {
-        sleep 1
-      }
+    sht.Activate();
+    var win = sht.Parent.Windows(1);
+    win.DisplayGridlines = false;
+    win.View = 1
+
+    var oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook;
+    sht.Application.SheetsInNewWorkbook = 1;
+    var wbkNew = sht.Application.Workbooks.Add();
+    sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook;
+    var shtNew = wbkNew.Sheets(1);
+    var obj = wbkNew.Charts.Add();
+    obj = obj.Location(2, shtNew.Name); // xlLocationAsObject=2
+ 
+    if (sht.Application.Version <= 11) {
+      obj.Parent.Width = rng.Width + 8;
+      obj.Parent.Height = rng.Height + 8;
     } else {
-      rng.Copy
-      if (Err.Number == 0) {
-        sleep i
-        shtNew.Pictures.Paste
-        obj.Export filename, "PNG"
-      } else if ( (i == 0) {
-        sleep 1
+      obj.Parent.Width = rng.Width;
+      obj.Parent.Height = rng.Height;
+    }
+ 
+    for (var i = 0; i <= 1; i++) {
+      if (sht.Application.Version < 14) {
+        try {
+          rng.CopyPicture(1, 2); // xlScreen=1, xlBitmap=2
+          sleep(i);
+          obj.Paste;
+          obj.Export(filename, "PNG");
+          result = true;
+          break;
+        } catch (e) {
+          result = false;
+          if (i == 0) {
+            sleep(1);
+          }
+        }
+      } else {
+        try {
+          rng.Copy();
+          sleep(i);
+          shtNew.Pictures.Paste();
+          obj.Export(filename, "PNG");
+          result = true;
+          break;
+        } catch (e) {
+          result = false;
+          if (i == 0) {
+            sleep(1);
+          }
+        }
       }
     }
-
-    if (Err.Number == 0) { Exit For
-    if (i == 0) { Err.Clear
+  } catch (e) {
+    result = false;
   }
-
-  wbkNew.Close false
-
-  saveRangeAsImage = (Err.Number = 0)
-
+  wbkNew.Close(false);
+  return result;
 }
 
 function getTimeStamp() {
-    var dt, tm, ms
-    tm = Timer
-    ms = Fix((tm - Fix(tm)) * 1000)
-    tm = Fix(tm)
-    getTimeStamp = (tm \ (60 * 60)) + ":" + ((tm \ 60) Mod 60) + ":" + (tm Mod 60) + "." + ms
+  var dt = new Date();
+  return dt.toLocaleString().split(" ")[1] + "." + ("000" + dt.getMilliseconds()).slice(-3);
 }
 
+/*
 function findRowByPosition(sht, rowBegin, rowEnd, pos) {
     var height, rowPrev, row, rowBeginOrg
     row = rowEnd
@@ -363,32 +359,31 @@ function saveSheetAsImage(sht, basefilename) {
   Loop While column < rngUsed.column + rngUsed.Columns.Count - 1 
 }
 
+*/
+
 function saveSheetAsHTML(sht, filename) {
-    var pobj
-    pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", "") ' 1 = xlSourceSheet, 0 = xlHtmlStatic
-    pobj.Publish true
-    pobj.AutoRepublish = false
+  var pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", ""); // 1 = xlSourceSheet, 0 = xlHtmlStatic
+  pobj.Publish(true);
+  pobj.AutoRepublish = false;
 }
 
 function escape(sheetName) {
-  escape = Replace(sheetName, "%", "%25")
-  escape = Replace(escape, "<", "%3C")
-  escape = Replace(escape, ">", "%3E")
-  escape = Replace(escape, "|", "%7C")
-  Select Case Left(UCase(escape), 3)
-  Case "CON", "AUX", "NUL"
-      if (Len(escape) == 3) {
-          escape = "%" + escape
-      }
-  Case "COM", "LPT"
-      if (Len(escape) == 4 And IsNumeric(Mid(escape, 4, 1))) {
-          escape = "%" + escape
-      }
-  End Select
+  var escape = sheetName.replace(/%/g, "%25").replace(/</g, "%3C").replace(/>/, "%3E").replace(/\|/, "%7C");
+  switch (escape.toLowerCase().substr(0, 3)) {
+  case "CON", "AUX", "NUL":
+    if (escape.length == 3) {
+      escape = "%" + escape;
+    }
+    break;
+  case "COM", "LPT":
+    if (escape.length == 4 && !isNaN(escape.substr(3, 1))) {
+      escape = "%" + escape;
+    }
+    break;
+  }
+  return escape;
 }
 
-*/
-
 function get_PluginEvent() {
   return "FILE_FOLDER_PACK_UNPACK";
 }
@@ -444,66 +439,71 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   try {
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-    fo.WriteLine "[Document Properties]"
-    writeObjectProperties fo, wbk.BuiltinDocumentProperties
-    fo.WriteLine ""
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+    fo.WriteLine("");
   }
 
   if (regRead(REGKEY_PATH + "CompareNames", true)) {
-    fo.WriteLine "[Names]"
-    writeObjectProperties fo, wbk.Names
-    fo.WriteLine ""
+    fo.WriteLine("[Names]");
+    writeObjectProperties(fo, wbk.Names);
+    fo.WriteLine("");
   }
 
   For Each sht In wbk.Worksheets
     if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-      fo.WriteLine "[" + sht.Name + "]"
-      writeCellValues fo, sht
-      fo.WriteLine ""
+      fo.WriteLine("[" + sht.Name + "]");
+      writeCellValues(fo, sht);
+      fo.WriteLine("");
     }
     if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-      fo.WriteLine "[" + sht.Name + ".Formulas]"
-      writeFormulas fo, sht
-      fo.WriteLine ""
+      fo.WriteLine("[" + sht.Name + ".Formulas]");
+      writeFormulas(fo, sht);
+      fo.WriteLine("");
     }
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-      fo.WriteLine "[" + sht.Name + ".Shapes]"
-      ungroupShapes sht
-      writeTextsInShapes fo, sht
-      fo.WriteLine ""
+      fo.WriteLine("[" + sht.Name + ".Shapes]");
+      ungroupShapes(sht);
+      writeTextsInShapes(fo, sht);
+      fo.WriteLine("");
     }
     if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-      fo.WriteLine "[" + sht.Name + ".HeadersAndFooters]"
-      writeHeadersAndFooters fo, sht
-      fo.WriteLine ""
+      fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
+      writeHeadersAndFooters(fo, sht);
+      fo.WriteLine("");
     }
   }
 
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
-    if (Not isAccessibleVBAProject(wbk)) {
-      fo.WriteLine Translate(MsgCannotGetMacros)
+    if (!isAccessibleVBAProject(wbk)) {
+      fo.WriteLine(Translate(MsgCannotGetMacros));
     }
     For Each cmp In wbk.VBProject.VBComponents
-      fo.WriteLine "[CodeModule." + cmp.Name + "]"
+      fo.WriteLine("[CodeModule." + cmp.Name + "]");
       if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
+        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
       }
-      fo.WriteLine ""
+      fo.WriteLine("");
     }
   }
 
   sht = null;
-  wbk.Close
+  wbk.Close();
   wbk = null;
-  xl.Quit
+  xl.Quit();
   xl = null;
   fo.Close();
   fo = null;
 
-  pbChanged = true
-  pSubcode = 0
-  UnpackFile = true
-*/
+  pbChanged = true;
+  pSubcode = 0;
+  
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+  */
 }
 
 function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {

From 5d71810986d375e44f8a7c39eeed38e426116ffb Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sat, 20 Jan 2024 11:17:08 +0900
Subject: [PATCH 10/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 423 +++++++++++++--------------
 1 file changed, 199 insertions(+), 224 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 0c8108bfaa8..cbd22e01d5f 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -49,7 +49,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-var REGKEY_PATH = "Plugins\CompareMSExcelFiles.sct/";
+var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
 var pbGroup = 6;
 var MsgCannotGetMacros = "${Cannot get Macros.\n" + 
   "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\n" + 
@@ -224,7 +224,7 @@ function saveRangeAsImage(sht, rng, filename) {
     sht.Activate();
     var win = sht.Parent.Windows(1);
     win.DisplayGridlines = false;
-    win.View = 1
+    win.View = 1;
 
     var oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook;
     sht.Application.SheetsInNewWorkbook = 1;
@@ -285,82 +285,75 @@ function getTimeStamp() {
   return dt.toLocaleString().split(" ")[1] + "." + ("000" + dt.getMilliseconds()).slice(-3);
 }
 
-/*
 function findRowByPosition(sht, rowBegin, rowEnd, pos) {
-    var height, rowPrev, row, rowBeginOrg
-    row = rowEnd
-    rowBeginOrg = rowBegin
+  var rowPrev, row, rowBeginOrg;
+  row = rowEnd;
+  rowBeginOrg = rowBegin;
+  rowPrev = row;
+  do {
+    var height = sht.Range("A" + rowBeginOrg + ":A" + row).height;
+    if (height < pos) {
+      rowBegin = row;
+    } else {
+      rowEnd = row;
+    }
+    row = Math.floor((rowEnd - rowBegin) / 2) + rowBegin;
+    if (row == rowPrev) {
+      return row;
+    }
     rowPrev = row
-    Do
-        height = sht.Range("A" + rowBeginOrg + ":A" + row).height
-        if (height < pos) {
-            rowBegin = row
-        } else {
-            rowEnd = row
-        }
-        row = (rowEnd - rowBegin) \ 2 + rowBegin
-        if (row == rowPrev) {
-            findRowByPosition = row
-            Exit Function
-        }
-        rowPrev = row
-    Loop
+  } while (true);
 }
 
 function findColumnByPosition(sht, columnBegin, columnEnd, pos) {
-    var width, columnPrev, column, columnBeginOrg
-    column = columnEnd
-    columnBeginOrg = columnBegin
-    columnPrev = column
-    Do
-        width = sht.Range(sht.Cells(1, columnBeginOrg), sht.Cells(1, column)).width
-        if (width < pos) {
-            columnBegin = column
-        } else {
-            columnEnd = column
-        }
-        column = (columnEnd - columnBegin) \ 2 + columnBegin
-        if (column == columnPrev) {
-            findColumnByPosition = column
-            Exit Function
-        }
-        columnPrev = column
-    Loop
+  var column = columnEnd;
+  var columnBeginOrg = columnBegin;
+  var columnPrev = column;
+  do {
+    var width = sht.Range(sht.Cells(1, columnBeginOrg), sht.Cells(1, column)).width;
+    if (width < pos) {
+      columnBegin = column;
+    } else {
+      columnEnd = column;
+    }
+    column = Math.floor((columnEnd - columnBegin) / 2) + columnBegin;
+    if (column == columnPrev) {
+      return column;
+    }
+    columnPrev = column;
+  } while (true);
 }
 
+
 function saveSheetAsImage(sht, basefilename) {
-  var rngUsed, rngImage, row, rowEnd, column, columnEnd, filename, numX, numY, imageWidth, imageHeight
-  imageWidth = regRead(REGKEY_PATH + "ImageWidth", 1000)
-  imageHeight = regRead(REGKEY_PATH + "ImageHeight", 3000)
-  rngUsed = getUsedRangeIncludingShapes(sht)
-  numX = 1
-  column = rngUsed.Column
-  Do 
-    columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth)
-    numY = 1
-    row = rngUsed.Row
-    Do 
-      rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight)
-      rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd))
-      filename = basefilename + "(" + numX + "-" + numY + ").png"
-      if (Not saveRangeAsImage(sht, rngImage, filename)) {
-        var shtNew
-        shtNew = sht.Parent.Sheets.Add
-        shtNew.Range("A1") = getTimeStamp() + ": Error" + Err.Number + ": " + Err.Description
-        shtNew.Columns.AutoFit
-        saveRangeAsImage shtNew, shtNew.Range("A1"), filename
-        shtNew.Delete
+  var imageWidth = regRead(REGKEY_PATH + "ImageWidth", 1000);
+  var imageHeight = regRead(REGKEY_PATH + "ImageHeight", 3000);
+  var rngUsed = getUsedRangeIncludingShapes(sht);
+  var numX = 1;
+  var column = rngUsed.Column;
+  do {
+    var columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth);
+    var numY = 1
+    var row = rngUsed.Row;
+    do {
+      var rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight);
+      var rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd));
+      var filename = basefilename + "(" + numX + "-" + numY + ").png";
+      if (!saveRangeAsImage(sht, rngImage, filename)) {
+        var shtNew = sht.Parent.Sheets.Add();
+        shtNew.Range("A1") = getTimeStamp() + ": Error" + Err.Number + ": " + Err.Description;
+        shtNew.Columns.AutoFit();
+        saveRangeAsImage(shtNew, shtNew.Range("A1"), filename);
+        shtNew.Delete();
       }
-      row = rowEnd + 1
-      numY = numY + 1
-    Loop While row < rngUsed.row + rngUsed.Rows.Count - 1 
-    column = columnEnd + 1
-    numX = numX + 1
-  Loop While column < rngUsed.column + rngUsed.Columns.Count - 1 
+      row = rowEnd + 1;
+      numY = numY + 1;
+    } while (row < rngUsed.row + rngUsed.Rows.Count - 1);
+    column = columnEnd + 1;
+    numX = numX + 1;
+  } while (column < rngUsed.column + rngUsed.Columns.Count - 1);
 }
 
-*/
-
 function saveSheetAsHTML(sht, filename) {
   var pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", ""); // 1 = xlSourceSheet, 0 = xlHtmlStatic
   pobj.Publish(true);
@@ -413,81 +406,72 @@ function PluginOnEvent(eventType, obj) {
 }
 
 function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
-    /*
-  var fo
-  var xl
-  var wbk
-  var sht
-  var cmp
-  var fileSrc2
-
-  fo = fso.CreateTextFile(fileDst, true, true)
+  var fo = fso.CreateTextFile(fileDst, true, true);
 
-  xl = new ActiveXObject("Excel.Application")
-  xl.EnableEvents = false
-  xl.DisplayAlerts = false
+  var xl = new ActiveXObject("Excel.Application");
+  xl.EnableEvents = false;
+  xl.DisplayAlerts = false;
 
-  fileSrc2 = fileSrc
+  var fileSrc2 = fileSrc;
   if (fso.GetExtensionName(fileSrc2) == "lnk") {
-    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-    if (Not fso.FileExists(fileSrc2)) {
-      Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found"
-    } (
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    }
   }
-  wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0),,,,,,,,,,,,true)
-
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, true);
   try {
-
-  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-    fo.WriteLine("[Document Properties]");
-    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
-    fo.WriteLine("");
-  }
-
-  if (regRead(REGKEY_PATH + "CompareNames", true)) {
-    fo.WriteLine("[Names]");
-    writeObjectProperties(fo, wbk.Names);
-    fo.WriteLine("");
-  }
-
-  For Each sht In wbk.Worksheets
-    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-      fo.WriteLine("[" + sht.Name + "]");
-      writeCellValues(fo, sht);
-      fo.WriteLine("");
-    }
-    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-      fo.WriteLine("[" + sht.Name + ".Formulas]");
-      writeFormulas(fo, sht);
-      fo.WriteLine("");
-    }
-    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-      fo.WriteLine("[" + sht.Name + ".Shapes]");
-      ungroupShapes(sht);
-      writeTextsInShapes(fo, sht);
+    if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+      fo.WriteLine("[Document Properties]");
+      writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
       fo.WriteLine("");
     }
-    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-      fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
-      writeHeadersAndFooters(fo, sht);
+ 
+    if (regRead(REGKEY_PATH + "CompareNames", true)) {
+      fo.WriteLine("[Names]");
+      writeObjectProperties(fo, wbk.Names);
       fo.WriteLine("");
     }
-  }
-
-  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
-    if (!isAccessibleVBAProject(wbk)) {
-      fo.WriteLine(Translate(MsgCannotGetMacros));
+ 
+    for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+      if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+        fo.WriteLine("[" + sht.Name + "]");
+        writeCellValues(fo, sht);
+        fo.WriteLine("");
+      }
+      if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+        fo.WriteLine("[" + sht.Name + ".Formulas]");
+        writeFormulas(fo, sht);
+        fo.WriteLine("");
+      }
+      if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+        fo.WriteLine("[" + sht.Name + ".Shapes]");
+        ungroupShapes(sht);
+        writeTextsInShapes(fo, sht);
+        fo.WriteLine("");
+      }
+      if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+        fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
+        writeHeadersAndFooters(fo, sht);
+        fo.WriteLine("");
+      }
     }
-    For Each cmp In wbk.VBProject.VBComponents
-      fo.WriteLine("[CodeModule." + cmp.Name + "]");
-      if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+ 
+    if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+      if (!isAccessibleVBAProject(wbk)) {
+        fo.WriteLine(Translate(MsgCannotGetMacros));
+      }
+      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
       }
-      fo.WriteLine("");
     }
-  }
+    sht = null;
+  } catch (e) { }
 
-  sht = null;
   wbk.Close();
   wbk = null;
   xl.Quit();
@@ -503,7 +487,6 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   result.Add(1, pbChanged);
   result.Add(2, pSubcode);
   return result.Items();
-  */
 }
 
 function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
@@ -515,115 +498,107 @@ function IsFolder(file) {
 }
 
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
-/*
-  var fo
-  var xl
-  var wbk
-  var sht
-  var cmp
-  var digit
-  var zf
-  var No
-  var fileSrc2
-
-  if (Not fso.FolderExists(folderDst)) { fso.CreateFolder folderDst
-
-  xl = new ActiveXObject("Excel.Application")
-  xl.EnableEvents = false
-  xl.DisplayAlerts = false
-
-  var backgroundChecking
-  backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking
-  xl.ErrorCheckingOptions.BackgroundChecking = false
-
-  fileSrc2 = fileSrc
-  if (fso.GetExtensionName(fileSrc2) == "lnk") {
-    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-    if (Not fso.FileExists(fileSrc2)) {
-      Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found"
-    } (
-  }
-  wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0),,,,,,,,,,,,true)
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
 
-  try {
+  var xl = new ActiveXObject("Excel.Application");
+  xl.EnableEvents = false;
+  xl.DisplayAlerts = false;
 
-  digit = Len(CStr(wbk.Worksheets.Count))
-  if (digit <= 0) { digit = 1
-  zf = String(digit, "0")
+  var backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking;
+  xl.ErrorCheckingOptions.BackgroundChecking = false;
 
-  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true)
-    writeObjectProperties fo, wbk.BuiltinDocumentProperties
-    fo.Close();
-  }
-
-  if (regRead(REGKEY_PATH + "CompareNames", true)) {
-    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true)
-    writeObjectProperties fo, wbk.Names
-    fo.Close();
-  }
-
-  No = 1
-  For Each sht In wbk.Worksheets
-    No = Right(zf + CInt(No), digit)
-    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true)
-      writeCellValues fo, sht
-      fo.Close();
-    }
-
-    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true)
-      writeFormulas fo, sht
-      fo.Close();
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) == "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw Error(30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found");
     }
+  }
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, true);
 
-    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true)
-      ungroupShapes sht
-      writeTextsInShapes fo, sht
+  try {
+    digit = String(wbk.Worksheets.Count).length;
+    if (digit <= 0) { digit = 1; }
+    var zf = Array(digit + 1).join("0");
+ 
+    if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
+      writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
       fo.Close();
     }
-
-    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true)
-      writeHeadersAndFooters fo, sht
+ 
+    if (regRead(REGKEY_PATH + "CompareNames", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
+      writeObjectProperties(fo, wbk.Names);
       fo.Close();
     }
-
-    if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
-      saveSheetAsImage sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name))
-    }
-
-    if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
-      saveSheetAsHTML sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html")
-    }
-    No = CInt(No) + 1
-  }
-  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
-    if (Not isAccessibleVBAProject(wbk)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true)
-      fo.WriteLine Translate(MsgCannotGetMacros)
-      fo.Close();
+ 
+    var No = 1;
+    for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+      No = zf + No;
+      No = No.substr(No.length() - digit, digit);
+      if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
+        writeCellValues(fo, sht);
+        fo.Close();
+      }
+ 
+      if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
+        writeCellValues(fo, sht);
+        fo.Close();
+      }
+ 
+      if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
+        ungroupShapes(sht);
+        writeTextsInShapes(fo, sht);
+        fo.Close();
+      }
+ 
+      if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
+        writeHeadersAndFooters(fo, sht);
+        fo.Close();
+      }
+ 
+      if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
+        saveSheetAsImage(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name)));
+      }
+ 
+      if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
+        saveSheetAsHTML(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html"));
+      }
+      No = parseInt(No) + 1;
     }
-
-    For Each cmp In wbk.VBProject.VBComponents
-      cmp.Export fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp))
+    if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+      if (!isAccessibleVBAProject(wbk)) {
+        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+        fo.WriteLine(Translate(MsgCannotGetMacros));
+        fo.Close();
+      }
+ 
+      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
     }
-  }
-
-  sht = null;
-  wbk.Close
+    sht = null;
+  } catch (e) { }
+  wbk.Close();
   wbk = null;
-  xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking
-  xl.Quit
+  xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking;
+  xl.Quit();
   xl = null;
   fo = null;
 
-  pbChanged = true
-  pSubcode = 0
-  UnpackFolder = true
-  */
+  pbChanged = true;
+  pSubcode = 0;
+  
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
 }
 
 function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {

From ca5ef85481002a943e9c8310a2fbf20f3a83c3ba Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 21 Jan 2024 09:42:27 +0900
Subject: [PATCH 11/58] WIP

---
 Plugins/dlls/editor addin.sct | 1504 ++++++++++++++++-----------------
 1 file changed, 732 insertions(+), 772 deletions(-)

diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 239aa04ef42..7cfaab71fe7 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -1,801 +1,761 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginArguments">
-		<get/>
-		<put/>
-	</property>
-	<property name="PluginVariables">
-		<get/>
-		<put/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="ExecFilterCommand"/>
-	<method name="MakeUpper"/>
-	<method name="MakeLower"/>
-	<method name="RemoveDuplicates"/>
-	<method name="CountDuplicates"/>
-	<method name="SortAscending"/>
-	<method name="SortDescending"/>
-	<method name="ReverseColumns"/>
-	<method name="ReverseLines"/>
-	<method name="SelectColumns"/>
-	<method name="SelectLines"/>
-	<method name="Replace" internalName="ReplaceText"/>
-	<method name="Tokenize"/>
-	<method name="Trim"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginArguments">
+    <get/>
+    <put/>
+  </property>
+  <property name="PluginVariables">
+    <get/>
+    <put/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="ExecFilterCommand"/>
+  <method name="MakeUpper"/>
+  <method name="MakeLower"/>
+  <method name="RemoveDuplicates"/>
+  <method name="CountDuplicates"/>
+  <method name="SortAscending"/>
+  <method name="SortDescending"/>
+  <method name="ReverseColumns"/>
+  <method name="ReverseLines"/>
+  <method name="SelectColumns"/>
+  <method name="SelectLines"/>
+  <method name="Replace" internalName="ReplaceText"/>
+  <method name="Tokenize"/>
+  <method name="Trim"/>
 </implements>
 
-<script language="VBS">
-Option Explicit
-
-Const PluginRegKeyPath = "Plugins\editor addin.sct/"
-
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim arguments: arguments = ""
-Dim variables: variables = Array()
-Dim mergeApp
-
-Function get_PluginEvent()
-	get_PluginEvent = "EDITOR_SCRIPT"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Basic text functions for the context menu"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters= ".*"
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = _
-	"GenerateUnpacker;" & _
-	"MakeUpper.MenuCaption=Make Uppercase;" & _
-	"MakeUpper.Description=Make characters uppercase;" & _
-	"MakeLower.MenuCaption=Make Lowercase;" & _
-	"MakeLower.Description=Make characters lowercase;" & _
-	"RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" & _
-	"RemoveDuplicates.Description=Remove duplicate lines;" & _
-	"CountDuplicates.MenuCaption=Count Duplicate Lines;" & _
-	"CountDuplicates.Description=Count duplicate lines;" & _
-	"SortAscending.MenuCaption=Sort Lines Ascending;" & _
-	"SortAscending.Description=Sort lines ascending;" & _
-	"SortDescending.MenuCaption=Sort Lines Descending;" & _
-	"SortDescending.Description=Sort lines descending;" & _
-	"ExecFilterCommand.MenuCaption=Apply Filter Command...;" & _
-	"ExecFilterCommand.Description=Apply filter command. " & vbCrLf & _
-		"Usage: ExecFilterCommand COMMAND" & vbCrLf & _
-		"  COMMAND - command to execute. %1 in the command is replaced with the filename.;" & _
-	"ExecFilterCommand.ArgumentsRequired;" & _
-	"Tokenize.MenuCaption=Tokenize...;" & _
-	"Tokenize.Description=Tokenize selection. " & vbCrLf & _
-		"Usage: Tokenize PATTERNS" & vbCrLf & _
-		"  PATTERNS - regular expression for tokenizing. (e.g. [^\w]+);" & _
-	"Tokenize.ArgumentsRequired;" & _
-	"Tokenize.Arguments=[^\w]+;" & _
-	"Trim.MenuCaption=Trim Spaces;" & _
-	"Trim.Description=Trim spaces;" & _
-	"SelectColumns.MenuCaption=Select Columns...;" & _
-	"SelectColumns.Description=Select some columns." & vbCrLf & _
-		"Usage: SelectColumns RANGES" & vbCrLf & _
-		"   or: SelectColumns [-v] [-i] [-g] -e PATTERNS" & vbCrLf & _
-		"  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)" & vbCrLf & _
-		"  PATTERNS - regular expression" & vbCrLf & _
-		"  -v - select non-matching columns" & vbCrLf & _
-		"  -i - ignore case" & vbCrLf & _
-		"  -g - enable global flag" & vbCrLf & _
-		"  -e - use PATTERNS for matching;" & _
-	"SelectColumns.ArgumentsRequired;" & _
-	"SelectLines.MenuCaption=Select Lines...;" & _
-	"SelectLines.Description=Select some lines." & vbCrLf & _
-		"Usage: SelectLines RANGES" & vbCrLf & _
-		"   or: SelectLines [-v] [-i] -e PATTERNS" & vbCrLf & _
-		"  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)" & vbCrLf & _
-		"  PATTERNS - regular expression" & vbCrLf & _
-		"  -v - select non-matching lines" & vbCrLf & _
-		"  -i - ignore case" & vbCrLf & _
-		"  -e - use PATTERNS for matching;" & _
-	"SelectLines.ArgumentsRequired;" & _
-	"ReverseColumns.MenuCaption=Reverse Columns;" & _
-	"ReverseColumns.Description=Reverse columns;" & _
-	"ReverseLines.MenuCaption=Reverse Lines;" & _
-	"ReverseLines.Description=Reverse lines;" & _
-	"Replace.MenuCaption=Replace...;" & _
-	"Replace.Description=Replace text with another text." & vbCrLf & _
-		"Usage: Replace [-i] [-e] FIND REPLACE" & vbCrLf & _
-		"  FIND    - text to find" & vbCrLf & _
-		"  REPLACE - text to replace" & vbCrLf & _
-		"  -i - ignore case (only for -e)" & vbCrLf & _
-		"  -e - treat the specified text as a regular expression;" & _
-	"Replace.ArgumentsRequired;"
-End Function
-
-Function get_PluginArguments()
-	get_PluginArguments = arguments
-End Function
-
-Sub put_PluginArguments(NewValue)
-	arguments = NewValue
-End Sub
-
-Function get_PluginVariables()
-	get_PluginVariables = Join(variables, Chr(0))
-End Function
-
-Sub put_PluginVariables(NewValue)
-	variables = Split(NewValue, Chr(0))
-End Sub
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function ReplaceVariables(str)
-	Dim newstr
-	Dim pos
-	Dim foundpos
-	Dim ch
-	pos = 1
-	Do While True
-		foundpos = InStr(pos, str, "%")
-		If foundpos > 0 Then
-			ch = Mid(str, foundpos + 1, 1)
-			If ch = "%" Then
-				newstr = newstr & "%"
-				pos = foundpos + 2
-			ElseIf IsNumeric(ch) Then
-				newstr = newstr & Mid(str, pos, foundpos - pos)
-				If CLng(ch) <= SafeUBound(variables) Then
-					newstr = newstr & variables(CLng(ch))
-				End If
-				pos = foundpos + 2
-			Else
-				newstr = newstr & Mid(str, pos, foundpos - pos + 1)
-				pos = foundpos + 1
-			End If
-		Else
-			newstr = newstr & Mid(str, pos)
-			Exit Do
-		End If
-	Loop
-	ReplaceVariables = newstr
-End Function
-
-Function IsFirstArgumentEmpty()
-	IsFirstArgumentEmpty = (Trim(arguments) = "")
-End Function
-
-Function SafeUBound(ary)
-	SafeUBound = -1
-	On Error Resume Next
-	SafeUBound = UBound(ary)
-End Function
-
-Function ParseArguments(args)
-	Dim ary()
-	Dim ch
-	Dim inQuotes
-	Dim token
-	Dim argsLen
-	Dim i, j
-	argsLen = Len(args)
-	For i = 1 To argsLen
-		ch = Mid(args, i, 1)
-		If Not inQuotes Then
-			If ch = " " Or ch = vbTab Then
-				If len(token) > 0 Then
-					ReDim Preserve ary(j)
-					ary(j) = token
-					j = j + 1
-					token = ""
-				End If
-			ElseIf ch = """" Then
-				inQuotes = True
-			Else
-				token = token & ch
-			End If
-		Else
-			If ch = """" Then
-				If i + 1 <= argsLen Then
-					If Mid(args, i + 1, 1) = """" Then
-						token = token & ch
-					End if
-				End If
-				inQuotes = False 
-			Else
-				token = token & ch
-			End If
-		End If
-	Next
-	If Len(token) > 0 Then
-		ReDim Preserve ary(j)
-		ary(j) = token
-		j = j + 1
-		token = ""
-	End If
-	ParseArguments = ary 
-End Function
-
-Function ParseRanges(rangeText)
-	Dim i, j
-	Dim ary, ary2, aryRanges()
-	Dim rangeFrom, rangeTo
-	ary = Split(rangeText, ",")
-	j = 0
-	For i = 0 To SafeUBound(ary)
-		ary2 = Split(ary(i), "-")
-		rangeFrom = ""
-		If SafeUBound(ary2) >= 0 Then
-			rangeFrom = Trim(ary2(0))
-		End If
-		rangeTo = rangeFrom
-		If SafeUBound(ary2) > 0 Then
-			rangeTo = Trim(ary2(1))
-		End If
-		If IsNumeric(rangeFrom) Or IsNumeric(rangeTo) Then
-			If Not IsNumeric(rangeFrom) Then rangeFrom = 1
-			If Not IsNumeric(rangeTo)   Then rangeTo   = 1000000000
-			If CDbl(rangeFrom) < 1 Or CDbl(rangeFrom) > 1000000000 Then rangeFrom = 1
-			If CDbl(rangeTo)   < 1 Or CDbl(rangeTo)   > 1000000000 Then rangeTo   = 1
-			If CDbl(rangeFrom) > CDbl(rangeTo) Then rangeTo = rangeFrom
-			Redim preserve aryRanges(j)
-			aryRanges(j) = Array(CLng(rangeFrom), CLng(rangeTo))
-			j = j + 1
-		End If
-	Next
-	ParseRanges = aryRanges
-End Function
-
-Function ParseSelectColumnsLinesArguments(args, invert)
-	Dim rangesOrRegExps()
-	Dim argAry
-	Dim i, j
-	Dim re
-	Dim isOption
-	Set re = Nothing
-	argAry = ParseArguments(args)
-	invert = False
-	For i = 0 To SafeUBound(argAry)
-		isOption = False
-		If Len(argAry(i)) >= 2 Then
-			Select Case Left(argAry(i), 1)
-			Case "-", "/"
-				Select Case Mid(argAry(i), 2, 1)
-				Case "e", "i", "g"
-					isOption = True
-					If re Is Nothing Then
-						Set re = New RegExp
-						Redim Preserve rangesOrRegExps(j)
-						Set rangesOrRegExps(j) = re
-						j = j + 1
-					End If
-					If InStr(argAry(i), "i") > 0 Then
-						re.IgnoreCase = True
-					End If
-					If InStr(argAry(i), "g") > 0 Then
-						re.Global  = True
-					End If
-				Case "v"
-					isOption = True
-					invert = True
-				End Select
-			End Select
-		End If
-		If Not isOption Then
-			If Not (re Is Nothing) Then
-				re.Pattern = argAry(i)
-				Set re = Nothing
-			Else
-				Redim Preserve rangesOrRegExps(j)
-				rangesOrRegExps(j) = ParseRanges(argAry(i))
-				If SafeUBound(rangesOrRegExps(j)) < 0 Then
-					Set rangesOrRegExps(j) = New RegExp
-					rangesOrRegExps(j).Pattern = argAry(i)
-				End If
-				j = j + 1
-			End If
-		End If
-	Next
-	ParseSelectColumnsLinesArguments = rangesOrRegExps
-End Function
-
-Function ParseReplaceArguments(args, regex, ignoreCase)
-	Dim patterns()
-	Dim argAry
-	Dim i, j
-	Dim re
-	Dim isOption
-	Set re = Nothing
-	argAry = ParseArguments(args)
-	regex = False
-	ignoreCase = False
-	For i = 0 To SafeUBound(argAry)
-		isOption = False
-		If Len(argAry(i)) >= 2 Then
-			Select Case Left(argAry(i), 1)
-			Case "-", "/"
-				Select Case Mid(argAry(i), 2, 1)
-				Case "e", "i"
-					isOption = True
-					regex = True
-					If InStr(argAry(i), "i") > 0 Then
-						ignoreCase = True
-					End If
-				End Select
-			End Select
-		End If
-		If Not isOption Then
-			Redim Preserve patterns(j)
-			patterns(j) = argAry(i)
-			j = j + 1
-		End If
-	Next
-	ParseReplaceArguments = patterns
-End Function
-
-Function Unescape(text)
-	Dim textLen
-	Dim i
-	Dim ch
-
-	textLen = Len(text)
-	i = 1
-	Do While i <= textLen
-		ch = Mid(text, i, 1)
-		Select Case ch
-		Case "\"
-			If i <= textLen - 1 Then
-				i = i + 1
-				ch = Mid(text, i, 1)
-				Select Case ch
-				Case "a"
-					Unescape = Unescape & Chr(&H07)
-				Case "b"
-					Unescape = Unescape & Chr(&H08)
-				Case "t"
-					Unescape = Unescape & Chr(&H09)
-				Case "n"
-					Unescape = Unescape & Chr(&H0A)
-				Case "v"
-					Unescape = Unescape & Chr(&H0B)
-				Case "f"
-					Unescape = Unescape & Chr(&H0C)
-				Case "r"
-					Unescape = Unescape & Chr(&H0D)
-				Case "\"
-					Unescape = Unescape & "\"
-				Case Else
-					Unescape = Unescape & "\" & ch
-				End Select
-			Else
-				Unescape = Unescape & ch
-			End If
-		Case Else
-			Unescape = Unescape & ch
-		End Select
-		i = i + 1
-	Loop
-End Function
-
-Function SplitLines(text, eol)
-	Dim re, matches
-	Set re = New RegExp
-	re.Global = False
-	re.IgnoreCase = False
-	re.Pattern = "\r\n|\n|\r"
-	Set matches = re.Execute(text)
-	If matches.Count > 0 Then
-		eol = matches(0).Value
-	End If
-	SplitLines = Split(text, eol)
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-' transformation functions
-Function MakeUpper(Text)
-	MakeUpper = UCase(Text)
-End Function
-
-Function MakeLower(Text)
-	MakeLower = LCase(Text)
-End Function
-
-Function ExecFilterCommand(Text)
-	Dim cmd
-	If IsFirstArgumentEmpty() Then
-		cmd = regRead(PluginRegKeyPath & "ExecFilterCommand", "")
-		cmd = InputBox("Enter filter command", "ExecFilterCommand", cmd)
-		If cmd <> "" Then
-			regWrite PluginRegKeyPath & "ExecFilterCommand", cmd, "REG_SZ"
-		End If
-		cmd = ReplaceVariables(cmd)
-	Else
-		cmd = arguments
-	End If
-	If cmd = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-
-	On Error Resume Next
-
-	Dim path
-	path = wsh.ExpandEnvironmentStrings("%TEMP%\_winmerge_addin_temp_.txt")
-
-	Dim fso
-	Dim ts
-	Set fso = CreateObject("Scripting.FileSystemObject")
-	Set ts = fso.CreateTextFile(path)
-	If ts Is Nothing Then
-		Exit Function
-	End If
-	ts.Write Text
-	ts.Close
-
-	Dim exe
-	Set exe = wsh.Exec("cmd /c type """ & path & """ | " & cmd & " 2>&1")
-	If exe Is Nothing Then
-		MsgBox "Failed to execute the command '" & cmd & "':" & Err.Description 
-		fso.DeleteFile path
-		Exit Function
-	End If
-
-	ExecFilterCommand = ""
-	Do Until exe.StdOut.AtEndOfStream
-		ExecFilterCommand = ExecFilterCommand & exe.StdOut.ReadLine & vbCrLf
-	Loop
-
-	fso.DeleteFile path
-
-End Function
-
-Function SelectColumns(Text)
-	Dim args, ranges, regexpStr
-	Dim matches, m
-	Dim lines, eol, line
-	Dim i, j, k
-	Dim rangesOrRegExps
-	Dim invert
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "SelectColumns", "")
-		args = InputBox("Enter the list of column ranges to select (e.g. -3,5-10,30-)" & vbCrLf & "or regular expression:", "SelectColumns", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "SelectColumns", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	lines = SplitLines(Text, eol)
-	rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-	For i = 0 To SafeUBound(lines)
-		line = ""
-		For j = 0 To SafeUBound(rangesOrRegExps)
-			If IsArray(rangesOrRegExps(j)) Then
-				For k = 0 To SafeUBound(rangesOrRegExps(j))
-					If rangesOrRegExps(j)(k)(0) <= Len(lines(i)) Then
-						line = line & Mid(lines(i), rangesOrRegExps(j)(k)(0), rangesOrRegExps(j)(k)(1) - rangesOrRegExps(j)(k)(0) + 1)
-					End If
-				Next
-			Else
-				If Not invert Then
-					Set matches = rangesOrRegExps(j).Execute(lines(i))
-					For Each m In matches
-						line = line & m.Value
-					Next
-				Else
-					line = line & rangesOrRegExps(j).Replace(lines(i), "")
-				End If
-			End If
-		Next
-		lines(i) = line
-	Next
-	SelectColumns = Join(lines, eol)
-End Function
-
-Function SelectLines(Text)
-	Dim args, ranges
-	Dim matches, rangesOrRegExps
-	Dim lines, newlines(), eol
-	Dim i, j, k, l
-	Dim max
-	Dim matched
-	Dim invert
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "SelectLines", "")
-		args = InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)" & vbCrLf & "or regular expression:", "SelectLines", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "SelectLines", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	lines = SplitLines(Text, eol)
-	l = 0
-	rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-	For i = 0 To SafeUBound(rangesOrRegExps)
-		If IsArray(rangesOrRegExps(i)) Then
-			For j = 0 To SafeUBound(rangesOrRegExps(i))
-				max =rangesOrRegExps(i)(j)(1) - 1 
-				If max > SafeUBound(lines) Then max = SafeUBound(lines)
-				For k = rangesOrRegExps(i)(j)(0) - 1 To max
-					If k <= SafeUBound(lines) Then
-						ReDim Preserve newlines(l)
-						newlines(l) = lines(k)
-						l = l + 1
-					End If
-				Next
-			Next
-		Else
-			For j = 0 To SafeUBound(lines)
-				matched = rangesOrRegExps(i).Test(lines(j))
-				If invert Then matched = Not matched
-				If matched Then
-					ReDim Preserve newlines(l)
-					newlines(l) = lines(j)
-					l = l + 1
-				End If
-			Next
-		End If
-	Next
-	If SafeUBound(lines) >= 0 Then
-		If lines(UBound(lines)) = "" Then
-			If SafeUBound(newlines) >= 0 Then
-				If newlines(UBound(newlines)) <> "" Then
-					ReDim Preserve newlines(l)
-					newlines(l) = ""
-					l = l + 1
-				End If
-			End If
-		End If
-	End If
-	SelectLines = Join(newlines, eol)
-End Function
-
-Function ReplaceText(Text)
-	Dim args, patterns
-	Dim i
-	Dim re, regex
-	Dim ignoreCase
-	ReplaceText = Text
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "Replace", "")
-		args = InputBox("Enter the search text and replacement text:", "Replace", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "Replace", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	patterns = ParseReplaceArguments(args, regex, ignoreCase)
-	If regex Then
-		For i = 0 To SafeUBound(patterns) Step 2
-			Set re = New RegExp
-			re.IgnoreCase = ignoreCase
-			re.Global = True
-			re.Multiline = True
-			re.Pattern = patterns(i)
-			If i + 1 <= UBound(patterns) Then
-				ReplaceText = re.Replace(ReplaceText, Unescape(patterns(i + 1)))
-			Else
-				ReplaceText = re.Replace(ReplaceText, "")
-			End If
-		Next
-	Else
-		For i = 0 To SafeUBound(patterns) Step 2
-			If i + 1 <= UBound(patterns) Then
-				ReplaceText = Replace(ReplaceText, patterns(i), patterns(i + 1))
-			Else
-				ReplaceText = Replace(ReplaceText, patterns(i), "")
-			End If
-		Next
-	End If
-End Function
-
-' port from WinMerge2011
-Function Tokenize(Text)
-	Dim pattern
-	If IsFirstArgumentEmpty() Then
-		pattern = regRead(PluginRegKeyPath & "Tokenize", "")
-		pattern = InputBox("Enter regex to tokenize (e.g. [^\w]+):", "Tokenize", pattern)
-		If pattern <> "" Then
-			regWrite PluginRegKeyPath & "Tokenize", pattern, "REG_SZ"
-		End If
-	Else
-		pattern = arguments
-	End If
-	If pattern = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	Dim re
-	Set re = New RegExp
-	re.Global = True
-	re.IgnoreCase = True
-	re.Pattern = pattern
-	Tokenize = re.Replace(Text, vbCrLf)
-End Function
+<script language="JScript">
 
-</script>
+var REGKEY_PATH = "Plugins\\editor addin.sct/";
 
-<script language="JScript">
+var wsh = new ActiveXObject("WScript.Shell")
+var arguments = "";
+var variables = new Array();
+var mergeApp;
+
+function get_PluginEvent() {
+  return "EDITOR_SCRIPT";
+}
+
+function get_PluginDescription() {
+  return "Basic text functions for the context menu";
+}
+
+function get_PluginFileFilters() {
+  return ".*";
+}
+
+function get_PluginExtendedProperties() {
+  return "GenerateUnpacker;" + 
+  "MakeUpper.MenuCaption=Make Uppercase;" + 
+  "MakeUpper.Description=Make characters uppercase;" + 
+  "MakeLower.MenuCaption=Make Lowercase;" + 
+  "MakeLower.Description=Make characters lowercase;" + 
+  "RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" + 
+  "RemoveDuplicates.Description=Remove duplicate lines;" + 
+  "CountDuplicates.MenuCaption=Count Duplicate Lines;" + 
+  "CountDuplicates.Description=Count duplicate lines;" + 
+  "SortAscending.MenuCaption=Sort Lines Ascending;" + 
+  "SortAscending.Description=Sort lines ascending;" + 
+  "SortDescending.MenuCaption=Sort Lines Descending;" + 
+  "SortDescending.Description=Sort lines descending;" + 
+  "ExecFilterCommand.MenuCaption=Apply Filter Command...;" + 
+  "ExecFilterCommand.Description=Apply filter command. \r\n" + 
+    "Usage: ExecFilterCommand COMMAND\r\n"+ 
+    "  COMMAND - command to execute. %1 in the command is replaced with the filename.;" + 
+  "ExecFilterCommand.ArgumentsRequired;" + 
+  "Tokenize.MenuCaption=Tokenize...;" + 
+  "Tokenize.Description=Tokenize selection. \r\n" + 
+    "Usage: Tokenize PATTERNS\r\n" + 
+    "  PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+);" + 
+  "Tokenize.ArgumentsRequired;" + 
+  "Tokenize.Arguments=[^\\w]+;" + 
+  "Trim.MenuCaption=Trim Spaces;" + 
+  "Trim.Description=Trim spaces;" + 
+  "SelectColumns.MenuCaption=Select Columns...;" + 
+  "SelectColumns.Description=Select some columns.\r\n" + 
+    "Usage: SelectColumns RANGES\r\n" + 
+    "   or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n" + 
+    "  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)\r\n" + 
+    "  PATTERNS - regular expression\r\n" +  
+    "  -v - select non-matching columns\r\n" +  
+    "  -i - ignore case\r\n" +  
+    "  -g - enable global flag\r\n" +  
+    "  -e - use PATTERNS for matching;" + 
+  "SelectColumns.ArgumentsRequired;" + 
+  "SelectLines.MenuCaption=Select Lines...;" + 
+  "SelectLines.Description=Select some lines.\r\n" +  
+    "Usage: SelectLines RANGES\r\n" +  
+    "   or: SelectLines [-v] [-i] -e PATTERNS\r\n" +  
+    "  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)\r\n" +  
+    "  PATTERNS - regular expression\r\n" +  
+    "  -v - select non-matching lines\r\n" +  
+    "  -i - ignore case\r\n" +  
+    "  -e - use PATTERNS for matching;" + 
+  "SelectLines.ArgumentsRequired;" + 
+  "ReverseColumns.MenuCaption=Reverse Columns;" + 
+  "ReverseColumns.Description=Reverse columns;" + 
+  "ReverseLines.MenuCaption=Reverse Lines;" + 
+  "ReverseLines.Description=Reverse lines;" + 
+  "Replace.MenuCaption=Replace...;" + 
+  "Replace.Description=Replace text with another text.\r\n" +  
+    "Usage: Replace [-i] [-e] FIND REPLACE\r\n" +  
+    "  FIND    - text to find\r\n" +  
+    "  REPLACE - text to replace\r\n" +  
+    "  -i - ignore case (only for -e)\r\n" +  
+    "  -e - treat the specified text as a regular expression;" + 
+  "Replace.ArgumentsRequired;";
+}
+
+function get_PluginArguments() {
+  return arguments;
+}
+
+function put_PluginArguments(NewValue) {
+  arguments = NewValue;
+}
+
+function get_PluginVariables() {
+  return variables.join("\0");
+}
+
+function put_PluginVariables(NewValue) {
+  variables = NewValue.split("\0");
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function ReplaceVariables(str) {
+  var newstr;
+  var pos = 0;
+  while (true) {
+    var foundpos = str.indexOf("%", pos);
+    if (foundpos > 0) {
+      var ch = str.charAt(foundpos + 1);
+      if (ch === "%") {
+        newstr = newstr + "%";
+        pos = foundpos + 2;
+      } else if (!isNaN(ch)) {
+        newstr = newstr + str.substr(pos, foundpos - pos);
+        if (parseInt(ch) < variables.length) {
+          newstr = newstr + variables(parseInt(ch));
+        }
+        pos = foundpos + 2;
+      } else {
+        newstr = newstr + str.substr(pos, foundpos - pos + 1);
+        pos = foundpos + 1;
+      }
+  } else {
+      newstr = newstr + str.substr(pos);
+      break;
+    }
+  }
+  return newstr;
+}
+
+function IsFirstArgumentEmpty() {
+  return (arguments.match(/^\s*$/) !== null);
+}
+
+function ParseArguments(args) {
+  var ary()
+  var ch
+  var inQuotes
+  var token
+  var argsLen
+  var i, j
+  argsLen = Len(args)
+  For i = 1 To argsLen
+    ch = Mid(args, i, 1)
+    if (Not inQuotes) {
+      if (ch = " " Or ch = vbTab) {
+        if (len(token) > 0) {
+          ReDim Preserve ary(j)
+          ary(j) = token
+          j = j + 1
+          token = ""
+        }
+      } else if ( ch = """") {
+        inQuotes = True
+      } else {
+        token = token + ch
+      }
+    } else {
+      if (ch = """") {
+        if (i + 1 <= argsLen) {
+          if (Mid(args, i + 1, 1) = """") {
+            token = token + ch
+          End if
+        }
+        inQuotes = False 
+      } else {
+        token = token + ch
+      }
+    }
+  }
+  if (Len(token) > 0) {
+    ReDim Preserve ary(j)
+    ary(j) = token
+    j = j + 1
+    token = ""
+  }
+  ParseArguments = ary 
+}
+
+function ParseRanges(rangeText) {
+  var i, j
+  var ary, ary2, aryRanges()
+  var rangeFrom, rangeTo
+  ary = Split(rangeText, ",")
+  j = 0
+  For i = 0 To SafeUBound(ary)
+    ary2 = Split(ary(i), "-")
+    rangeFrom = ""
+    if (SafeUBound(ary2) >= 0) {
+      rangeFrom = Trim(ary2(0))
+    }
+    rangeTo = rangeFrom
+    if (SafeUBound(ary2) > 0) {
+      rangeTo = Trim(ary2(1))
+    }
+    if (IsNumeric(rangeFrom) Or IsNumeric(rangeTo)) {
+      if (Not IsNumeric(rangeFrom)) { rangeFrom = 1
+      if (Not IsNumeric(rangeTo)  ) { rangeTo   = 1000000000
+      if (CDbl(rangeFrom) < 1 Or CDbl(rangeFrom) > 1000000000) { rangeFrom = 1
+      if (CDbl(rangeTo)   < 1 Or CDbl(rangeTo)   > 1000000000) { rangeTo   = 1
+      if (CDbl(rangeFrom) > CDbl(rangeTo)) { rangeTo = rangeFrom
+      Redim preserve aryRanges(j)
+      aryRanges(j) = Array(CLng(rangeFrom), CLng(rangeTo))
+      j = j + 1
+    }
+  }
+  ParseRanges = aryRanges
+}
+
+function ParseSelectColumnsLinesArguments(args, invert) {
+  var rangesOrRegExps()
+  var argAry
+  var i, j
+  var re
+  var isOption
+  re = Nothing
+  argAry = ParseArguments(args)
+  invert = False
+  For i = 0 To SafeUBound(argAry)
+    isOption = False
+    if (Len(argAry(i)) >= 2) {
+      Select Case Left(argAry(i), 1)
+      Case "-", "/"
+        Select Case Mid(argAry(i), 2, 1)
+        Case "e", "i", "g"
+          isOption = True
+          if (re Is Nothing) {
+            re = New RegExp
+            Redim Preserve rangesOrRegExps(j)
+            rangesOrRegExps(j) = re
+            j = j + 1
+          }
+          if (InStr(argAry(i), "i") > 0) {
+            re.IgnoreCase = True
+          }
+          if (InStr(argAry(i), "g") > 0) {
+            re.Global  = True
+          }
+        Case "v"
+          isOption = True
+          invert = True
+        End Select
+      End Select
+    }
+    if (Not isOption) {
+      if (Not (re Is Nothing)) {
+        re.Pattern = argAry(i)
+        re = Nothing
+      } else {
+        Redim Preserve rangesOrRegExps(j)
+        rangesOrRegExps(j) = ParseRanges(argAry(i))
+        if (SafeUBound(rangesOrRegExps(j)) < 0) {
+          rangesOrRegExps(j) = New RegExp
+          rangesOrRegExps(j).Pattern = argAry(i)
+        }
+        j = j + 1
+      }
+    }
+  }
+  ParseSelectColumnsLinesArguments = rangesOrRegExps
+}
+
+function ParseReplaceArguments(args, regex, ignoreCase) {
+  var patterns()
+  var argAry
+  var i, j
+  var re
+  var isOption
+  re = Nothing
+  argAry = ParseArguments(args)
+  regex = False
+  ignoreCase = False
+  For i = 0 To SafeUBound(argAry)
+    isOption = False
+    if (Len(argAry(i)) >= 2) {
+      Select Case Left(argAry(i), 1)
+      Case "-", "/"
+        Select Case Mid(argAry(i), 2, 1)
+        Case "e", "i"
+          isOption = True
+          regex = True
+          if (InStr(argAry(i), "i") > 0) {
+            ignoreCase = True
+          }
+        End Select
+      End Select
+    }
+    if (Not isOption) {
+      Redim Preserve patterns(j)
+      patterns(j) = argAry(i)
+      j = j + 1
+    }
+  }
+  ParseReplaceArguments = patterns
+}
+
+function Unescape(text) {
+  var textLen
+  var i
+  var ch
+
+  textLen = Len(text)
+  i = 1
+  Do While i <= textLen
+    ch = Mid(text, i, 1)
+    Select Case ch
+    Case "\\"
+      if (i <= textLen - 1) {
+        i = i + 1
+        ch = Mid(text, i, 1)
+        Select Case ch
+        Case "a"
+          Unescape = Unescape + Chr(+H07)
+        Case "b"
+          Unescape = Unescape + Chr(+H08)
+        Case "t"
+          Unescape = Unescape + Chr(+H09)
+        Case "n"
+          Unescape = Unescape + Chr(+H0A)
+        Case "v"
+          Unescape = Unescape + Chr(+H0B)
+        Case "f"
+          Unescape = Unescape + Chr(+H0C)
+        Case "r"
+          Unescape = Unescape + Chr(+H0D)
+        Case "\\"
+          Unescape = Unescape + "\\"
+        Case Else
+          Unescape = Unescape + "\\" + ch
+        End Select
+      } else {
+        Unescape = Unescape + ch
+      }
+    Case Else
+      Unescape = Unescape + ch
+    End Select
+    i = i + 1
+  Loop
+}
+
+function SplitLines(text, eol) {
+  var re, matches
+  re = New RegExp
+  re.Global = False
+  re.IgnoreCase = False
+  re.Pattern = "\r\n|\n|\r"
+  matches = re.Execute(text)
+  if (matches.Count > 0) {
+    eol = matches(0).Value
+  }
+  SplitLines = Split(text, eol)
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+// transformation functions
+function MakeUpper(Text) {
+  return Text.toUpperCase();
+}
+
+function MakeLower(Text) {
+  return Text.toLowerCase();
+}
+
+function ExecFilterCommand(Text) {
+  var cmd;
+  if (IsFirstArgumentEmpty()) {
+    cmd = regRead(REGKEY_PATH + "ExecFilterCommand", "")
+    cmd = mergeApp.InputBox("Enter filter command", "ExecFilterCommand", cmd)
+    if (cmd !== "") {
+      regWrite(REGKEY_PATH + "ExecFilterCommand", cmd, "REG_SZ");
+    }
+    cmd = ReplaceVariables(cmd)
+  } else {
+    cmd = arguments
+  }
+  if (cmd === "") {
+    throw new Error(30001, "Canceled");
+  }
+
+  var path = wsh.ExpandEnvironmentStrings("%TEMP%\\_winmerge_addin_temp_.txt");
+  var fso = new ActiveXObject("Scripting.FileSystemObject")
+  try {
+    var ts = fso.CreateTextFile(path)
+    ts.Write(Text);
+    ts.Close();
+  } catch (e) {
+    throw new Error(30001, "Failed to create the file '" + path + "':" + e.message);
+  }
+  var result = "";
+  try {
+    var exe = wsh.Exec("cmd /c type \"" + path + "\" | " + cmd + " 2>&1")
+    while (!exe.StdOut.AtEndOfStream) {
+      result += exe.StdOut.ReadLine + "\r\n";
+    }
+  } catch (e) {
+    throw new Error(30001, "Failed to execute the command '" + cmd + "':" + e.message);
+  } finally {
+    fso.DeleteFile(path);
+  }
+  return result;
+}
+
+function SelectColumns(Text) {
+  var args, ranges, regexpStr
+  var matches, m
+  var lines, eol, line
+  var i, j, k
+  var rangesOrRegExps
+  var invert
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "SelectColumns", "");
+    args = mergeApp.InputBox("Enter the list of column ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectColumns", args);
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "SelectColumns", args, "REG_SZ");
+    }
+  } else {
+    args = arguments;
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  lines = SplitLines(Text, eol)
+  rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
+  For i = 0 To SafeUBound(lines)
+    line = ""
+    For j = 0 To SafeUBound(rangesOrRegExps)
+      if (IsArray(rangesOrRegExps(j))) {
+        For k = 0 To SafeUBound(rangesOrRegExps(j))
+          if (rangesOrRegExps(j)(k)(0) <= Len(lines(i))) {
+            line = line + Mid(lines(i), rangesOrRegExps(j)(k)(0), rangesOrRegExps(j)(k)(1) - rangesOrRegExps(j)(k)(0) + 1)
+          }
+        }
+      } else {
+        if (Not invert) {
+          matches = rangesOrRegExps(j).Execute(lines(i))
+          For Each m In matches
+            line = line + m.Value
+          }
+        } else {
+          line = line + rangesOrRegExps(j).Replace(lines(i), "")
+        }
+      }
+    }
+    lines(i) = line
+  }
+  SelectColumns = Join(lines, eol)
+}
+
+function SelectLines(Text) {
+  var args, ranges
+  var matches, rangesOrRegExps
+  var lines, newlines(), eol
+  var i, j, k, l
+  var max
+  var matched
+  var invert
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "SelectLines", "")
+    args = mergeApp.InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectLines", args)
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "SelectLines", args, "REG_SZ");
+    }
+  } else {
+    args = arguments
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  lines = SplitLines(Text, eol)
+  l = 0
+  rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
+  For i = 0 To SafeUBound(rangesOrRegExps)
+    if (IsArray(rangesOrRegExps(i))) {
+      For j = 0 To SafeUBound(rangesOrRegExps(i))
+        max =rangesOrRegExps(i)(j)(1) - 1 
+        if (max > SafeUBound(lines)) { max = SafeUBound(lines)
+        For k = rangesOrRegExps(i)(j)(0) - 1 To max
+          if (k <= SafeUBound(lines)) {
+            ReDim Preserve newlines(l)
+            newlines(l) = lines(k)
+            l = l + 1
+          }
+        }
+      }
+    } else {
+      For j = 0 To SafeUBound(lines)
+        matched = rangesOrRegExps(i).Test(lines(j))
+        if (invert) { matched = Not matched
+        if (matched) {
+          ReDim Preserve newlines(l)
+          newlines(l) = lines(j)
+          l = l + 1
+        }
+      }
+    }
+  }
+  if (SafeUBound(lines) >= 0) {
+    if (lines(UBound(lines)) = "") {
+      if (SafeUBound(newlines) >= 0) {
+        if (newlines(UBound(newlines)) !== "") {
+          ReDim Preserve newlines(l)
+          newlines(l) = ""
+          l = l + 1
+        }
+      }
+    }
+  }
+  SelectLines = Join(newlines, eol)
+}
+
+function replacei(text, find, replace, ignorecase) {
+  if (!ignorecase)
+    return text.split(find).join(replace);
+  var textLower = text.toLowerCase();
+  var findLower = find.toLowerCase();
+  var pos = textLower.length;
+  while (pos >= 0 && (pos = textLower.lastIndexOf(findLower, pos)) >= 0) {
+    text = text.substr(0, pos) + replace + text.substr(pos + findLower.length);
+    pos--;
+  }
+  return text;
+}
+
+function ReplaceText(Text) {
+  var args;
+  var result = Text;
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "Replace", "")
+    args = mergeApp.InputBox("Enter the search text and replacement text:", "Replace", args)
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "Replace", args, "REG_SZ");
+    }
+  } else {
+    args = arguments
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var parseResult = ParseReplaceArguments(args);
+  var patterns = parseResult.patterns;
+  var regex = parseResult.regex;
+  var ignoreCase = parseResult.ignoreCase;
+  if (regex) {
+    for (var i = 0; i < patterns.length; i += 2) {
+      var re = new RegExp(patterns[i],ignoreCase ?  "gmi" : "gm");
+      if (i + 1 < patterns.length) {
+        result = result.replace(re, Unescape(patterns(i + 1)));
+      } else {
+        result = result.relace(re, result, "");
+      }
+    }
+  } else {
+    for (var i = 0; i < patterns.length; i += 2) {
+      if (i + 1 < patterns.length) {
+        result = replacei(patterns(i), patterns(i + 1));
+      } else {
+        result = replacei(patterns(i), "");
+      }
+    }
+  }
+  return result;
+}
+
+// port from WinMerge2011
+function Tokenize(Text) {
+  var pattern;
+  if (IsFirstArgumentEmpty()) {
+    pattern = regRead(REGKEY_PATH + "Tokenize", "");
+    pattern = mergeApp.InputBox("Enter regex to tokenize (e.g. [^\\w]+):", "Tokenize", pattern);
+    if (pattern !== "") {
+      regWrite(REGKEY_PATH + "Tokenize", pattern, "REG_SZ");
+    }
+  } else {
+    pattern = arguments;
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var re = new RegExp(pattern, "gi");
+  return Text.replace(re, "\r\n");
+}
 
 function RemoveDuplicates(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var newlines = new Array();
-	var dic = {};
-	var lasteol = false;
-
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	for (var i = 0, j = 0; i < lines.length; i++) {
-		var line = lines[i];
-		if (typeof dic[line] === 'undefined') {
-			dic[line] = 1;
-			newlines[j] = line;
-			j++;
-		}
-	}
-	if (lasteol)
-		newlines.push("");
-	return newlines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var newlines = new Array();
+  var dic = {};
+  var lasteol = false;
+
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  for (var i = 0, j = 0; i < lines.length; i++) {
+    var line = lines[i];
+    if (typeof dic[line] === 'undefined') {
+      dic[line] = 1;
+      newlines[j] = line;
+      j++;
+    }
+  }
+  if (lasteol)
+    newlines.push("");
+  return newlines.join(eol);
 }
 
 function CountDuplicates(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var newlines = new Array();
-	var dic = {};
-
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-	}
-	
-	for (var i = 0; i < lines.length; i++) {
-		var line = lines[i];
-		if (typeof dic[line] === 'undefined') {
-			dic[line] = 1;
-			newlines[j] = line;
-			j++;
-		} else {
-			dic[line]++;
-		}
-	}
-	var j = 0;
-	for (var line in dic) {
-		newlines[j] = line + '\t' + dic[line];
-		j++;
-	}
-	if (eol)
-		newlines[j] = "";
-	return newlines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var newlines = new Array();
+  var dic = {};
+
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+  }
+  
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i];
+    if (typeof dic[line] === 'undefined') {
+      dic[line] = 1;
+      newlines[j] = line;
+      j++;
+    } else {
+      dic[line]++;
+    }
+  }
+  var j = 0;
+  for (var line in dic) {
+    newlines[j] = line + '\t' + dic[line];
+    j++;
+  }
+  if (eol)
+    newlines[j] = "";
+  return newlines.join(eol);
 }
 
 function ReverseColumns(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var lasteol = false;
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	for (var i = 0; i < lines.length; i++) {
-		var line = lines[i];
-		var newline = "";
-		for (var j = 0; j < line.length; j++)
-			newline += line.substr(line.length - j - 1, 1);
-		lines[i] = newline;
-	}
-	if (lasteol)
-		lines.push("");
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var lasteol = false;
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i];
+    var newline = "";
+    for (var j = 0; j < line.length; j++)
+      newline += line.substr(line.length - j - 1, 1);
+    lines[i] = newline;
+  }
+  if (lasteol)
+    lines.push("");
+  return lines.join(eol);
 }
 
 function ReverseLines(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var lasteol = false;
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	var m = parseInt(lines.length / 2);
-	for (var i = 0; i < m; i++) {
-		var line = lines[i];
-		lines[i] = lines[lines.length - i - 1]
-		lines[lines.length - i - 1] = line;
-	}
-	if (lasteol)
-		lines.push("");
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var lasteol = false;
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  var m = parseInt(lines.length / 2);
+  for (var i = 0; i < m; i++) {
+    var line = lines[i];
+    lines[i] = lines[lines.length - i - 1]
+    lines[lines.length - i - 1] = line;
+  }
+  if (lasteol)
+    lines.push("");
+  return lines.join(eol);
 }
 
 function SortAscending(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-
-	if (lines.length == 1) {
-		return Text;
-	} else if (lines[lines.length - 1] == "") {
-		lines.pop();
-		return lines.sort().join(eol) + eol;
-	} else {
-		return lines.sort().join(eol);
-	}
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+
+  if (lines.length == 1) {
+    return Text;
+  } else if (lines[lines.length - 1] == "") {
+    lines.pop();
+    return lines.sort().join(eol) + eol;
+  } else {
+    return lines.sort().join(eol);
+  }
 }
 
 function SortDescending(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-
-	if (lines.length == 1) {
-		return Text;
-	} else if (lines[lines.length - 1] == "") {
-		lines.pop();
-		lines.sort(function(a, b) { return a < b ? 1 : -1; });
-		return lines.join(eol) + eol;
-	} else {
-		return lines.sort(function(a, b) { return a < b ? 1 : -1; }).join(eol);
-	}
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+
+  if (lines.length == 1) {
+    return Text;
+  } else if (lines[lines.length - 1] == "") {
+    lines.pop();
+    lines.sort(function(a, b) { return a < b ? 1 : -1; });
+    return lines.join(eol) + eol;
+  } else {
+    return lines.sort(function(a, b) { return a < b ? 1 : -1; }).join(eol);
+  }
 }
 
 function Trim(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	for (var i = 0; i < lines.length; i++) {
-		lines[i] = lines[i].replace(/^\s+|\s+$/g, "");
-	}
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  for (var i = 0; i < lines.length; i++) {
+    lines[i] = lines[i].replace(/^\s+|\s+$/g, "");
+  }
+  return lines.join(eol);
 }
 
 </script>

From e570cac1c7cecc543cdb8455b57c503fee1ade14 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 21 Jan 2024 21:21:14 +0900
Subject: [PATCH 12/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 193 +++++++++++++--------------
 Src/Merge.rc                         |  21 ++-
 Src/MergeApp.cpp                     |   5 +
 Src/MergeApp.h                       |   1 +
 Src/MergeAppCOMClass.cpp             |  90 +++++++++++++
 Src/MergeAppCOMClass.h               |  11 ++
 Src/resource.h                       |  12 +-
 Testing/FolderCompare/misc.cpp       |   6 +
 8 files changed, 233 insertions(+), 106 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index cbd22e01d5f..952f85c8711 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -420,57 +420,55 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     }
   }
   var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, true);
-  try {
-    if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-      fo.WriteLine("[Document Properties]");
-      writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    fo.WriteLine("[Names]");
+    writeObjectProperties(fo, wbk.Names);
+    fo.WriteLine("");
+  }
+ 
+  for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      fo.WriteLine("[" + sht.Name + "]");
+      writeCellValues(fo, sht);
       fo.WriteLine("");
     }
- 
-    if (regRead(REGKEY_PATH + "CompareNames", true)) {
-      fo.WriteLine("[Names]");
-      writeObjectProperties(fo, wbk.Names);
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      fo.WriteLine("[" + sht.Name + ".Formulas]");
+      writeFormulas(fo, sht);
       fo.WriteLine("");
     }
- 
-    for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
-      if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-        fo.WriteLine("[" + sht.Name + "]");
-        writeCellValues(fo, sht);
-        fo.WriteLine("");
-      }
-      if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-        fo.WriteLine("[" + sht.Name + ".Formulas]");
-        writeFormulas(fo, sht);
-        fo.WriteLine("");
-      }
-      if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-        fo.WriteLine("[" + sht.Name + ".Shapes]");
-        ungroupShapes(sht);
-        writeTextsInShapes(fo, sht);
-        fo.WriteLine("");
-      }
-      if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-        fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
-        writeHeadersAndFooters(fo, sht);
-        fo.WriteLine("");
-      }
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + sht.Name + ".Shapes]");
+      ungroupShapes(sht);
+      writeTextsInShapes(fo, sht);
+      fo.WriteLine("");
     }
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
+      writeHeadersAndFooters(fo, sht);
+      fo.WriteLine("");
+    }
+  }
  
-    if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
-      if (!isAccessibleVBAProject(wbk)) {
-        fo.WriteLine(Translate(MsgCannotGetMacros));
-      }
-      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-        fo.WriteLine("[CodeModule." + cmp.Name + "]");
-        if (cmp.CodeModule.CountOfLines > 0) {
-          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
-        }
-        fo.WriteLine("");
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(wbk)) {
+      fo.WriteLine(Translate(MsgCannotGetMacros));
+    }
+    for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      fo.WriteLine("[CodeModule." + cmp.Name + "]");
+      if (cmp.CodeModule.CountOfLines > 0) {
+        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
       }
+      fo.WriteLine("");
     }
-    sht = null;
-  } catch (e) { }
+  }
+  sht = null;
 
   wbk.Close();
   wbk = null;
@@ -516,74 +514,73 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   }
   var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, true);
 
-  try {
-    digit = String(wbk.Worksheets.Count).length;
-    if (digit <= 0) { digit = 1; }
-    var zf = Array(digit + 1).join("0");
+  digit = String(wbk.Worksheets.Count).length;
+  if (digit <= 0) { digit = 1; }
+  var zf = Array(digit + 1).join("0");
+ 
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+    fo.Close();
+  }
  
-    if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
-      writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
+    writeObjectProperties(fo, wbk.Names);
+    fo.Close();
+  }
+ 
+  var No = 1;
+  for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+    No = zf + No;
+    No = No.substr(No.length - digit, digit);
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
+      writeCellValues(fo, sht);
       fo.Close();
     }
  
-    if (regRead(REGKEY_PATH + "CompareNames", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
-      writeObjectProperties(fo, wbk.Names);
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
+      writeFormulas(fo, sht);
       fo.Close();
     }
  
-    var No = 1;
-    for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
-      No = zf + No;
-      No = No.substr(No.length() - digit, digit);
-      if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
-        writeCellValues(fo, sht);
-        fo.Close();
-      }
- 
-      if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
-        writeCellValues(fo, sht);
-        fo.Close();
-      }
- 
-      if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
-        ungroupShapes(sht);
-        writeTextsInShapes(fo, sht);
-        fo.Close();
-      }
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
+      ungroupShapes(sht);
+      writeTextsInShapes(fo, sht);
+      fo.Close();
+    }
  
-      if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
-        writeHeadersAndFooters(fo, sht);
-        fo.Close();
-      }
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
+      writeHeadersAndFooters(fo, sht);
+      fo.Close();
+    }
  
-      if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
-        saveSheetAsImage(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name)));
-      }
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
+      saveSheetAsImage(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name)));
+    }
  
-      if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
-        saveSheetAsHTML(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html"));
-      }
-      No = parseInt(No) + 1;
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
+      saveSheetAsHTML(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html"));
+    }
+    No = parseInt(No) + 1;
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(wbk)) {
+      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(Translate(MsgCannotGetMacros));
+      fo.Close();
     }
-    if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
-      if (!isAccessibleVBAProject(wbk)) {
-        fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
-        fo.WriteLine(Translate(MsgCannotGetMacros));
-        fo.Close();
-      }
  
-      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
-      }
+    for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
     }
-    sht = null;
-  } catch (e) { }
+  }
+  sht = null;
+
   wbk.Close();
   wbk = null;
   xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking;
diff --git a/Src/Merge.rc b/Src/Merge.rc
index 6bbc7b25aeb..ec2899774ae 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2342,6 +2342,17 @@ BEGIN
     CONTROL         "",IDC_LIST_FILE,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,0,0,309,176
 END
 
+IDD_INPUTBOX DIALOGEX 0, 0, 234, 68
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_INPUTBOX_PROMPT,6,6,162,40
+    EDITTEXT        IDC_INPUTBOX_EDIT,6,50,224,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,170,6,60,14
+    PUSHBUTTON      "Cancel",IDCANCEL,170,22,60,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2479,9 +2490,8 @@ BEGIN
     BEGIN
     END
 
-    IDD_WEBPAGEDIFF_BAR, DIALOG
+    IDD_INPUTBOX, DIALOG
     BEGIN
-        RIGHTMARGIN, 237
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -3049,6 +3059,11 @@ BEGIN
     100, 100, 0, 0
 END
 
+IDD_INPUTBOX AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -3511,7 +3526,7 @@ BEGIN
     IDS_CONFIRM_MOVE_CAPTION "Confirm Move"
     IDS_CONFIRM_CLOSE_WINDOW_COMPARING 
                             "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
-    IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON
+    IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON 
                             "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
     IDS_ERROR_INVALID_DIR_FILE_NAME
                             "The file or folder name is invalid."
diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp
index b0ec789f082..15095447f10 100644
--- a/Src/MergeApp.cpp
+++ b/Src/MergeApp.cpp
@@ -98,6 +98,11 @@ void AppErrorMessageBox(const String& msg)
 	AppMsgBox::error(msg);
 }
 
+void* AppGetMainHWND()
+{
+	return AfxGetMainWnd()->m_hWnd;
+}
+
 namespace AppMsgBox
 {
 
diff --git a/Src/MergeApp.h b/Src/MergeApp.h
index 96c05afc63b..d0a2a6fe455 100644
--- a/Src/MergeApp.h
+++ b/Src/MergeApp.h
@@ -25,6 +25,7 @@ COptionsMgr * GetOptionsMgr();
 void LogErrorString(const String& sz);
 void LogErrorStringUTF8(const std::string& sz);
 void AppErrorMessageBox(const String& msg);
+void* AppGetMainHWND();
 
 namespace AppMsgBox
 {
diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 3513af99c0c..85b6e4a550c 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -4,6 +4,7 @@
 #include "LanguageSelect.h"
 #include "OptionsMgr.h"
 #include "MergeApp.h"
+#include "resource.h"
 
 static PARAMDATA paramData_Translate[] =
 { { L"text", VT_BSTR }, };
@@ -13,12 +14,18 @@ static PARAMDATA paramData_SaveOption[] =
 { { L"name", VT_BSTR }, { L"value", VT_VARIANT}, };
 static PARAMDATA paramData_Log[] =
 { { L"level", VT_I4 }, { L"text", VT_BSTR }, };
+static PARAMDATA paramData_MsgBox[] =
+{ { L"prompt", VT_BSTR }, { L"buttons", VT_VARIANT}, { L"title", VT_VARIANT}, };
+static PARAMDATA paramData_InputBox[] =
+{ { L"prompt", VT_BSTR }, { L"title", VT_VARIANT}, { L"default", VT_VARIANT}, };
 static METHODDATA methodData_MergeApp[] =
 {
 	{ L"Translate",  paramData_Translate,  DISPID_Translate,  3, CC_STDCALL, 1, DISPATCH_METHOD, VT_BSTR },
 	{ L"GetOption",  paramData_GetOption,  DISPID_GetOption,  4, CC_STDCALL, 2, DISPATCH_METHOD, VT_VARIANT },
 	{ L"SaveOption", paramData_SaveOption, DISPID_SaveOption, 5, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
 	{ L"Log", paramData_Log, DISPID_Log, 6, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
+	{ L"MsgBox", paramData_MsgBox, DISPID_MsgBox, 7, CC_STDCALL, 3, DISPATCH_METHOD, VT_I4 },
+	{ L"InputBox", paramData_InputBox, DISPID_InputBox, 8, CC_STDCALL, 3, DISPATCH_METHOD, VT_BSTR },
 };
 
 static INTERFACEDATA idata_MergeApp = { methodData_MergeApp, static_cast<UINT>(std::size(methodData_MergeApp)) }; 
@@ -146,3 +153,86 @@ void STDMETHODCALLTYPE MergeAppCOMClass::Log(int level, BSTR text)
 {
 	LogErrorString(text);
 }
+
+int STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle)
+{
+	VARIANT varButtons2, varTitle2;
+	VariantInit(&varButtons2);
+	VariantInit(&varTitle2);
+	if (FAILED(VariantChangeType(&varButtons2, &varButtons, 0, VT_I4)))
+	{
+		varButtons2.vt = VT_I4;
+		varButtons2.intVal = 0;
+	}
+	if (FAILED(VariantChangeType(&varTitle2, &varTitle, 0, VT_BSTR)))
+	{
+		varTitle2.vt = VT_BSTR;
+		varTitle2.bstrVal = SysAllocString(L"");
+	}
+	int ans = MessageBox(reinterpret_cast<HWND>(AppGetMainHWND()), prompt, varTitle2.bstrVal, varButtons2.intVal);
+	VariantClear(&varButtons2);
+	VariantClear(&varTitle2);
+	return ans;
+}
+
+INT_PTR CALLBACK MergeAppCOMClass::InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uiMsg)
+	{
+	case WM_INITDIALOG:
+	{
+		SetWindowLongPtr(hWnd, GWLP_USERDATA, lParam);
+		auto* pThis = reinterpret_cast<MergeAppCOMClass*>(lParam);
+		SetWindowText(hWnd, pThis->m_inputBoxTitle.c_str());
+		SetDlgItemText(hWnd, IDC_INPUTBOX_PROMPT, pThis->m_inputBoxPrompt.c_str());
+		SetDlgItemText(hWnd, IDC_INPUTBOX_EDIT, pThis->m_inputBoxText.c_str());
+		return TRUE;
+	}
+	case WM_COMMAND:
+		if (LOWORD(wParam) == IDOK)
+		{
+			TCHAR value[2048]{};
+			auto* pThis = reinterpret_cast<MergeAppCOMClass*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
+			GetDlgItemText(hWnd, IDC_INPUTBOX_EDIT, value, sizeof(value) / sizeof(value[0]));
+			pThis->m_inputBoxText = value;
+			EndDialog(hWnd, IDOK);
+		}
+		else if (LOWORD(wParam) == IDCANCEL)
+		{
+			EndDialog(hWnd, IDCANCEL);
+		}
+		return TRUE;
+		break;
+
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+BSTR STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault)
+{
+	VARIANT varTitle2, varDefault2;
+	VariantInit(&varTitle2);
+	VariantInit(&varDefault2);
+	if (FAILED(VariantChangeType(&varTitle2, &varTitle, 0, VT_BSTR)))
+	{
+		varTitle2.vt = VT_BSTR;
+		varTitle2.bstrVal = SysAllocString(L"");
+	}
+	if (FAILED(VariantChangeType(&varDefault2, &varDefault, 0, VT_BSTR)))
+	{
+		varDefault2.vt = VT_BSTR;
+		varDefault2.bstrVal = SysAllocString(L"");
+	}
+	m_inputBoxPrompt = prompt;
+	m_inputBoxTitle = varTitle2.bstrVal;
+	m_inputBoxText = varDefault2.bstrVal;
+	VariantClear(&varTitle2);
+	VariantClear(&varDefault2);
+	INT_PTR ans = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_INPUTBOX), reinterpret_cast<HWND>(AppGetMainHWND()), InputBoxProc, reinterpret_cast<LPARAM>(this));
+	if (ans == IDOK)
+		return SysAllocString(m_inputBoxText.c_str());
+	return SysAllocString(L"");
+}
+
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index cb611bfaa66..912a8daa88b 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -8,6 +8,8 @@ enum
 	DISPID_GetOption = 2,
 	DISPID_SaveOption = 3,
 	DISPID_Log = 4,
+	DISPID_MsgBox = 5,
+	DISPID_InputBox = 6,
 };
 
 
@@ -89,6 +91,8 @@ struct IMergeApp : public IUnknown
 	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) = 0;
 	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) = 0;
 	virtual void STDMETHODCALLTYPE Log(int level, BSTR text) = 0;
+	virtual int STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle) = 0;
+	virtual BSTR STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault) = 0;
 };
 
 class MergeAppCOMClass : public MyDispatch<IMergeApp>
@@ -103,5 +107,12 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) override;
 	void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
 	void STDMETHODCALLTYPE Log(int level, BSTR text) override;
+	int STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle) override;
+	BSTR STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault) override;
+private:
+	static INT_PTR CALLBACK InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam);
+	std::wstring m_inputBoxTitle;
+	std::wstring m_inputBoxPrompt;
+	std::wstring m_inputBoxText;
 };
 
diff --git a/Src/resource.h b/Src/resource.h
index 7a24fd448bc..05070915955 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -80,6 +80,7 @@
 #define IDD_EDIT_FIND                   282
 #define IDD_EDIT_MARKER                 283
 #define IDD_EDIT_REPLACE                284
+#define IDD_INPUTBOX                    285
 #define IDI_ROTATE2                     302
 #define IDR_LOGO                        307
 #define IDR_SPLASH                      308
@@ -282,7 +283,7 @@
 #define IDC_PLUGIN_ADDPIPE              1095
 #define IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE 1096
 #define IDC_UNPACKER_COMBO              1097
-#define IDC_PREDIFFER_COMBO              1098
+#define IDC_PREDIFFER_COMBO             1098
 #define IDC_SELECT_UNPACKER             1099
 #define IDC_SELECT_PREDIFFER            1100
 #define IDC_EXT_EDITOR_BROWSE           1101
@@ -603,7 +604,7 @@
 #define IDC_PATH0_READONLY              1606
 #define IDC_PATH1_READONLY              1607
 #define IDC_PATH2_READONLY              1608
-#define IDC_AUTO_RELOAD_MODIFIED_FILES            1609
+#define IDC_AUTO_RELOAD_MODIFIED_FILES  1609
 #define IDC_MARKER0_COLOR_LABEL         1611
 #define IDC_MARKER1_COLOR_LABEL         1612
 #define IDC_MARKER2_COLOR_LABEL         1613
@@ -625,6 +626,8 @@
 #define IDC_COMPARE                     1630
 #define IDC_SHOWDIFFERENCES             1631
 #define IDC_SYNC_EVENTS                 1632
+#define IDC_INPUTBOX_PROMPT             1633
+#define IDC_INPUTBOX_EDIT               1634
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605
@@ -1662,15 +1665,14 @@
 #define IDS_WEBPAGE_COMPARING           44539
 #define IDS_WEBPAGE_ZOOM                44540
 
-
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        258
+#define _APS_NEXT_RESOURCE_VALUE        287
 #define _APS_NEXT_COMMAND_VALUE         34194
-#define _APS_NEXT_CONTROL_VALUE         1632
+#define _APS_NEXT_CONTROL_VALUE         1635
 #define _APS_NEXT_SYMED_VALUE           118
 #endif
 #endif
diff --git a/Testing/FolderCompare/misc.cpp b/Testing/FolderCompare/misc.cpp
index c7cdf3dc0c1..8e2672c124d 100644
--- a/Testing/FolderCompare/misc.cpp
+++ b/Testing/FolderCompare/misc.cpp
@@ -70,3 +70,9 @@ String tr(const std::wstring& str)
 void NTAPI LangTranslateDialog(HWND h)
 {
 }
+
+void* AppGetMainHWND()
+{
+	return nullptr;
+}
+

From 823cb8b79770b4d6ec20346d0c5202ce23bf3802 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 22 Jan 2024 23:21:06 +0900
Subject: [PATCH 13/58] WIP

---
 .gitignore                |   2 +
 Src/Merge.vcxproj         |  10 +-
 Src/Merge.vcxproj.filters |   5 +
 Src/Merge2.rc             |   6 +
 Src/MergeAppCOMClass.cpp  |  80 ++++-----
 Src/MergeAppCOMClass.h    |  38 ++---
 Src/MergeAppLib.h         | 335 ++++++++++++++++++++++++++++++++++++++
 Src/MergeAppLib.idl       |  34 ++++
 8 files changed, 437 insertions(+), 73 deletions(-)
 create mode 100644 Src/MergeAppLib.h
 create mode 100644 Src/MergeAppLib.idl

diff --git a/.gitignore b/.gitignore
index 8a1eece0da1..25d5c969526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,5 @@ Testing/Data/Symlink/Dir2/ss12_diff_s12.txt
 Testing/Data/Symlink/Dir2/ss12_diff_s21.txt
 Testing/Data/Symlink/Dir2/ss12_same_s00.txt
 Testing/Data/Symlink/Dir2/ss12_same_s11.txt
+Src/MergeAppLib_i.c
+Src/MergeAppLib_p.c
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index fdfa472f1ea..81d9c2f44c6 100644
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -1684,7 +1684,9 @@
     <None Include="..\Docs\Users\ChangeLog.md" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Merge.rc" />
+    <ResourceCompile Include="Merge.rc">
+      <AdditionalIncludeDirectories>$(INTDIR);%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include</AdditionalIncludeDirectories>
+    </ResourceCompile>
     <ResourceCompile Include="Merge2.rc">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ResourceCompile>
@@ -1808,6 +1810,12 @@
   <ItemGroup>
     <Xml Include="res\WinMergeU.VisualElementsManifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Midl Include="MergeAppLib.idl">
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
+    </Midl>
+  </ItemGroup>
   <Target Name="CopyVisualElements" AfterTargets="Build">
     <ItemGroup>
       <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 527b1cfb21b..8b423d23a4f 100644
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -1817,4 +1817,9 @@
       <Filter>Resource Files</Filter>
     </Xml>
   </ItemGroup>
+  <ItemGroup>
+    <Midl Include="MergeAppLib.idl">
+      <Filter>Source Files</Filter>
+    </Midl>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index 47c8ece4696..4341f171801 100644
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -207,6 +207,12 @@ IDB_FILE_NEW3_WEBPAGE   BITMAP                  "res\\new3_webpage.bmp"
 
 IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// TypeLib
+//
+1 TYPELIB "Merge.tlb"
+
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 85b6e4a550c..5aa949cae5d 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -6,32 +6,8 @@
 #include "MergeApp.h"
 #include "resource.h"
 
-static PARAMDATA paramData_Translate[] =
-{ { L"text", VT_BSTR }, };
-static PARAMDATA paramData_GetOption[] =
-{ { L"name", VT_BSTR }, { L"defaultValue", VT_VARIANT}, };
-static PARAMDATA paramData_SaveOption[] =
-{ { L"name", VT_BSTR }, { L"value", VT_VARIANT}, };
-static PARAMDATA paramData_Log[] =
-{ { L"level", VT_I4 }, { L"text", VT_BSTR }, };
-static PARAMDATA paramData_MsgBox[] =
-{ { L"prompt", VT_BSTR }, { L"buttons", VT_VARIANT}, { L"title", VT_VARIANT}, };
-static PARAMDATA paramData_InputBox[] =
-{ { L"prompt", VT_BSTR }, { L"title", VT_VARIANT}, { L"default", VT_VARIANT}, };
-static METHODDATA methodData_MergeApp[] =
-{
-	{ L"Translate",  paramData_Translate,  DISPID_Translate,  3, CC_STDCALL, 1, DISPATCH_METHOD, VT_BSTR },
-	{ L"GetOption",  paramData_GetOption,  DISPID_GetOption,  4, CC_STDCALL, 2, DISPATCH_METHOD, VT_VARIANT },
-	{ L"SaveOption", paramData_SaveOption, DISPID_SaveOption, 5, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
-	{ L"Log", paramData_Log, DISPID_Log, 6, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
-	{ L"MsgBox", paramData_MsgBox, DISPID_MsgBox, 7, CC_STDCALL, 3, DISPATCH_METHOD, VT_I4 },
-	{ L"InputBox", paramData_InputBox, DISPID_InputBox, 8, CC_STDCALL, 3, DISPATCH_METHOD, VT_BSTR },
-};
-
-static INTERFACEDATA idata_MergeApp = { methodData_MergeApp, static_cast<UINT>(std::size(methodData_MergeApp)) }; 
-
 MergeAppCOMClass::MergeAppCOMClass()
-	: MyDispatch(&idata_MergeApp, static_cast<IMergeApp*>(this))
+	: MyDispatch(static_cast<IMergeApp*>(this))
 {
 }
 
@@ -39,12 +15,13 @@ MergeAppCOMClass::~MergeAppCOMClass()
 {
 }
 
-BSTR STDMETHODCALLTYPE MergeAppCOMClass::Translate(BSTR text)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::Translate(BSTR text, BSTR* pRet)
 {
-	return SysAllocString(tr(text).c_str());
+	*pRet = SysAllocString(tr(text).c_str());
+	return S_OK;
 }
 
-VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefault)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefault, VARIANT* pRet)
 {
 	VARIANT varResult;
 	VariantInit(&varResult);
@@ -67,7 +44,8 @@ VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefa
 			GetOptionsMgr()->InitOption(name, pvar->bstrVal);
 			break;
 		default:
-			return varResult;
+			*pRet = varResult;
+			return S_OK;;
 		}
 		value = GetOptionsMgr()->Get(name);
 	}
@@ -92,10 +70,11 @@ VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefa
 		varResult.vt = VT_EMPTY;
 		break;
 	}
-	return varResult;
+	*pRet = varResult;
+	return S_OK;;
 }
 
-void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 {
 	auto value = GetOptionsMgr()->Get(name);
 	const VARIANT* pvar = ((varValue.vt & VT_BYREF) != 0) ? varValue.pvarVal : &varValue;
@@ -116,7 +95,7 @@ void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 			GetOptionsMgr()->InitOption(name, pvar->bstrVal);
 			break;
 		default:
-			return;
+			return S_OK;
 		}
 		value = GetOptionsMgr()->Get(name);
 	}
@@ -125,36 +104,28 @@ void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 	case varprop::VT_BOOL:
 		if (pvar->vt == VT_BOOL)
 			GetOptionsMgr()->SaveOption(name, pvar->boolVal);
-		return;
+		return S_OK;
 	case varprop::VT_INT:
 		if (pvar->vt == VT_I2)
-		{
 			GetOptionsMgr()->SaveOption(name, pvar->iVal);
-			return;
-		}
-		if (pvar->vt == VT_I4)
-		{
+		else if (pvar->vt == VT_I4)
 			GetOptionsMgr()->SaveOption(name, pvar->intVal);
-			return;
-		}
-		return;
+		return S_OK;
 	case varprop::VT_STRING:
 		if (pvar->vt == VT_BSTR)
-		{
 			GetOptionsMgr()->SaveOption(name, pvar->bstrVal);
-			return;
-		}
-		return;
+		return S_OK;
 	}
-	return;
+	return S_OK;
 }
 
-void STDMETHODCALLTYPE MergeAppCOMClass::Log(int level, BSTR text)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::Log(int level, BSTR text)
 {
 	LogErrorString(text);
+	return S_OK;
 }
 
-int STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet)
 {
 	VARIANT varButtons2, varTitle2;
 	VariantInit(&varButtons2);
@@ -172,7 +143,8 @@ int STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons,
 	int ans = MessageBox(reinterpret_cast<HWND>(AppGetMainHWND()), prompt, varTitle2.bstrVal, varButtons2.intVal);
 	VariantClear(&varButtons2);
 	VariantClear(&varTitle2);
-	return ans;
+	*pRet = ans;
+	return S_OK;
 }
 
 INT_PTR CALLBACK MergeAppCOMClass::InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
@@ -210,7 +182,7 @@ INT_PTR CALLBACK MergeAppCOMClass::InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wP
 	return FALSE;
 }
 
-BSTR STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault, BSTR* pRet)
 {
 	VARIANT varTitle2, varDefault2;
 	VariantInit(&varTitle2);
@@ -232,7 +204,11 @@ BSTR STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTitle,
 	VariantClear(&varDefault2);
 	INT_PTR ans = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_INPUTBOX), reinterpret_cast<HWND>(AppGetMainHWND()), InputBoxProc, reinterpret_cast<LPARAM>(this));
 	if (ans == IDOK)
-		return SysAllocString(m_inputBoxText.c_str());
-	return SysAllocString(L"");
+	{
+		*pRet = SysAllocString(m_inputBoxText.c_str());
+		return S_OK;
+	}
+	*pRet = SysAllocString(L"");
+	return S_OK;
 }
 
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index 912a8daa88b..69cf38f0459 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <oleauto.h>
+#include "MergeAppLib.h"
 
 enum
 {
@@ -14,15 +15,21 @@ enum
 
 
 template<class T>
-class MyDispatch : public T, public IDispatch
+class MyDispatch : public T
 {
 public:
-	MyDispatch(INTERFACEDATA* idata, void* pThis)
+	MyDispatch(void* pThis)
 		: m_cRef(0), m_pTypeInfo(nullptr)
 	{
+		tchar_t path[MAX_PATH];
+		ITypeLib* pTypeLib = nullptr;
 		ITypeInfo* pTypeInfo = nullptr;
-		if (SUCCEEDED(CreateDispTypeInfo(idata, LOCALE_SYSTEM_DEFAULT, &pTypeInfo)))
-			m_pTypeInfo = pTypeInfo;
+		GetModuleFileName(nullptr, path, sizeof(path) / sizeof(path[0]));
+		if (SUCCEEDED(LoadTypeLib(path, &pTypeLib)))
+		{
+			pTypeLib->GetTypeInfoOfGuid(__uuidof(T), &m_pTypeInfo);
+			pTypeLib->Release();
+		}
 	}
 
 	virtual ~MyDispatch()
@@ -67,6 +74,7 @@ class MyDispatch : public T, public IDispatch
 
 	HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) override
 	{
+		m_pTypeInfo->AddRef();
 		ppTInfo = &m_pTypeInfo;
 		return S_OK;
 	}
@@ -85,16 +93,6 @@ class MyDispatch : public T, public IDispatch
 	ITypeInfo* m_pTypeInfo;
 };
 
-struct IMergeApp : public IUnknown
-{
-	virtual BSTR STDMETHODCALLTYPE Translate(BSTR text) = 0;
-	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) = 0;
-	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) = 0;
-	virtual void STDMETHODCALLTYPE Log(int level, BSTR text) = 0;
-	virtual int STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle) = 0;
-	virtual BSTR STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault) = 0;
-};
-
 class MergeAppCOMClass : public MyDispatch<IMergeApp>
 {
 public:
@@ -103,12 +101,12 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	virtual ~MergeAppCOMClass();
 	MergeAppCOMClass& operator=(const MergeAppCOMClass&) = delete;
 
-	BSTR STDMETHODCALLTYPE Translate(BSTR text) override;
-	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault) override;
-	void STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
-	void STDMETHODCALLTYPE Log(int level, BSTR text) override;
-	int STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle) override;
-	BSTR STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault) override;
+	HRESULT STDMETHODCALLTYPE Translate(BSTR text, BSTR* pRet) override;
+	HRESULT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault, VARIANT* pRet) override;
+	HRESULT STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
+	HRESULT STDMETHODCALLTYPE Log(int level, BSTR text) override;
+	HRESULT STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet) override;
+	HRESULT STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault, BSTR* pRet) override;
 private:
 	static INT_PTR CALLBACK InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam);
 	std::wstring m_inputBoxTitle;
diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h
new file mode 100644
index 00000000000..c89c05a6ac5
--- /dev/null
+++ b/Src/MergeAppLib.h
@@ -0,0 +1,335 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 8.01.0628 */
+/* at Tue Jan 19 12:14:07 2038
+ */
+/* Compiler settings for MergeAppLib.idl:
+    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 
+    protocol : all , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+/* @@MIDL_FILE_HEADING(  ) */
+
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif /* __RPCNDR_H_VERSION__ */
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __MergeAppLib_h__
+#define __MergeAppLib_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+#ifndef DECLSPEC_XFGVIRT
+#if defined(_CONTROL_FLOW_GUARD_XFG)
+#define DECLSPEC_XFGVIRT(base, func) __declspec(xfg_virtual(base, func))
+#else
+#define DECLSPEC_XFGVIRT(base, func)
+#endif
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IMergeApp_FWD_DEFINED__
+#define __IMergeApp_FWD_DEFINED__
+typedef interface IMergeApp IMergeApp;
+
+#endif 	/* __IMergeApp_FWD_DEFINED__ */
+
+
+#ifndef __IMergeApp_FWD_DEFINED__
+#define __IMergeApp_FWD_DEFINED__
+typedef interface IMergeApp IMergeApp;
+
+#endif 	/* __IMergeApp_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+#ifndef __IMergeApp_INTERFACE_DEFINED__
+#define __IMergeApp_INTERFACE_DEFINED__
+
+/* interface IMergeApp */
+/* [unique][helpstring][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IMergeApp;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("a719a330-c39a-4d8b-bf5a-8e52f4dd8da3")
+    IMergeApp : public IDispatch
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Translate( 
+            /* [in] */ BSTR text,
+            /* [retval][out] */ BSTR *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetOption( 
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varDefault,
+            /* [retval][out] */ VARIANT *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SaveOption( 
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varValue) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Log( 
+            /* [in] */ int level,
+            /* [in] */ BSTR text) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE MsgBox( 
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varButtons,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [retval][out] */ int *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE InputBox( 
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [optional][in] */ VARIANT varDefault,
+            /* [retval][out] */ BSTR *pRet) = 0;
+        
+    };
+    
+    
+#else 	/* C style interface */
+
+    typedef struct IMergeAppVtbl
+    {
+        BEGIN_INTERFACE
+        
+        DECLSPEC_XFGVIRT(IUnknown, QueryInterface)
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMergeApp * This,
+            /* [in] */ REFIID riid,
+            /* [annotation][iid_is][out] */ 
+            _COM_Outptr_  void **ppvObject);
+        
+        DECLSPEC_XFGVIRT(IUnknown, AddRef)
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMergeApp * This);
+        
+        DECLSPEC_XFGVIRT(IUnknown, Release)
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMergeApp * This);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetTypeInfoCount)
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
+            IMergeApp * This,
+            /* [out] */ UINT *pctinfo);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetTypeInfo)
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
+            IMergeApp * This,
+            /* [in] */ UINT iTInfo,
+            /* [in] */ LCID lcid,
+            /* [out] */ ITypeInfo **ppTInfo);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetIDsOfNames)
+        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
+            IMergeApp * This,
+            /* [in] */ REFIID riid,
+            /* [size_is][in] */ LPOLESTR *rgszNames,
+            /* [range][in] */ UINT cNames,
+            /* [in] */ LCID lcid,
+            /* [size_is][out] */ DISPID *rgDispId);
+        
+        DECLSPEC_XFGVIRT(IDispatch, Invoke)
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
+            IMergeApp * This,
+            /* [annotation][in] */ 
+            _In_  DISPID dispIdMember,
+            /* [annotation][in] */ 
+            _In_  REFIID riid,
+            /* [annotation][in] */ 
+            _In_  LCID lcid,
+            /* [annotation][in] */ 
+            _In_  WORD wFlags,
+            /* [annotation][out][in] */ 
+            _In_  DISPPARAMS *pDispParams,
+            /* [annotation][out] */ 
+            _Out_opt_  VARIANT *pVarResult,
+            /* [annotation][out] */ 
+            _Out_opt_  EXCEPINFO *pExcepInfo,
+            /* [annotation][out] */ 
+            _Out_opt_  UINT *puArgErr);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, Translate)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Translate )( 
+            IMergeApp * This,
+            /* [in] */ BSTR text,
+            /* [retval][out] */ BSTR *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, GetOption)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetOption )( 
+            IMergeApp * This,
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varDefault,
+            /* [retval][out] */ VARIANT *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, SaveOption)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SaveOption )( 
+            IMergeApp * This,
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varValue);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, Log)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Log )( 
+            IMergeApp * This,
+            /* [in] */ int level,
+            /* [in] */ BSTR text);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, MsgBox)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *MsgBox )( 
+            IMergeApp * This,
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varButtons,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [retval][out] */ int *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, InputBox)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *InputBox )( 
+            IMergeApp * This,
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [optional][in] */ VARIANT varDefault,
+            /* [retval][out] */ BSTR *pRet);
+        
+        END_INTERFACE
+    } IMergeAppVtbl;
+
+    interface IMergeApp
+    {
+        CONST_VTBL struct IMergeAppVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMergeApp_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMergeApp_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMergeApp_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMergeApp_GetTypeInfoCount(This,pctinfo)	\
+    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) 
+
+#define IMergeApp_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
+    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) 
+
+#define IMergeApp_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
+    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) 
+
+#define IMergeApp_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
+    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) 
+
+
+#define IMergeApp_Translate(This,text,pRet)	\
+    ( (This)->lpVtbl -> Translate(This,text,pRet) ) 
+
+#define IMergeApp_GetOption(This,name,varDefault,pRet)	\
+    ( (This)->lpVtbl -> GetOption(This,name,varDefault,pRet) ) 
+
+#define IMergeApp_SaveOption(This,name,varValue)	\
+    ( (This)->lpVtbl -> SaveOption(This,name,varValue) ) 
+
+#define IMergeApp_Log(This,level,text)	\
+    ( (This)->lpVtbl -> Log(This,level,text) ) 
+
+#define IMergeApp_MsgBox(This,prompt,varButtons,varTitle,pRet)	\
+    ( (This)->lpVtbl -> MsgBox(This,prompt,varButtons,varTitle,pRet) ) 
+
+#define IMergeApp_InputBox(This,prompt,varTitle,varDefault,pRet)	\
+    ( (This)->lpVtbl -> InputBox(This,prompt,varTitle,varDefault,pRet) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMergeApp_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __MergeAppLib_LIBRARY_DEFINED__
+#define __MergeAppLib_LIBRARY_DEFINED__
+
+/* library MergeAppLib */
+/* [helpstring][version][uuid] */ 
+
+
+
+EXTERN_C const IID LIBID_MergeAppLib;
+#endif /* __MergeAppLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); 
+void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * ); 
+
+unsigned long             __RPC_USER  BSTR_UserSize64(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal64(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal64(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree64(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  VARIANT_UserSize64(     unsigned long *, unsigned long            , VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserMarshal64(  unsigned long *, unsigned char *, VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserUnmarshal64(unsigned long *, unsigned char *, VARIANT * ); 
+void                      __RPC_USER  VARIANT_UserFree64(     unsigned long *, VARIANT * ); 
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/Src/MergeAppLib.idl b/Src/MergeAppLib.idl
new file mode 100644
index 00000000000..7d3f1c8d3c0
--- /dev/null
+++ b/Src/MergeAppLib.idl
@@ -0,0 +1,34 @@
+// This file will be processed by the MIDL tool to
+// produce the type library (MergeAppLib.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+[
+	object,
+	uuid(a719a330-c39a-4d8b-bf5a-8e52f4dd8da3),
+	helpstring("IMergeApp Interface"),
+	pointer_default(unique)
+]
+interface IMergeApp : IDispatch
+{
+	[id(1), helpstring("method Translate")] HRESULT Translate([in] BSTR text, [out, retval] BSTR* pRet);
+	[id(2), helpstring("method GetOption")] HRESULT GetOption([in] BSTR name, [in] VARIANT varDefault, [out, retval] VARIANT* pRet);
+	[id(3), helpstring("method SaveOption")] HRESULT SaveOption([in] BSTR name, [in] VARIANT varValue);
+	[id(4), helpstring("method Log")] HRESULT Log([in] int level, [in] BSTR text);
+	[id(5), helpstring("method MsgBox")] HRESULT MsgBox([in] BSTR prompt, [in, optional] VARIANT varButtons, [in, optional] VARIANT varTitle, [out, retval] int* pRet);
+	[id(6), helpstring("method InputBox")] HRESULT InputBox([in] BSTR prompt, [in, optional] VARIANT varTitle, [in, optional] VARIANT varDefault, [out, retval] BSTR* pRet);
+};
+
+[
+	uuid(3bc1ff50-9fb8-4796-a0c3-966eda88ab15),
+	version(1.0),
+	helpstring("MergeApp Type Library")
+]
+library MergeAppLib
+{
+	importlib("stdole32.tlb");
+	importlib("stdole2.tlb");
+
+	interface IMergeApp;
+};

From 88169dd533d90fe36e005bf426efe3b318dd1ef7 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 22 Jan 2024 23:22:31 +0900
Subject: [PATCH 14/58] WIP

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 25d5c969526..62a7602b1c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,4 @@ Testing/Data/Symlink/Dir2/ss12_same_s00.txt
 Testing/Data/Symlink/Dir2/ss12_same_s11.txt
 Src/MergeAppLib_i.c
 Src/MergeAppLib_p.c
+Src/dlldata.c

From 1f113612f2828af6e1cd054b223143364ebfdf74 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 29 Jan 2024 07:35:48 +0900
Subject: [PATCH 15/58] WIP

---
 Plugins/dlls/editor addin.sct | 236 ++++++++++++++++------------------
 1 file changed, 111 insertions(+), 125 deletions(-)

diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 7cfaab71fe7..fe01f591398 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -177,131 +177,115 @@ function IsFirstArgumentEmpty() {
 }
 
 function ParseArguments(args) {
-  var ary()
-  var ch
-  var inQuotes
-  var token
-  var argsLen
-  var i, j
-  argsLen = Len(args)
-  For i = 1 To argsLen
-    ch = Mid(args, i, 1)
-    if (Not inQuotes) {
-      if (ch = " " Or ch = vbTab) {
-        if (len(token) > 0) {
-          ReDim Preserve ary(j)
-          ary(j) = token
-          j = j + 1
+  var ary = new Array();
+  var token = "";
+  var argsLen = args.length;
+  var inQuotes = false;
+  for (var i = 0; i < argsLen; i++) {
+    var ch = args.charAt(i);
+    if (!inQuotes) {
+      if (ch === " " || ch === "\t") {
+        if (token.length > 0) {
+          ary.push(token);
           token = ""
         }
-      } else if ( ch = """") {
-        inQuotes = True
+      } else if (ch === "\"") {
+        inQuotes = true;
       } else {
-        token = token + ch
+        token += ch;
       }
     } else {
-      if (ch = """") {
-        if (i + 1 <= argsLen) {
-          if (Mid(args, i + 1, 1) = """") {
-            token = token + ch
-          End if
+      if (ch === "\"") {
+        if (i + 1 < argsLen) {
+          if (args.charAt(i) === "\"") {
+            token += ch;
+          }
         }
-        inQuotes = False 
+        inQuotes = false;
       } else {
-        token = token + ch
+        token += ch;
       }
     }
   }
   if (Len(token) > 0) {
-    ReDim Preserve ary(j)
-    ary(j) = token
-    j = j + 1
+    ary.push(token);
     token = ""
   }
-  ParseArguments = ary 
+  return ary; 
 }
 
 function ParseRanges(rangeText) {
-  var i, j
-  var ary, ary2, aryRanges()
-  var rangeFrom, rangeTo
-  ary = Split(rangeText, ",")
-  j = 0
-  For i = 0 To SafeUBound(ary)
-    ary2 = Split(ary(i), "-")
-    rangeFrom = ""
-    if (SafeUBound(ary2) >= 0) {
-      rangeFrom = Trim(ary2(0))
+  var aryRanges = new Array();
+  var ary = rangeText.split(",");
+  for (var i = 0, j = 0; i < ary.length; i++) {
+    var ary2 = ary[i].split("-");
+    var rangeFrom = ""
+    if (ary2.length > 0) {
+      rangeFrom = ary2[0].replace(/^\s+|\s+$/g, "");
     }
-    rangeTo = rangeFrom
-    if (SafeUBound(ary2) > 0) {
-      rangeTo = Trim(ary2(1))
+    var rangeTo = rangeFrom;
+    if (ary2 > 1) {
+      rangeTo = ary2[1].replace(/^\s+|\s+$/g, "");
     }
-    if (IsNumeric(rangeFrom) Or IsNumeric(rangeTo)) {
-      if (Not IsNumeric(rangeFrom)) { rangeFrom = 1
-      if (Not IsNumeric(rangeTo)  ) { rangeTo   = 1000000000
-      if (CDbl(rangeFrom) < 1 Or CDbl(rangeFrom) > 1000000000) { rangeFrom = 1
-      if (CDbl(rangeTo)   < 1 Or CDbl(rangeTo)   > 1000000000) { rangeTo   = 1
-      if (CDbl(rangeFrom) > CDbl(rangeTo)) { rangeTo = rangeFrom
-      Redim preserve aryRanges(j)
-      aryRanges(j) = Array(CLng(rangeFrom), CLng(rangeTo))
-      j = j + 1
+    if (!isNan(rangeFrom) || !isNan(rangeTo)) {
+      if (isNan(rangeFrom)) { rangeFrom = 1; }
+      if (isNan(rangeTo)) { rangeTo = 1000000000; }
+      if (parseFloat(rangeFrom) < 1 || parseFloat(rangeFrom) > 1000000000) { rangeFrom = 1; }
+      if (parseFloat(rangeTo) < 1 || parseFloat(rangeTo) > 1000000000) { rangeTo = 1; }
+      if (parseFloat(rangeFrom) > parseFloat(rangeTo)) { rangeTo = rangeFrom; }
+      aryRanges.push([parseInt(rangeFrom), parseInt(rangeTo)]);
     }
   }
-  ParseRanges = aryRanges
-}
-
-function ParseSelectColumnsLinesArguments(args, invert) {
-  var rangesOrRegExps()
-  var argAry
-  var i, j
-  var re
-  var isOption
-  re = Nothing
-  argAry = ParseArguments(args)
-  invert = False
-  For i = 0 To SafeUBound(argAry)
-    isOption = False
-    if (Len(argAry(i)) >= 2) {
-      Select Case Left(argAry(i), 1)
-      Case "-", "/"
-        Select Case Mid(argAry(i), 2, 1)
-        Case "e", "i", "g"
-          isOption = True
-          if (re Is Nothing) {
-            re = New RegExp
-            Redim Preserve rangesOrRegExps(j)
-            rangesOrRegExps(j) = re
-            j = j + 1
+  return aryRanges;
+}
+
+function ParseSelectColumnsLinesArguments(args) {
+  var rangesOrRegExps = new Array();
+  var re;
+  var argAry = ParseArguments(args);
+  var invert = false;
+  var flags = "";
+  for (var i = 0; i < argAry.length; i++) {
+    var isOption = false;
+    if (argAry[i].length >= 2) {
+      switch (argAry[i].charAt[0]) {
+      case "-", "/":
+        switch (argAry[i].charAt[1]) {
+        case "e", "i", "g":
+          isOption = true;
+          if (!re) {
+            re = new RegExp();
+            rangesOrRegExps.push(re)
           }
-          if (InStr(argAry(i), "i") > 0) {
-            re.IgnoreCase = True
+          flags = "";
+          if (argAry[i].indexOf("g") >= 0) {
+            flags += "g";
           }
-          if (InStr(argAry(i), "g") > 0) {
-            re.Global  = True
+          if (argAry[i].indexOf("i") >= 0) {
+            flags += "i";
           }
-        Case "v"
-          isOption = True
-          invert = True
-        End Select
-      End Select
+          break;
+        case "v":
+          isOption = true;
+          invert = true;
+          break;
+        }
+      }
+      break;
     }
-    if (Not isOption) {
-      if (Not (re Is Nothing)) {
-        re.Pattern = argAry(i)
-        re = Nothing
+    if (!isOption) {
+      if (!re) {
+        pattern = argAry(i)
+        re = null;
       } else {
-        Redim Preserve rangesOrRegExps(j)
-        rangesOrRegExps(j) = ParseRanges(argAry(i))
-        if (SafeUBound(rangesOrRegExps(j)) < 0) {
-          rangesOrRegExps(j) = New RegExp
-          rangesOrRegExps(j).Pattern = argAry(i)
+        rangesOrRegExps.push(ParseRanges(argAry[i]))
+        if (rangesOrRegExps(j) == 0) {
+          rangesOrRegExps[rangesOrRegExps.length - 1] = new RegExp(argAry[i]);
         }
-        j = j + 1
       }
     }
   }
-  ParseSelectColumnsLinesArguments = rangesOrRegExps
+  return { "rangesOrRegExps": rangesOrRegExps, "invert": invert };
 }
 
 function ParseReplaceArguments(args, regex, ignoreCase) {
@@ -312,22 +296,24 @@ function ParseReplaceArguments(args, regex, ignoreCase) {
   var isOption
   re = Nothing
   argAry = ParseArguments(args)
-  regex = False
-  ignoreCase = False
+  regex = false;
+  ignoreCase = false;
   For i = 0 To SafeUBound(argAry)
-    isOption = False
+    isOption = false;
     if (Len(argAry(i)) >= 2) {
-      Select Case Left(argAry(i), 1)
-      Case "-", "/"
-        Select Case Mid(argAry(i), 2, 1)
-        Case "e", "i"
-          isOption = True
-          regex = True
+      Select case Left(argAry(i), 1)
+      case "-", "/"
+        Select case Mid(argAry(i), 2, 1)
+        case "e", "i"
+          isOption = true;
+          regex = true;
           if (InStr(argAry(i), "i") > 0) {
-            ignoreCase = True
+            ignoreCase = true;
           }
-        End Select
-      End Select
+          break;
+        }
+        break;
+      }
     }
     if (Not isOption) {
       Redim Preserve patterns(j)
@@ -347,37 +333,37 @@ function Unescape(text) {
   i = 1
   Do While i <= textLen
     ch = Mid(text, i, 1)
-    Select Case ch
-    Case "\\"
+    Select case ch
+    case "\\"
       if (i <= textLen - 1) {
         i = i + 1
         ch = Mid(text, i, 1)
-        Select Case ch
-        Case "a"
+        Select case ch
+        case "a"
           Unescape = Unescape + Chr(+H07)
-        Case "b"
+        case "b"
           Unescape = Unescape + Chr(+H08)
-        Case "t"
+        case "t"
           Unescape = Unescape + Chr(+H09)
-        Case "n"
+        case "n"
           Unescape = Unescape + Chr(+H0A)
-        Case "v"
+        case "v"
           Unescape = Unescape + Chr(+H0B)
-        Case "f"
+        case "f"
           Unescape = Unescape + Chr(+H0C)
-        Case "r"
+        case "r"
           Unescape = Unescape + Chr(+H0D)
-        Case "\\"
+        case "\\"
           Unescape = Unescape + "\\"
-        Case Else
+        default:
           Unescape = Unescape + "\\" + ch
-        End Select
+        }
       } else {
         Unescape = Unescape + ch
       }
-    Case Else
+    default:
       Unescape = Unescape + ch
-    End Select
+    }
     i = i + 1
   Loop
 }
@@ -385,8 +371,8 @@ function Unescape(text) {
 function SplitLines(text, eol) {
   var re, matches
   re = New RegExp
-  re.Global = False
-  re.IgnoreCase = False
+  re.Global = false;
+  re.IgnoreCase = false;
   re.Pattern = "\r\n|\n|\r"
   matches = re.Execute(text)
   if (matches.Count > 0) {

From 199c21a52b5f5f6e99520208fff3507c511958a7 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 29 Jan 2024 09:13:17 +0900
Subject: [PATCH 16/58] WIP

---
 Plugins/dlls/editor addin.sct | 55 +++++++++++++----------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index fe01f591398..77894a07b54 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -241,10 +241,10 @@ function ParseRanges(rangeText) {
 
 function ParseSelectColumnsLinesArguments(args) {
   var rangesOrRegExps = new Array();
-  var re;
   var argAry = ParseArguments(args);
   var invert = false;
   var flags = "";
+  var isRegExp = false;
   for (var i = 0; i < argAry.length; i++) {
     var isOption = false;
     if (argAry[i].length >= 2) {
@@ -252,12 +252,8 @@ function ParseSelectColumnsLinesArguments(args) {
       case "-", "/":
         switch (argAry[i].charAt[1]) {
         case "e", "i", "g":
+          isRegExp = true;
           isOption = true;
-          if (!re) {
-            re = new RegExp();
-            rangesOrRegExps.push(re)
-          }
-          flags = "";
           if (argAry[i].indexOf("g") >= 0) {
             flags += "g";
           }
@@ -274,40 +270,33 @@ function ParseSelectColumnsLinesArguments(args) {
       break;
     }
     if (!isOption) {
-      if (!re) {
-        pattern = argAry(i)
-        re = null;
+      if (isRegExp) {
+        rangesOrRegExps.push(new RegExp(argAry(i), flags));
+        isRegExp = false;
       } else {
         rangesOrRegExps.push(ParseRanges(argAry[i]))
-        if (rangesOrRegExps(j) == 0) {
-          rangesOrRegExps[rangesOrRegExps.length - 1] = new RegExp(argAry[i]);
-        }
       }
     }
   }
   return { "rangesOrRegExps": rangesOrRegExps, "invert": invert };
 }
 
-function ParseReplaceArguments(args, regex, ignoreCase) {
-  var patterns()
-  var argAry
-  var i, j
-  var re
-  var isOption
-  re = Nothing
-  argAry = ParseArguments(args)
-  regex = false;
-  ignoreCase = false;
-  For i = 0 To SafeUBound(argAry)
+function ParseReplaceArguments(args) {
+  var patterns = new Array();
+  var isOption = false;
+  var argAry = ParseArguments(args)
+  var regex = false;
+  var ignoreCase = false;
+  for (var i = 0; i < argAry.length; i++) {
     isOption = false;
-    if (Len(argAry(i)) >= 2) {
-      Select case Left(argAry(i), 1)
-      case "-", "/"
-        Select case Mid(argAry(i), 2, 1)
-        case "e", "i"
+    if (argAry[i].length >= 2) {
+      switch (argAry[i].charAt(0)) {
+      case "-", "/":
+        switch (argAry[i].charAt(1)) {
+        case "e", "i":
           isOption = true;
           regex = true;
-          if (InStr(argAry(i), "i") > 0) {
+          if (argAry[i].indexOf("i") >= 0) {
             ignoreCase = true;
           }
           break;
@@ -315,13 +304,11 @@ function ParseReplaceArguments(args, regex, ignoreCase) {
         break;
       }
     }
-    if (Not isOption) {
-      Redim Preserve patterns(j)
-      patterns(j) = argAry(i)
-      j = j + 1
+    if (!isOption) {
+      patterns.push(argAry[i]);
     }
   }
-  ParseReplaceArguments = patterns
+  return { "patterns": pattern, "regex": regex, "ignoreCase": ignoreCase };
 }
 
 function Unescape(text) {

From 023da4d5a5009f906d400f544449957f66873db1 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 30 Jan 2024 21:51:37 +0900
Subject: [PATCH 17/58] WIP

---
 ALL.vs2017.sln                      |   2 +-
 ALL.vs2019.sln                      |   2 +-
 ALL.vs2022.sln                      |   2 +-
 Plugins/dlls/editor addin.sct       | 264 +++++++++++++---------------
 Testing/PluginTests/PluginTests.js  | 245 ++++++++++++++++++++++++++
 Testing/PluginTests/PluginTests.vbs | 250 --------------------------
 6 files changed, 371 insertions(+), 394 deletions(-)
 create mode 100644 Testing/PluginTests/PluginTests.js
 delete mode 100644 Testing/PluginTests/PluginTests.vbs

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 51f20bc5e6e..bd923095016 100644
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index a65ebf04f74..6aa82fd7133 100644
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
index 001a1b9ab81..ef5dacbcc22 100644
--- a/ALL.vs2022.sln
+++ b/ALL.vs2022.sln
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 77894a07b54..cf3c09697cb 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -42,7 +42,7 @@
 var REGKEY_PATH = "Plugins\\editor addin.sct/";
 
 var wsh = new ActiveXObject("WScript.Shell")
-var arguments = "";
+var pluginArguments = "";
 var variables = new Array();
 var mergeApp;
 
@@ -121,11 +121,11 @@ function get_PluginExtendedProperties() {
 }
 
 function get_PluginArguments() {
-  return arguments;
+  return pluginArguments;
 }
 
 function put_PluginArguments(NewValue) {
-  arguments = NewValue;
+  pluginArguments = NewValue;
 }
 
 function get_PluginVariables() {
@@ -173,7 +173,7 @@ function ReplaceVariables(str) {
 }
 
 function IsFirstArgumentEmpty() {
-  return (arguments.match(/^\s*$/) !== null);
+  return (pluginArguments.match(/^\s*$/) !== null);
 }
 
 function ParseArguments(args) {
@@ -187,7 +187,7 @@ function ParseArguments(args) {
       if (ch === " " || ch === "\t") {
         if (token.length > 0) {
           ary.push(token);
-          token = ""
+          token = "";
         }
       } else if (ch === "\"") {
         inQuotes = true;
@@ -207,9 +207,9 @@ function ParseArguments(args) {
       }
     }
   }
-  if (Len(token) > 0) {
+  if (token.length > 0) {
     ary.push(token);
-    token = ""
+    token = "";
   }
   return ary; 
 }
@@ -219,23 +219,23 @@ function ParseRanges(rangeText) {
   var ary = rangeText.split(",");
   for (var i = 0, j = 0; i < ary.length; i++) {
     var ary2 = ary[i].split("-");
-    var rangeFrom = ""
+    var rangeFrom = "";
     if (ary2.length > 0) {
       rangeFrom = ary2[0].replace(/^\s+|\s+$/g, "");
     }
     var rangeTo = rangeFrom;
-    if (ary2 > 1) {
+    if (ary2.length > 1) {
       rangeTo = ary2[1].replace(/^\s+|\s+$/g, "");
     }
-    if (!isNan(rangeFrom) || !isNan(rangeTo)) {
-      if (isNan(rangeFrom)) { rangeFrom = 1; }
-      if (isNan(rangeTo)) { rangeTo = 1000000000; }
+    if ((rangeFrom !== "" && !isNaN(rangeFrom)) || (rangeTo !== "" && !isNaN(rangeTo))) {
+      if (rangeFrom === "" || isNaN(rangeFrom)) { rangeFrom = 1; }
+      if (rangeTo === "" || isNaN(rangeTo)) { rangeTo = 1000000000; }
       if (parseFloat(rangeFrom) < 1 || parseFloat(rangeFrom) > 1000000000) { rangeFrom = 1; }
       if (parseFloat(rangeTo) < 1 || parseFloat(rangeTo) > 1000000000) { rangeTo = 1; }
       if (parseFloat(rangeFrom) > parseFloat(rangeTo)) { rangeTo = rangeFrom; }
       aryRanges.push([parseInt(rangeFrom), parseInt(rangeTo)]);
     }
-  }
+    }
   return aryRanges;
 }
 
@@ -266,15 +266,15 @@ function ParseSelectColumnsLinesArguments(args) {
           invert = true;
           break;
         }
+        break;
       }
-      break;
     }
     if (!isOption) {
       if (isRegExp) {
-        rangesOrRegExps.push(new RegExp(argAry(i), flags));
+        rangesOrRegExps.push(new RegExp(argAry[i], flags));
         isRegExp = false;
       } else {
-        rangesOrRegExps.push(ParseRanges(argAry[i]))
+        rangesOrRegExps.push(ParseRanges(argAry[i]));
       }
     }
   }
@@ -284,7 +284,7 @@ function ParseSelectColumnsLinesArguments(args) {
 function ParseReplaceArguments(args) {
   var patterns = new Array();
   var isOption = false;
-  var argAry = ParseArguments(args)
+  var argAry = ParseArguments(args);
   var regex = false;
   var ignoreCase = false;
   for (var i = 0; i < argAry.length; i++) {
@@ -312,60 +312,55 @@ function ParseReplaceArguments(args) {
 }
 
 function Unescape(text) {
-  var textLen
-  var i
-  var ch
-
-  textLen = Len(text)
-  i = 1
-  Do While i <= textLen
-    ch = Mid(text, i, 1)
-    Select case ch
-    case "\\"
-      if (i <= textLen - 1) {
-        i = i + 1
-        ch = Mid(text, i, 1)
-        Select case ch
-        case "a"
-          Unescape = Unescape + Chr(+H07)
-        case "b"
-          Unescape = Unescape + Chr(+H08)
-        case "t"
-          Unescape = Unescape + Chr(+H09)
-        case "n"
-          Unescape = Unescape + Chr(+H0A)
-        case "v"
-          Unescape = Unescape + Chr(+H0B)
-        case "f"
-          Unescape = Unescape + Chr(+H0C)
-        case "r"
-          Unescape = Unescape + Chr(+H0D)
-        case "\\"
-          Unescape = Unescape + "\\"
+  var result = "";
+  var textLen = text.length;
+  var i = 0;
+  while (i < textLen) {
+    var ch = text.charAt(i);
+    switch (ch) {
+    case "\\":
+      if (i < textLen - 1) {
+        i++;
+        ch = text.charAt(i);
+        switch (ch) {
+        case "a":
+          result += "\a";
+          break;
+        case "b":
+          result += "\b";
+          break;
+        case "t":
+          result += "\t";
+          break;
+        case "n":
+          result += "\n";
+          break;
+        case "v":
+          result += "\v";
+          break;
+        case "f":
+          result += "\f";
+          break;
+        case "r":
+          result += "\r";
+          break;
+        case "\\":
+          result += "\\";
+          break;
         default:
-          Unescape = Unescape + "\\" + ch
+          result += "\\" + ch;
+          break;
         }
       } else {
-        Unescape = Unescape + ch
+        result += ch;
       }
+      break;
     default:
-      Unescape = Unescape + ch
+      result += ch;
+      break;
     }
-    i = i + 1
-  Loop
-}
-
-function SplitLines(text, eol) {
-  var re, matches
-  re = New RegExp
-  re.Global = false;
-  re.IgnoreCase = false;
-  re.Pattern = "\r\n|\n|\r"
-  matches = re.Execute(text)
-  if (matches.Count > 0) {
-    eol = matches(0).Value
+    i++;
   }
-  SplitLines = Split(text, eol)
 }
 
 function PluginOnEvent(eventType, obj) {
@@ -384,23 +379,23 @@ function MakeLower(Text) {
 function ExecFilterCommand(Text) {
   var cmd;
   if (IsFirstArgumentEmpty()) {
-    cmd = regRead(REGKEY_PATH + "ExecFilterCommand", "")
-    cmd = mergeApp.InputBox("Enter filter command", "ExecFilterCommand", cmd)
+    cmd = regRead(REGKEY_PATH + "ExecFilterCommand", "");
+    cmd = mergeApp.InputBox("Enter filter command", "ExecFilterCommand", cmd);
     if (cmd !== "") {
       regWrite(REGKEY_PATH + "ExecFilterCommand", cmd, "REG_SZ");
     }
-    cmd = ReplaceVariables(cmd)
+    cmd = ReplaceVariables(cmd);
   } else {
-    cmd = arguments
+    cmd = pluginArguments;
   }
   if (cmd === "") {
     throw new Error(30001, "Canceled");
   }
 
   var path = wsh.ExpandEnvironmentStrings("%TEMP%\\_winmerge_addin_temp_.txt");
-  var fso = new ActiveXObject("Scripting.FileSystemObject")
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
   try {
-    var ts = fso.CreateTextFile(path)
+    var ts = fso.CreateTextFile(path);
     ts.Write(Text);
     ts.Close();
   } catch (e) {
@@ -408,9 +403,9 @@ function ExecFilterCommand(Text) {
   }
   var result = "";
   try {
-    var exe = wsh.Exec("cmd /c type \"" + path + "\" | " + cmd + " 2>&1")
+    var exe = wsh.Exec("cmd /c type \"" + path + "\" | " + cmd + " 2>&1");
     while (!exe.StdOut.AtEndOfStream) {
-      result += exe.StdOut.ReadLine + "\r\n";
+      result += exe.StdOut.ReadLine() + "\r\n";
     }
   } catch (e) {
     throw new Error(30001, "Failed to execute the command '" + cmd + "':" + e.message);
@@ -421,12 +416,7 @@ function ExecFilterCommand(Text) {
 }
 
 function SelectColumns(Text) {
-  var args, ranges, regexpStr
-  var matches, m
-  var lines, eol, line
-  var i, j, k
-  var rangesOrRegExps
-  var invert
+  var args;
   if (IsFirstArgumentEmpty()) {
     args = regRead(REGKEY_PATH + "SelectColumns", "");
     args = mergeApp.InputBox("Enter the list of column ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectColumns", args);
@@ -434,98 +424,92 @@ function SelectColumns(Text) {
       regWrite(REGKEY_PATH + "SelectColumns", args, "REG_SZ");
     }
   } else {
-    args = arguments;
+    args = pluginArguments;
   }
   if (args === "") {
     throw new Error(30001, "Canceled");
   }
-  lines = SplitLines(Text, eol)
-  rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-  For i = 0 To SafeUBound(lines)
-    line = ""
-    For j = 0 To SafeUBound(rangesOrRegExps)
-      if (IsArray(rangesOrRegExps(j))) {
-        For k = 0 To SafeUBound(rangesOrRegExps(j))
-          if (rangesOrRegExps(j)(k)(0) <= Len(lines(i))) {
-            line = line + Mid(lines(i), rangesOrRegExps(j)(k)(0), rangesOrRegExps(j)(k)(1) - rangesOrRegExps(j)(k)(0) + 1)
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var parseResult = ParseSelectColumnsLinesArguments(args);
+  var rangesOrRegExps = parseResult.rangesOrRegExps;
+  var invert = parseResult.invert;
+  for (var i = 0; i < lines.length; i++) {
+    var line = "";
+    for (var j = 0; j < rangesOrRegExps.length; j++) {
+      if (rangesOrRegExps[j] instanceof Array) {
+        for (var k = 0; k < rangesOrRegExps[j].length; k++) {
+          if (rangesOrRegExps[j][k][0] - 1 < lines[i].length) {
+            line += lines[i].substring(rangesOrRegExps[j][k][0] - 1, rangesOrRegExps[j][k][1]);
           }
         }
       } else {
-        if (Not invert) {
-          matches = rangesOrRegExps(j).Execute(lines(i))
-          For Each m In matches
-            line = line + m.Value
+        if (!invert) {
+          var matches = lines[i].match(rangesOrRegExps[j]);
+          for (var k = 0; k < matches.length; k++) {
+            line += matches[k];
           }
         } else {
-          line = line + rangesOrRegExps(j).Replace(lines(i), "")
+          line += replacei(rangesOrRegExps[j], lines[i], "", false);
         }
       }
     }
-    lines(i) = line
+    lines[i] = line;
   }
-  SelectColumns = Join(lines, eol)
+  return lines.join(eol);
 }
 
 function SelectLines(Text) {
-  var args, ranges
-  var matches, rangesOrRegExps
-  var lines, newlines(), eol
-  var i, j, k, l
-  var max
-  var matched
-  var invert
+  var args;
+  var newlines = new Array();
   if (IsFirstArgumentEmpty()) {
-    args = regRead(REGKEY_PATH + "SelectLines", "")
-    args = mergeApp.InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectLines", args)
+    args = regRead(REGKEY_PATH + "SelectLines", "");
+    args = mergeApp.InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectLines", args);
     if (args !== "") {
       regWrite(REGKEY_PATH + "SelectLines", args, "REG_SZ");
     }
   } else {
-    args = arguments
+    args = pluginArguments;
   }
   if (args === "") {
     throw new Error(30001, "Canceled");
   }
-  lines = SplitLines(Text, eol)
-  l = 0
-  rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-  For i = 0 To SafeUBound(rangesOrRegExps)
-    if (IsArray(rangesOrRegExps(i))) {
-      For j = 0 To SafeUBound(rangesOrRegExps(i))
-        max =rangesOrRegExps(i)(j)(1) - 1 
-        if (max > SafeUBound(lines)) { max = SafeUBound(lines)
-        For k = rangesOrRegExps(i)(j)(0) - 1 To max
-          if (k <= SafeUBound(lines)) {
-            ReDim Preserve newlines(l)
-            newlines(l) = lines(k)
-            l = l + 1
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var parseResult = ParseSelectColumnsLinesArguments(args);
+  var invert = parseResult.invert;
+  var rangesOrRegExps = parseResult.rangesOrRegExps;
+  for (var i = 0; i < rangesOrRegExps.length; i++) {
+    if (rangesOrRegExps[i] instanceof Array) {
+      for (var j = 0; j < rangesOrRegExps[i].length; j++) {
+        var max = rangesOrRegExps[i][j][1];
+        if (max > lines.length) { max = lines.length; }
+        for (var k = rangesOrRegExps[i][j][0] - 1; k < max; k++) {
+          if (k < lines.length) {
+            newlines.push(lines[k]);
           }
         }
       }
     } else {
-      For j = 0 To SafeUBound(lines)
-        matched = rangesOrRegExps(i).Test(lines(j))
-        if (invert) { matched = Not matched
+      for (var j = 0; j < lines.length; j++) {
+        var matched = (rangesOrRegExps[i].match(lines[j]) !== null);
+        if (invert) { matched = !matched; }
         if (matched) {
-          ReDim Preserve newlines(l)
-          newlines(l) = lines(j)
-          l = l + 1
+          newlines.push(lines[j]);
         }
       }
     }
   }
-  if (SafeUBound(lines) >= 0) {
-    if (lines(UBound(lines)) = "") {
-      if (SafeUBound(newlines) >= 0) {
-        if (newlines(UBound(newlines)) !== "") {
-          ReDim Preserve newlines(l)
-          newlines(l) = ""
-          l = l + 1
+  if (lines.length > 0) {
+    if (lines[lines.length - 1] === "") {
+      if (newlines.length > 0) {
+        if (newlines[newlines.length - 1] !== "") {
+          newlines[l].push("");
         }
       }
     }
   }
-  SelectLines = Join(newlines, eol)
+  return newlines.join(eol);
 }
 
 function replacei(text, find, replace, ignorecase) {
@@ -545,13 +529,13 @@ function ReplaceText(Text) {
   var args;
   var result = Text;
   if (IsFirstArgumentEmpty()) {
-    args = regRead(REGKEY_PATH + "Replace", "")
-    args = mergeApp.InputBox("Enter the search text and replacement text:", "Replace", args)
+    args = regRead(REGKEY_PATH + "Replace", "");
+    args = mergeApp.InputBox("Enter the search text and replacement text:", "Replace", args);
     if (args !== "") {
       regWrite(REGKEY_PATH + "Replace", args, "REG_SZ");
     }
   } else {
-    args = arguments
+    args = pluginArguments;
   }
   if (args === "") {
     throw new Error(30001, "Canceled");
@@ -591,7 +575,7 @@ function Tokenize(Text) {
       regWrite(REGKEY_PATH + "Tokenize", pattern, "REG_SZ");
     }
   } else {
-    pattern = arguments;
+    pattern = pluginArguments;
   }
   if (args === "") {
     throw new Error(30001, "Canceled");
@@ -615,8 +599,7 @@ function RemoveDuplicates(Text) {
     var line = lines[i];
     if (typeof dic[line] === 'undefined') {
       dic[line] = 1;
-      newlines[j] = line;
-      j++;
+      newlines.push(line);
     }
   }
   if (lasteol)
@@ -638,8 +621,7 @@ function CountDuplicates(Text) {
     var line = lines[i];
     if (typeof dic[line] === 'undefined') {
       dic[line] = 1;
-      newlines[j] = line;
-      j++;
+      newlines.push(line);
     } else {
       dic[line]++;
     }
@@ -685,7 +667,7 @@ function ReverseLines(Text) {
   var m = parseInt(lines.length / 2);
   for (var i = 0; i < m; i++) {
     var line = lines[i];
-    lines[i] = lines[lines.length - i - 1]
+    lines[i] = lines[lines.length - i - 1];
     lines[lines.length - i - 1] = line;
   }
   if (lasteol)
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
new file mode 100644
index 00000000000..511a2acfcc3
--- /dev/null
+++ b/Testing/PluginTests/PluginTests.js
@@ -0,0 +1,245 @@
+var g_cnt;
+var g_testname;
+
+var FileSys = new ActiveXObject("Scripting.FileSystemObject");
+var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
+
+function setTestName(testname) {
+  g_cnt = 0;
+  g_testname = testname;
+}
+
+function getCurrentTestName() {
+  return g_testname + g_cnt;
+}
+
+function assertTrue(value) {
+  g_cnt++;
+  if (!value) {
+    throw new Error(30001, getCurrentTestName());
+  }
+}
+
+function assertEquals(expected, actual) {
+  WScript.Echo(": " + g_testname);
+  g_cnt++;
+  if (expected !== actual) {
+    throw new Error(30001, getCurrentTestName() + "\r\nexpected: \"" + expected + "\"\r\nactual: \"" + actual + "\"");
+  }
+}
+
+function CompareMSExcelFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
+  WScript.Echo("PluginDescription: " + p.PluginDescription);
+  WScript.Echo("PluginEvent      : " + p.PluginEvent);
+  WScript.Echo("PluginFileFilters: " + p.PluginFileFilters);
+  WScript.Echo("PluginIsAutomatic: " + p.PluginIsAutomatic);
+  try {
+    WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension);
+  } catch (e) {
+  }
+
+  var changed = false;
+  var subcode = 0;
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result.txt", changed, subcode);
+}
+
+function EditorAddinTest() {
+  var asciiChars = "";
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\editor addin.sct");
+
+  for (var i = 0; i < 128; i++) {
+    asciiChars += String.fromCharCode(i);
+  }
+
+  // MakeUpper
+  setTestName("MakeUpper");
+  assertEquals("", p.MakeUpper(""));
+  assertEquals(" ~0129ABCZABCZ", p.MakeUpper(" ~0129abczABCZ"));
+  var expected = asciiChars.replace("abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+  assertEquals(expected, p.MakeUpper(asciiChars));
+
+  // MakeLower
+  setTestName("MakeLower");
+  assertEquals("", p.MakeLower(""));
+  assertEquals(" ~0129abczabcz", p.MakeLower(" ~0129abczABCZ"));
+  expected = asciiChars.replace("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz");
+  assertEquals(expected, p.MakeLower(asciiChars));
+
+  // ExecFilterCommand
+  setTestName("ExecFilterCommand");
+  p.PluginArguments = "sort";
+  assertEquals("1\r\n2\r\n", p.ExecFilterCommand("2\r\n1\r\n"));
+  p.PluginArguments = "echo a";
+  assertEquals("a \r\n", p.ExecFilterCommand(""));
+
+  // SelectColumns
+  setTestName("SelectColumns");
+  p.PluginArguments = "1";
+  assertEquals("a", p.SelectColumns("abc"));
+  assertEquals("a\r\nd", p.SelectColumns("abc\r\ndef"));
+  assertEquals("a\r\nd\r\n", p.SelectColumns("abc\r\ndef\r\n"));
+  p.PluginArguments = "3";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "1,3";
+  assertEquals("ac\r\nd", p.SelectColumns("abc\r\nde"));
+  p.PluginArguments = "1-3";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-3";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "1-";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "2-";
+  assertEquals("bc\r\nef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "3-";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "4-";
+  assertEquals("\r\n", p.SelectColumns("abc\r\ndef"));
+
+  p.PluginArguments = "-e ab";
+  assertEquals("", p.SelectColumns(""));
+  assertEquals("ab\r\n", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e \"ab|de\"";
+  assertEquals("ab\r\nde", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e ^.";
+  assertEquals("a\r\nd", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e .*";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e -i \"Ab|dE\"";
+  assertEquals("ab\r\nde", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e -i -g ab";
+  assertEquals("abAB\r\n", p.SelectColumns("abcABC\r\ndef"));
+  p.PluginArguments = "-v -e \"ab|de\"";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+
+  p.PluginArguments = "1-3 -e ab 2-3";
+  assertEquals("abcabbc\r\ndefef", p.SelectColumns("abc\r\ndef"));
+
+  // SelectLines
+  setTestName("SelectLines");
+  p.PluginArguments = "1";
+  assertEquals("", p.SelectLines(""));
+  assertEquals("aaa", p.SelectLines("aaa"));
+  p.PluginArguments = "2";
+  assertEquals("bbb", p.SelectLines("aaa\r\nbbb"));
+  p.PluginArguments = "1,2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  p.PluginArguments = "1-2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "1-";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  assertEquals("aaa\r\n" + vbCrLf + vbCrLf, p.SelectLines("aaa\r\n" + vbCrLf + vbCrLf));
+  p.PluginArguments = "-2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "4-5";
+  assertEquals("", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("", p.SelectLines("aaa\r\nbbb\r\n"));
+
+  p.PluginArguments = "-e aa";
+  assertEquals("", p.SelectLines(""));
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e -i AA";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e .*";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "^a";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "a$";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-v a$";
+  assertEquals("bbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("bbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+
+  p.PluginArguments = "1 -e c$";
+  assertEquals("aaa\r\nccc", p.SelectLines("aaa\r\nbbb\r\nccc"));
+
+  // Replace
+  setTestName("Replace");
+  p.PluginArguments = "abc def";
+  assertEquals("", p.Replace(""));
+  assertEquals("def def def def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e a.c XXX";
+  assertEquals("", p.Replace(""));
+  assertEquals("XXX def XXX def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e -i A.C XXX";
+  assertEquals("XXX def XXX def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e ^\\d+ XXX";
+  assertEquals("XXX abc\r\nXXX def", p.Replace("1000 abc\r\n1001 def"));
+  p.PluginArguments = "-e (.{3}) $1\\r\\n";
+  assertEquals("012\r\n345\r\n678\r\n9", p.Replace("0123456789"));
+  p.PluginArguments = "-e (\\d+) \\a\\b\\t\\n\\v\\f\\r\\\\$1\\1\\0";
+  assertEquals(String.fromCharCode(0x07) + String.fromCharCode(0x08) + String.fromCharCode(0x09) + String.fromCharCode(0x0A) + String.fromCharCode(0x0B) + String.fromCharCode(0x0C) + String.fromCharCode(0x0D) + "\\0123456789\\1\\0", p.Replace("0123456789"));
+
+  // ReverseColumns
+  setTestName("ReverseColumns");
+  assertEquals("", p.ReverseColumns(""));
+  assertEquals("a", p.ReverseColumns("a"));
+  assertEquals("a\r\nb", p.ReverseColumns("a\r\nb"));
+  assertEquals("ba", p.ReverseColumns("ab"));
+  assertEquals("ba\r\ndc", p.ReverseColumns("ab\r\ncd"));
+  assertEquals("cba", p.ReverseColumns("abc"));
+  assertEquals("cba\r\nfed", p.ReverseColumns("abc\r\ndef"));
+  assertEquals("dcba", p.ReverseColumns("abcd"));
+  assertEquals("dcba\r\nhgfe", p.ReverseColumns("abcd\r\nefgh"));
+
+  // ReverseLines
+  setTestName("ReverseLines");
+  assertEquals("", p.ReverseLines(""));
+  assertEquals("a", p.ReverseLines("a"));
+  assertEquals("a\r\n", p.ReverseLines("a\r\n"));
+  assertEquals("b\r\na", p.ReverseLines("a\r\nb"));
+  assertEquals("b\r\na\r\n", p.ReverseLines("a\r\nb\r\n"));
+  assertEquals("c\r\nb\r\na", p.ReverseLines("a\r\nb\r\nc"));
+  assertEquals("c\r\nb\r\na\r\n", p.ReverseLines("a\r\nb\r\nc\r\n"));
+  assertEquals("d\r\nc\r\nb\r\na", p.ReverseLines("a\r\nb\r\nc\r\nd"));
+
+  // Tokenize
+  setTestName("Tokenize");
+  p.PluginArguments = "[^\\w]+";
+  assertEquals("", p.Tokenize(""));
+  assertEquals("aaa", p.Tokenize("aaa"));
+  assertEquals("aaa\r\nabcd", p.Tokenize("aaa abcd"));
+
+  // RemoveDuplicates
+  setTestName("RemoveDuplicates");
+  assertEquals("", p.RemoveDuplicates(""));
+  assertEquals("aaa", p.RemoveDuplicates("aaa"));
+  assertEquals("aaa", p.RemoveDuplicates("aaa\r\naaa"));
+  assertEquals("aaa\r\n", p.RemoveDuplicates("aaa\r\naaa\r\n"));
+  assertEquals("aaa\r\nbbb", p.RemoveDuplicates("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.RemoveDuplicates("aaa\r\nbbb\r\n"));
+
+  // CountDuplicates
+  setTestName("CountDuplicates");
+  assertEquals("", p.CountDuplicates(""));
+  assertEquals("aaa\t1", p.CountDuplicates("aaa"));
+  assertEquals("aaa\t2\r\n", p.CountDuplicates("aaa\r\naaa"));
+  assertEquals("aaa\t2\r\n", p.CountDuplicates("aaa\r\naaa\r\n"));
+  assertEquals("aaa\t1\r\nbbb\t1\r\n", p.CountDuplicates("aaa\r\nbbb"));
+  assertEquals("aaa\t1\r\nbbb\t1\r\n", p.CountDuplicates("aaa\r\nbbb\r\n"));
+
+  // Trim
+  setTestName("Trim");
+  assertEquals("", p.Trim(""));
+  assertEquals("", p.Trim(" "));
+  assertEquals("aaa", p.Trim("aaa"));
+  assertEquals("aaa", p.Trim(" aaa"));
+  assertEquals("aaa", p.Trim("aaa  "));
+  assertEquals("aaa", p.Trim("  aaa  "));
+  assertEquals("aaa", p.Trim("\t  aaa  \t"));
+  assertEquals("aaa\r\nbbb", p.Trim(" aaa  \r\n  bbb "));
+  assertEquals("aaa\r\nbbb\r\n", p.Trim(" aaa  \r\n  bbb \r\n"));
+
+}
+
+EditorAddinTest();
+//CompareMSExcelFilesTest
+
diff --git a/Testing/PluginTests/PluginTests.vbs b/Testing/PluginTests/PluginTests.vbs
deleted file mode 100644
index d63e1877ca2..00000000000
--- a/Testing/PluginTests/PluginTests.vbs
+++ /dev/null
@@ -1,250 +0,0 @@
-Option Explicit
-
-Dim FileSys
-Dim ScriptFolder
-Dim g_cnt
-Dim g_testname
-
-Set FileSys = CreateObject("Scripting.FileSystemObject")
-ScriptFolder = FileSys.getParentFolderName(WScript.ScriptFullName)
-
-Sub SetTestName(testname)
-    g_cnt = 0
-    g_testname = testname
-End Sub
-
-Function GetCurrentTestName()
-    GetCurrentTestName = g_testname & g_cnt
-End Function
-
-Sub AssertTrue(value)
-    g_cnt = g_cnt + 1
-    If Not value Then
-        Err.Raise 30001, , GetCurrentTestName()
-    End If
-End Sub
-
-Sub AssertEquals(expected, actual)
-    g_cnt = g_cnt + 1
-    If expected <> actual Then
-	    Err.Raise 30001, , GetCurrentTestName() & vbCrLf & "expected: """ & expected & """" & vbCrLf & "actual: """ & actual & """"
-    End If
-End Sub
-
-Sub CompareMSExcelFilesTest
-    Dim p, changed, subcode
-    Set p = GetObject("script: " & ScriptFolder & "\..\..\Plugins\dlls\CompareMSExcelFiles.sct")
-    WScript.Echo "PluginDescription: " & p.PluginDescription
-    WScript.Echo "PluginEvent      : " & p.PluginEvent      
-    WScript.Echo "PluginFileFilters: " & p.PluginFileFilters
-    WScript.Echo "PluginIsAutomatic: " & p.PluginIsAutomatic
-    On Error Resume Next
-    WScript.Echo "PluginUnpackedFileExtension: " & p.PluginUnpackedFileExtension
-    On Error GoTo 0
-
-    changed = false
-    subcode = 0
-    p.UnpackFile ScriptFolder & "\..\Data\Office\excel.xls", ScriptFolder & "\result.txt", changed, subcode
-    
-End Sub
-
-Sub EditorAddinTest
-    Dim p
-    Dim i
-    Dim asciiChars
-    Dim chars
-    Set p = GetObject("script: " & ScriptFolder & "\..\..\Plugins\dlls\editor addin.sct")
-
-    For i = 0 To 127
-        asciiChars = asciiChars & Chr(i)
-    Next
-
-    ' MakeUpper
-    SetTestName "MakeUpper"
-    AssertEquals "", p.MakeUpper("")
-    AssertEquals " ~0129ABCZABCZ", p.MakeUpper(" ~0129abczABCZ")
-    AssertEquals Replace(asciiChars, "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"), p.MakeUpper(asciiChars)
-
-    ' MakeLower
-    SetTestName "MakeLower"
-    AssertEquals "", p.MakeLower("")
-    AssertEquals " ~0129abczabcz", p.MakeLower(" ~0129abczABCZ")
-    AssertEquals Replace(asciiChars, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz"), p.MakeLower(asciiChars)
-
-    ' ExecFilterCommand
-    SetTestName "ExecFilterCommand"
-    p.PluginArguments = "sort"
-    AssertEquals "1" & vbCrLf & "2" & vbCrLf, p.ExecFilterCommand("2" & vbCrLf & "1" & vbCrLf)
-    p.PluginArguments = "echo a"
-    AssertEquals "a " & vbCrLf, p.ExecFilterCommand("")
-
-    ' SelectColumns
-    SetTestName "SelectColumns"
-    p.PluginArguments = "1"
-    AssertEquals "a", p.SelectColumns("abc")
-    AssertEquals "a" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "def")
-    AssertEquals "a" & vbCrLf & "d" & vbCrLf, p.SelectColumns("abc" & vbCrLf & "def" & vbCrLf)
-    p.PluginArguments = "3"
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "1,3"
-    AssertEquals "ac" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "de")
-    p.PluginArguments = "1-3"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-3"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "1-"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "2-"
-    AssertEquals "bc" & vbCrLf & "ef", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "3-"
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "4-"
-    AssertEquals "" & vbCrLf & "", p.SelectColumns("abc" & vbCrLf & "def")
-
-    p.PluginArguments = "-e ab"
-    AssertEquals "", p.SelectColumns("")
-    AssertEquals "ab" & vbCrLf & "", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e ""ab|de"""
-    AssertEquals "ab" & vbCrLf & "de", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e ^."
-    AssertEquals "a" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e .*"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e -i ""Ab|dE"""
-    AssertEquals "ab" & vbCrLf & "de", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e -i -g ab"
-    AssertEquals "abAB" & vbCrLf & "", p.SelectColumns("abcABC" & vbCrLf & "def")
-    p.PluginArguments = "-v -e ""ab|de"""
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-
-    p.PluginArguments = "1-3 -e ab 2-3"
-    AssertEquals "abcabbc" & vbCrLf & "defef", p.SelectColumns("abc" & vbCrLf & "def")
-
-    ' SelectLines
-    SetTestName "SelectLines"
-    p.PluginArguments = "1"
-    AssertEquals "", p.SelectLines("")
-    AssertEquals "aaa", p.SelectLines("aaa")
-    p.PluginArguments = "2"
-    AssertEquals "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    p.PluginArguments = "1,2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    p.PluginArguments = "1-2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "1-"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    AssertEquals "aaa" & vbCrLf & vbCrLf & vbCrLf, p.SelectLines("aaa" & vbCrLf & vbCrLf & vbCrLf)
-    p.PluginArguments = "-2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "4-5"
-    AssertEquals "", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "", p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    p.PluginArguments = "-e aa"
-    AssertEquals "", p.SelectLines("")
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-e -i AA"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-e .*"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "^a"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "a$"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-v a$"
-    AssertEquals "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    p.PluginArguments = "1 -e c$"
-    AssertEquals "aaa" & vbCrLf & "ccc", p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf & "ccc")
-
-    ' Replace
-    SetTestName "Replace"
-    p.PluginArguments = "abc def"
-    AssertEquals "", p.Replace("")
-    AssertEquals "def def def def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e a.c XXX"
-    AssertEquals "", p.Replace("")
-    AssertEquals "XXX def XXX def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e -i A.C XXX"
-    AssertEquals "XXX def XXX def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e ^\d+ XXX"
-    AssertEquals "XXX abc" & vbCrLf & "XXX def", p.Replace("1000 abc" & vbCrLf & "1001 def")
-    p.PluginArguments = "-e (.{3}) $1\r\n"
-    AssertEquals "012" & vbCrLf & "345" & vbCrLf & "678" & vbCrLf & "9", p.Replace("0123456789")
-    p.PluginArguments = "-e (\d+) \a\b\t\n\v\f\r\\$1\1\0"
-    AssertEquals Chr(&H07) & Chr(&H08) & Chr(&H09) & Chr(&H0A) & Chr(&H0B) & Chr(&H0C) & Chr(&H0D) & "\0123456789\1\0", p.Replace("0123456789")
-
-    ' ReverseColumns
-    SetTestName "ReverseColumns"
-    AssertEquals "", p.ReverseColumns("")
-    AssertEquals "a", p.ReverseColumns("a")
-    AssertEquals "a" & vbCrLf & "b", p.ReverseColumns("a" & vbCrLf & "b")
-    AssertEquals "ba", p.ReverseColumns("ab")
-    AssertEquals "ba" & vbCrLf & "dc", p.ReverseColumns("ab" & vbCrLf & "cd")
-    AssertEquals "cba", p.ReverseColumns("abc")
-    AssertEquals "cba" & vbCrLf & "fed", p.ReverseColumns("abc" & vbCrLf & "def")
-    AssertEquals "dcba", p.ReverseColumns("abcd")
-    AssertEquals "dcba" & vbCrLf & "hgfe", p.ReverseColumns("abcd" & vbCrLf & "efgh")
-
-    ' ReverseLines
-    SetTestName "ReverseLines"
-    AssertEquals "", p.ReverseLines("")
-    AssertEquals "a", p.ReverseLines("a")
-    AssertEquals "a" & vbCrLf, p.ReverseLines("a" & vbCrLf)
-    AssertEquals "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b")
-    AssertEquals "b" & vbCrLf & "a" & vbCrLf, p.ReverseLines("a" & vbCrLf & "b" & vbCrLf)
-    AssertEquals "c" & vbCrLf & "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c")
-    AssertEquals "c" & vbCrLf & "b" & vbCrLf & "a" & vbCrLf, p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c" & vbCrLf)
-    AssertEquals "d" & vbCrLf & "c" & vbCrLf & "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c" & vbCrLf & "d")
-
-    ' Tokenize
-    SetTestName "Tokenize"
-    p.PluginArguments = "[^\w]+"
-    AssertEquals "", p.Tokenize("")
-    AssertEquals "aaa", p.Tokenize("aaa")
-    AssertEquals "aaa" & vbCrLf & "abcd", p.Tokenize("aaa abcd")
-
-    ' RemoveDuplicates
-    SetTestName "RemoveDuplicates"
-    AssertEquals "", p.RemoveDuplicates("")
-    AssertEquals "aaa", p.RemoveDuplicates("aaa")
-    AssertEquals "aaa", p.RemoveDuplicates("aaa" & vbCrLf & "aaa")
-    AssertEquals "aaa" & vbCrLf, p.RemoveDuplicates("aaa" & vbCrLf & "aaa" & vbCrLf)
-    AssertEquals "aaa" & vbCrLf & "bbb", p.RemoveDuplicates("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.RemoveDuplicates("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    ' CountDuplicates
-    SetTestName "CountDuplicates"
-    AssertEquals "", p.CountDuplicates("")
-    AssertEquals "aaa" & vbTab & "1", p.CountDuplicates("aaa")
-    AssertEquals "aaa" & vbTab & "2" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "aaa")
-    AssertEquals "aaa" & vbTab & "2" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "aaa" & vbCrLf)
-    AssertEquals "aaa" & vbTab & "1" & vbCrLf & "bbb" & vbTab & "1" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbTab & "1" & vbCrLf & "bbb" & vbTab & "1" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    ' Trim
-    SetTestName "Trim"
-    AssertEquals "", p.Trim("")
-    AssertEquals "", p.Trim(" ")
-    AssertEquals "aaa", p.Trim("aaa")
-    AssertEquals "aaa", p.Trim(" aaa")
-    AssertEquals "aaa", p.Trim("aaa  ")
-    AssertEquals "aaa", p.Trim("  aaa  ")
-    AssertEquals "aaa", p.Trim(vbTab & "  aaa  " & vbTab)
-    AssertEquals "aaa" & vbCrLf & "bbb", p.Trim(" aaa  " & vbCrLf & "  bbb ")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.Trim(" aaa  " & vbCrLf & "  bbb " & vbCrLf)
-
-End Sub
-
-EditorAddinTest
-'CompareMSExcelFilesTest
-

From 9c04c14481cba1312c7e393ef82a9873b94f38ec Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 31 Jan 2024 08:28:20 +0900
Subject: [PATCH 18/58] WIP

---
 Plugins/dlls/editor addin.sct      | 48 +++++++++++++++++-------------
 Testing/PluginTests/PluginTests.js | 15 ++++++----
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index cf3c09697cb..0b229c8ece2 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -248,10 +248,13 @@ function ParseSelectColumnsLinesArguments(args) {
   for (var i = 0; i < argAry.length; i++) {
     var isOption = false;
     if (argAry[i].length >= 2) {
-      switch (argAry[i].charAt[0]) {
-      case "-", "/":
-        switch (argAry[i].charAt[1]) {
-        case "e", "i", "g":
+      switch (argAry[i].charAt(0)) {
+      case "-":
+      case "/":
+        switch (argAry[i].charAt(1)) {
+        case "e":
+        case "i":
+        case "g":
           isRegExp = true;
           isOption = true;
           if (argAry[i].indexOf("g") >= 0) {
@@ -291,9 +294,11 @@ function ParseReplaceArguments(args) {
     isOption = false;
     if (argAry[i].length >= 2) {
       switch (argAry[i].charAt(0)) {
-      case "-", "/":
+      case "-":
+      case "/":
         switch (argAry[i].charAt(1)) {
-        case "e", "i":
+        case "e":
+        case "i":
           isOption = true;
           regex = true;
           if (argAry[i].indexOf("i") >= 0) {
@@ -308,7 +313,7 @@ function ParseReplaceArguments(args) {
       patterns.push(argAry[i]);
     }
   }
-  return { "patterns": pattern, "regex": regex, "ignoreCase": ignoreCase };
+  return { "patterns": patterns, "regex": regex, "ignoreCase": ignoreCase };
 }
 
 function Unescape(text) {
@@ -324,7 +329,7 @@ function Unescape(text) {
         ch = text.charAt(i);
         switch (ch) {
         case "a":
-          result += "\a";
+          result += String.fromCharCode(0x07);
           break;
         case "b":
           result += "\b";
@@ -336,7 +341,7 @@ function Unescape(text) {
           result += "\n";
           break;
         case "v":
-          result += "\v";
+          result += String.fromCharCode(0x0b);
           break;
         case "f":
           result += "\f";
@@ -361,6 +366,7 @@ function Unescape(text) {
     }
     i++;
   }
+  return result;
 }
 
 function PluginOnEvent(eventType, obj) {
@@ -446,11 +452,13 @@ function SelectColumns(Text) {
       } else {
         if (!invert) {
           var matches = lines[i].match(rangesOrRegExps[j]);
-          for (var k = 0; k < matches.length; k++) {
-            line += matches[k];
+          if (matches) {
+            for (var k = 0; k < matches.length; k++) {
+              line += matches[k];
+            }
           }
         } else {
-          line += replacei(rangesOrRegExps[j], lines[i], "", false);
+          line += lines[i].replace(rangesOrRegExps[j], "");
         }
       }
     }
@@ -492,7 +500,7 @@ function SelectLines(Text) {
       }
     } else {
       for (var j = 0; j < lines.length; j++) {
-        var matched = (rangesOrRegExps[i].match(lines[j]) !== null);
+        var matched = (lines[j].match(rangesOrRegExps[i]) !== null);
         if (invert) { matched = !matched; }
         if (matched) {
           newlines.push(lines[j]);
@@ -504,7 +512,7 @@ function SelectLines(Text) {
     if (lines[lines.length - 1] === "") {
       if (newlines.length > 0) {
         if (newlines[newlines.length - 1] !== "") {
-          newlines[l].push("");
+          newlines.push("");
         }
       }
     }
@@ -546,19 +554,19 @@ function ReplaceText(Text) {
   var ignoreCase = parseResult.ignoreCase;
   if (regex) {
     for (var i = 0; i < patterns.length; i += 2) {
-      var re = new RegExp(patterns[i],ignoreCase ?  "gmi" : "gm");
+      var re = new RegExp(patterns[i], ignoreCase ? "gmi" : "gm");
       if (i + 1 < patterns.length) {
-        result = result.replace(re, Unescape(patterns(i + 1)));
+        result = result.replace(re, Unescape(patterns[i + 1]));
       } else {
-        result = result.relace(re, result, "");
+        result = result.replace(re, result, "");
       }
     }
   } else {
     for (var i = 0; i < patterns.length; i += 2) {
       if (i + 1 < patterns.length) {
-        result = replacei(patterns(i), patterns(i + 1));
+        result = replacei(result, patterns[i], patterns[i + 1]);
       } else {
-        result = replacei(patterns(i), "");
+        result = replacei(result, patterns[i], "");
       }
     }
   }
@@ -577,7 +585,7 @@ function Tokenize(Text) {
   } else {
     pattern = pluginArguments;
   }
-  if (args === "") {
+  if (pattern === "") {
     throw new Error(30001, "Canceled");
   }
   var re = new RegExp(pattern, "gi");
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 511a2acfcc3..52a40b34913 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -4,6 +4,9 @@ var g_testname;
 var FileSys = new ActiveXObject("Scripting.FileSystemObject");
 var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
 
+var MergeApp = {
+  "Log": function (level, text) { WScript.Echo(text); }
+};
 function setTestName(testname) {
   g_cnt = 0;
   g_testname = testname;
@@ -21,7 +24,6 @@ function assertTrue(value) {
 }
 
 function assertEquals(expected, actual) {
-  WScript.Echo(": " + g_testname);
   g_cnt++;
   if (expected !== actual) {
     throw new Error(30001, getCurrentTestName() + "\r\nexpected: \"" + expected + "\"\r\nactual: \"" + actual + "\"");
@@ -52,6 +54,8 @@ function EditorAddinTest() {
     asciiChars += String.fromCharCode(i);
   }
 
+  p.PluginOnEvent(0, MergeApp);
+
   // MakeUpper
   setTestName("MakeUpper");
   assertEquals("", p.MakeUpper(""));
@@ -130,7 +134,7 @@ function EditorAddinTest() {
   p.PluginArguments = "1-";
   assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
   assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
-  assertEquals("aaa\r\n" + vbCrLf + vbCrLf, p.SelectLines("aaa\r\n" + vbCrLf + vbCrLf));
+  assertEquals("aaa\r\n\r\n\r\n", p.SelectLines("aaa\r\n\r\n\r\n"));
   p.PluginArguments = "-2";
   assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
   assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
@@ -148,13 +152,13 @@ function EditorAddinTest() {
   p.PluginArguments = "-e .*";
   assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
   assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
-  p.PluginArguments = "^a";
+  p.PluginArguments = "-e ^a";
   assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
   assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
-  p.PluginArguments = "a$";
+  p.PluginArguments = "-e a$";
   assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
   assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
-  p.PluginArguments = "-v a$";
+  p.PluginArguments = "-v -e a$";
   assertEquals("bbb", p.SelectLines("aaa\r\nbbb"));
   assertEquals("bbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
 
@@ -238,6 +242,7 @@ function EditorAddinTest() {
   assertEquals("aaa\r\nbbb", p.Trim(" aaa  \r\n  bbb "));
   assertEquals("aaa\r\nbbb\r\n", p.Trim(" aaa  \r\n  bbb \r\n"));
 
+  p.PluginOnEvent(1, MergeApp);
 }
 
 EditorAddinTest();

From db21cb4c053f912c892dffa5ee1cf611a1ae9d2e Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 1 Feb 2024 07:48:48 +0900
Subject: [PATCH 19/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      |  33 +-
 Plugins/dlls/CompareMSPowerPointFiles.sct | 760 ++++++++++------------
 Plugins/dlls/CompareMSWordFiles.sct       | 760 ++++++++++------------
 3 files changed, 727 insertions(+), 826 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 920a41f253c..914a81bd855 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -50,10 +50,10 @@
 */
 
 var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
 var pbGroup = 6;
-var MsgCannotGetMacros = "${Cannot get Macros.\n" + 
-  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\n" + 
-  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\n}";
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");
 var wsh = new ActiveXObject("WScript.Shell");
@@ -75,10 +75,6 @@ function regWrite(Key, Value, TypeNm) {
   mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
 }
 
-function get_PluginEvent() {
-  return "BUFFER_PREDIFF";
-}
-
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
@@ -215,7 +211,7 @@ function getModuleExtension(cmp) {
 function sleep(sec) {
   if (sec == 0)
     return;
-  wsh.Run("ping.exe localhost -n " + sec, 0, true);
+  wsh.run("ping.exe localhost -n " + sec, 0, true);
 }
 
 function saveRangeAsImage(sht, rng, filename) {
@@ -416,7 +412,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   if (fso.GetExtensionName(fileSrc2) == "lnk") {
     fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
     if (!fso.FileExists(fileSrc2)) {
-      throw new Error(30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found");
+      throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     }
   }
   var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, true);
@@ -458,7 +454,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
  
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(wbk)) {
-      fo.WriteLine(Translate(MsgCannotGetMacros));
+      fo.WriteLine(translate(MsgCannotGetMacros));
     }
     for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
       fo.WriteLine("[CodeModule." + cmp.Name + "]");
@@ -506,10 +502,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   xl.ErrorCheckingOptions.BackgroundChecking = false;
 
   var fileSrc2 = fileSrc;
-  if (fso.GetExtensionName(fileSrc2) == "lnk") {
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
     fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
     if (!fso.FileExists(fileSrc2)) {
-      throw Error(30001, "CompareMSExcelFiles.sct", fileSrc + ": Target file '" + fileSrc2 + "' not found");
+      throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     }
   }
   var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, true);
@@ -571,10 +567,9 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(wbk)) {
       fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
-      fo.WriteLine(Translate(MsgCannotGetMacros));
+      fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     }
- 
     for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
       cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
     }
@@ -599,10 +594,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
 }
 
 function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
-  return false
+  return false;
 }
 
-function Translate(text) {
+function translate(text) {
   var re = /\${([^}]+)}/g;
   var matches;
   while ((matches = re.exec(text)) != null) {
@@ -615,20 +610,20 @@ function ShowSettingsDialog() {
   var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
   var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
   var tfile = fso.CreateTextFile(tname, true, true);
-  tfile.Write(Translate(getResource("dialog1")));
+  tfile.Write(translate(getResource("dialog1")));
   tfile.Close();
   exportSettingsToXMLFile(xmlfile);
   var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
   if (!fso.FileExists(mshta)) {
     mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
   }
-  Run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
   importSettingsFromXMLFile(xmlfile);
   fso.DeleteFile(tname);
   fso.DeleteFile(xmlfile);
 }
 
-function Run(sh, cmd) {
+function run(sh, cmd) {
   sh.Run(cmd, 1, true);
 }
 
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index b2009d16191..07a51188490 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -1,418 +1,370 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS PowerPoint files.
-'    Copyright (C) 2016-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSPowerPointFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(prs)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = prs.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function writeShape(fo, shp)
-	Dim shp2, shpType, r, c
-	On Error Resume Next
-	shpType = -1
-	shpType = shp.Type
-	fo.Write shp.Name & ": "
-	If shp.HasTable Then
-		For r = 1 To shp.Table.Rows.Count
-			For c = 1 To shp.Table.Columns.Count
-				fo.Write "(" & r & ", " & c & "): "
-				writeShape fo, shp.Table.Cell(r, c).Shape
-			Next
-		Next
-	ElseIf shpType = 6 Then 'msoGroup = 6
-		For Each shp2 In shp.GroupItems
-		    writeShape fo, shp2
-		Next
-	ElseIf shp.HasTextFrame Then
-		fo.WriteLine shp.TextFrame.TextRange.Characters.Text
-	Else
-		fo.WriteLine ""
-	End If
-End Function
-
-Function writeTextsInShapes(fo, shps)
-	Dim shp
-	On Error Resume Next
-	For Each shp In shps
-		writeShape fo, shp
-	Next
-	On Error GoTo 0
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function saveSlideAsImage(sld, filename)
-        sld.Export filename, "PNG"
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS PowerPoint files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.ppt(\..*)?$;\.pptx(\..*)?$;\.pptm(\..*)?$;\.ppa(\..*)?$;\.ppam(\..*)?$;\.potx(\..*)?$;\.potm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-PowerPoint;MenuCaption=MS-PowerPoint"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim pp
-	Dim prs
-	Dim sld
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set pp = CreateObject("PowerPoint.Application")
-	pp.Visible = True
-	pp.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSPowerPointFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set prs = pp.Presentations.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, prs.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	For Each sld In prs.Slides
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & sld.Name & "]"
-			writeTextsInShapes fo, sld.Shapes
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareTextsInNotesPage", True) Then
-			fo.WriteLine "[" & sld.Name & ".NotesPage]"
-			writeTextsInShapes fo, sld.NotesPage.Shapes
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(prs) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In prs.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set sld = Nothing
-	prs.Close
-	Set prs = Nothing
-	pp.Quit
-	Set pp = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim pp
-	Dim prs
-	Dim sld
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set pp = CreateObject("PowerPoint.Application")
-	pp.Visible = True
-	pp.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSPowerPointFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set prs = pp.Presentations.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, prs.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	For Each sld In prs.Slides
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name & ".txt"), True, True)
-			writeTextsInShapes fo, sld.Shapes
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareTextsInNotesPage", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name & "_NotesPage.txt"), True, True)
-			writeTextsInShapes fo, sld.NotesPage.Shapes
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareSlideAsImage", True) Then
-			saveSlideAsImage sld, fso.BuildPath(folderDst, sld.Name & ".png")
-		End If
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(prs) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In prs.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set sld = Nothing
-	prs.Close
-	Set prs = Nothing
-	pp.Quit
-	Set pp = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS PowerPoint files.
+    Copyright (C) 2016-2024 Takashi Sawanaka
 
-<script language="JScript">
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 var REGKEY_PATH = "Plugins\\CompareMSPowerPointFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" +
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" +
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(wbk) {
+  try {
+    return (wbk.VBProject.VBComponents.Count > 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+      fo.WriteLine(o.Name + ": " + o.Value);
+    }
+  } catch (e) {}
+}
+
+function writeShape(fo, shp) {
+  var shpType = -1;
+  try {
+    shpType = shp.Type;
+    fo.Write(shp.Name + ": ");
+    if (shp.HasTable) {
+      for (var r = 1; r <= shp.Table.Rows.Count; r++) {
+        for (var c = 1; c <= shp.Table.Columns.Count; c++) {
+          fo.Write("(" + r + ", " + c + "): ");
+          writeShape(fo, shp.Table.Cell(r, c).Shape);
+        }
+      }
+    } else if (shpType === 6) { //msoGroup = 6
+      for (var it = new Enumerator(shp.GroupItems), shp2 = it.item(); !it.atEnd(); it.moveNext(), shp2 = it.item()) {
+        writeShape(fo, shp2);
+      }
+    } else if (shp.HasTextFrame) {
+      fo.WriteLine(shp.TextFrame.TextRange.Characters.Text);
+    } else {
+      fo.WriteLine("");
+    }
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, shps) {
+  try {
+    for (var it = new Enumerator(shps), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      writeShape(fo, shp);
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function saveSlideAsImage(sld, filename) {
+  sld.Export(filename, "PNG");
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS PowerPoint files";
+}
+
+function get_PluginFileFilters() {
+  return "\\.ppt(\\..*)?$;\\.pptx(\\..*)?$;\\.pptm(\\..*)?$;\\.ppa(\\..*)?$;\\.ppam(\\..*)?$;\\.potx(\\..*)?$;\\.potm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-PowerPoint;MenuCaption=MS-PowerPoint";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+
+  var pp = new ActiveXObject("PowerPoint.Application");
+  pp.Visible = true;
+  pp.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var prs = pp.Presentations.Open(fileSrc2);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, prs.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+ 
+  for (var it = new Enumerator(prs.Slides), sld = it.item(); !it.atEnd(); it.moveNext(), sld = it.item()) {
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + sld.Name + "]");
+      writeTextsInShapes(fo, sld.Shapes);
+      fo.WriteLine("");
+    }
+    if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
+      fo.WriteLine("[" + sld.Name + ".NotesPage]");
+      writeTextsInShapes(fo, sld.NotesPage.Shapes);
+      fo.WriteLine("");
+    }
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(prs)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    }
+    for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      fo.WriteLine("[CodeModule." + cmp.Name + "]");
+      if (cmp.CodeModule.CountOfLines > 0) {
+        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+      }
+      fo.WriteLine("");
+    }
+  }
+
+  sld = null;
+  prs.Close();
+  prs = null;
+  pp.Quit();
+  pp = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+
+  var pp = new ActiveXObject("PowerPoint.Application");
+  pp.Visible = true;
+  pp.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var prs = pp.Presentations.Open(fileSrc2);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, prs.BuiltinDocumentProperties);
+    fo.Close();
+  }
+ 
+  for (var it = new Enumerator(prs.Slides), sld = it.item(); !it.atEnd(); it.moveNext(), sld = it.item()) {
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + ".txt"), true, true);
+      writeTextsInShapes(fo, sld.Shapes);
+      fo.Close();
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + "_NotesPage.txt"), true, true);
+      writeTextsInShapes(fo, sld.NotesPage.Shapes);
+      fo.Close();
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareSlideAsImage", true)) {
+      saveSlideAsImage(sld, fso.BuildPath(folderDst, sld.Name + ".png"));
+    }
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(prs)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+    }
+    
+    for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    }
+  }
+
+  sld = null;
+  prs.Close();
+  prs = null
+  pp.Quit();
+  pp = null;
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"CompareDocumentProperties" : false,
-		"CompareSlideAsImage" : true,
-		"CompareTextsInShapes" : true,
-		"CompareTextsInNotesPage" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "CompareDocumentProperties" : false,
+    "CompareSlideAsImage" : true,
+    "CompareTextsInShapes" : true,
+    "CompareTextsInNotesPage" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index c48ed02ad06..e8776e206a6 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -1,416 +1,370 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Word files.
-'    Copyright (C) 2008-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSWordFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(doc)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = doc.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function writeBookmarks(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Start
-	Next
-End Function
-
-Sub ungroupShapes(doc)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = doc.Shapes.Count
-        For Each shp In doc.Shapes
-            shp.ungroup
-        Next
-    Loop While cnt <> doc.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, doc)
-	Dim shp
-	On Error Resume Next
-	For Each shp In doc.Shapes
-		fo.WriteLine shp.Name & ": " & shp.TextFrame.TextRange.Text
-	Next
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Word files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.doc(\..*)?$;\.dot(\..*)?$;\.docx(\..*)?$;\.docm(\..*)?$;\.dotx(\..*)?$;\.dotm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Word;MenuCaption=MS-Word"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim wd 
-	Dim doc
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set wd = CreateObject("Word.Application")
-	wd.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSWordFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = wd.Documents.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, doc.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareBookmarks", True) Then
-		fo.WriteLine "[Bookmarks]"
-		writeBookmarks fo, doc.Bookmarks
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareTextContents", True) Then
-		fo.WriteLine "[Text Contents]"
-		fo.Write doc.Content.Text
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-		fo.WriteLine "[Shapes]"
-		ungroupShapes doc
-		writeTextsInShapes fo, doc
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In doc.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	doc.Saved = True
-	doc.Close
-	Set doc = Nothing
-	wd.Quit
-	Set wd = Nothing
-
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim wd
-	Dim doc
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set wd = CreateObject("Word.Application")
-	wd.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSWordFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = wd.Documents.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, doc.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareBookmarks", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)Bookmarks.txt"), True, True)
-		writeBookmarks fo, doc.Bookmarks
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareTextContents", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Document.txt"), True, True)
-		fo.Write doc.Content.Text
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), True, True)
-		ungroupShapes doc
-		writeTextsInShapes fo, doc
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareDocumentsAsHTML", True) Then
-		doc.SaveAs fso.BuildPath(folderDst, "Document.htm"), 10 ' wdFormatFilteredHTML
-	End If
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In doc.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	doc.Close
-	Set doc = Nothing
-	wd.Quit
-	Set wd = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Word files.
+    Copyright (C) 2008-2024 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSWordFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + _
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + _
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(doc) {
+  try {
+    return (doc.VBProject.VBComponents.Count > 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+      fo.WriteLine(o.Name + ": " + o.Value);
+    }
+  } catch (e) {}
+}
+
+function writeBookmarks(fo, items) {
+  try {
+    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+      fo.WriteLine(o.Name + ": " + o.Start);
+    }
+  } catch (e) {}
+}
+
+function ungroupShapes(sht) {
+  try {
+    var cnt;
+    do {
+      cnt = sht.Shapes.Count;
+      for (var it = new Enumerator(doc.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
+        if (shp.Type == pbGroup) {
+          shp.Ungroup();
+        }
+      }
+    } while (cnt != doc.Shapes.Count);
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, doc) {
+  try {
+    for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      fo.WriteLine(shp.Name + ": " + shp.TextFrame.TextRange.Text);
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Word files";
+}
+
+function get_PluginFileFilters() {
+  return  "\\.doc(\\..*)?$;\\.dot(\\..*)?$;\\.docx(\\..*)?$;\\.docm(\\..*)?$;\\.dotx(\\..*)?$;\\.dotm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Word;MenuCaption=MS-Word";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+
+  var wd = new ActiveXObject("Word.Application");
+  wd.DisplayAlerts = false
+
+  fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) = "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = wd.Documents.Open(fileSrc2);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, doc.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareBookmarks", true)) {
+    fo.WriteLine("[Bookmarks]");
+    writeBookmarks(fo, doc.Bookmarks);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextContents", true)) {
+    fo.WriteLine("[Text Contents]");
+    fo.Write(doc.Content.Text);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+    fo.WriteLine("[Shapes]");
+    ungroupShapes(doc);
+    writeTextsInShapes(fo, doc);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    }
+    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    }
+  }
+
+  doc.Saved = true;
+  doc.Close();
+  doc = null;
+  wd.Quit();
+  wd = null;
+
+  fo.Close();
+  fo = null
+
+  pbChanged = true;
+  pSubcode = 0;
+  
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+
+  var wd = new ActiveXObject("Word.Application")
+  wd.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = wd.Documents.Open(fileSrc2);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, doc.BuiltinDocumentProperties);
+    fo.Close();
+  }
+
+  if (regRead(REGKEY_PATH + "CompareBookmarks", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)Bookmarks.txt"), true, true);
+    writeBookmarks(fo, doc.Bookmarks);
+    fo.Close();
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextContents", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Document.txt"), true, true);
+    fo.Write(doc.Content.Text);
+    fo.Close();
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), true, true)
+    ungroupShapes(doc);
+    writeTextsInShapes(fo, doc);
+    fo.Close();
+  }
+
+  if (regRead(REGKEY_PATH + "CompareDocumentsAsHTML", true)) {
+    doc.SaveAs(fso.BuildPath(folderDst, "Document.htm"), 10/*wdFormatFilteredHTML*/);
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+    }
+    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    }
+  }
+
+  doc.Close();
+  doc = null;
+  wd.Quit();
+  wd = null;
+  fo = null;
+
+  pbChanged = true
+  pSubcode = 0
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"CompareDocumentProperties" : false,
-		"CompareBookmarks" : true,
-		"CompareTextContents" : true,
-		"CompareDocumentsAsHTML" : true,
-		"CompareTextsInShapes" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "CompareDocumentProperties" : false,
+    "CompareBookmarks" : true,
+    "CompareTextContents" : true,
+    "CompareDocumentsAsHTML" : true,
+    "CompareTextsInShapes" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -458,7 +412,7 @@ function importSettingsFromXMLFile(filepath)
         ts.Close();
         var nodes = doc.documentElement.childNodes;
         for (var i = 0; i < nodes.length; i++) {
-        	regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+          regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
         }
         return settings;
       }

From 719bb5e9f02ddef2385bc8a8f410a9e4c9f7a8cd Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 1 Feb 2024 21:02:48 +0900
Subject: [PATCH 20/58] WIP

---
 Plugins/dlls/ApplyPatch.sct        | 981 +++++++++++++----------------
 Plugins/dlls/PrediffLineFilter.sct |   8 +-
 2 files changed, 458 insertions(+), 531 deletions(-)

diff --git a/Plugins/dlls/ApplyPatch.sct b/Plugins/dlls/ApplyPatch.sct
index edbecff5d1d..eb0d29a7c80 100644
--- a/Plugins/dlls/ApplyPatch.sct
+++ b/Plugins/dlls/ApplyPatch.sct
@@ -1,537 +1,464 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will apply selected patch to specified file or folder using GNU patch.
-'    Copyright (C) 2015-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const REGKEY_PATH = "HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge"
-Const PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim PrevFileName: PrevFileName = ""
-Dim mergeApp
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function Fmt(formatString, args)
-    Dim i
-    For i = 0 To UBound(args)
-        formatString = Replace(formatString, "%" & (i + 1), args(i))
-    Next
-    Fmt = formatString
-End Function
-
-Function get_PluginEvent()
-    get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-    get_PluginDescription = "Apply patch using GNU patch"
-End Function
-
-Function get_PluginFileFilters()
-    get_PluginFileFilters = "\.diff$;\.patch$"
-End Function
-
-Function get_PluginIsAutomatic()
-    get_PluginIsAutomatic = False
-End Function
-
-Function get_PluginExtendedProperties()
-    get_PluginExtendedProperties = "MenuCaption=Apply Patch..."
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-    Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-    Dim filePatched, cmdLine, msg
-
-    UnpackFile = False
-
-    If Not IsPatchFile(fileSrc) Then
-        ' FIXME:
-        PrevFileName = fileSrc
-        fso.CopyFile fileSrc, fileDst
-        pbChanged = True
-        pSubcode = 1
-        UnpackFile = True
-        Exit Function
-    End If
-
-    If PrevFileName <> "" Then
-        filePatched = PrevFileName
-    Else
-        filePatched = regRead("Files\Left/Item_0", "")
-    End If
-    If IsPatchFile(filePatched) Then
-        filePatched = regRead("Files\Right/Item_0", "")
-    End If
-
-    msg = Fmt(Translate("${Enter the name of the file to which the patch '%1' will be applied}"), Array(fso.GetFileName(fileSrc)))
-    Do While True
-        filePatched = InputBox(msg, PLUGIN_NAME, filePatched)
-        If filePatched = "" Then
-            Exit Function
-        End If
-        If fso.FileExists(filePatched) Then Exit Do
-        MsgBox Fmt(Translate("${File '%1' does not exist}"), Array(filePatched)), vbExclamation
-    Loop
-
-    cmdLine = "type """ & fileSrc & """ | patch --binary $FILE"
-    msg = Translate("${Enter the command line arguments for patch command}")
-    cmdLine = InputBox(msg, PLUGIN_NAME, cmdLine)
-    If cmdLine = "" Then Exit Function
-    cmdLine = Replace(cmdLine, "$FILE", fileDst)
-        
-    fso.CopyFile filePatched, fileDst
-
-    Run wsh, "cmd.exe /s /c ""set PATH=" & GetPatchExeFolder() & ";%PATH% & " & cmdLine & " & pause"""
-
-    pbChanged = True
-    pSubcode = 0
-    UnpackFile = True
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-    If pSubcode <> 0 Then
-        ' FIXME:
-        fso.CopyFile fileSrc, fileDst
-        pbChanged = True
-        PackFile = True
-        Exit Function
-    End If
-    PackFile = False
-End Function
-
-Function IsFolder(file)
-    IsFolder = IsPatchFile(file)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-    Dim dirPatched, cmdLine, msg, files, stripCount
-
-    UnpackFolder = False
-
-    If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-    dirPatched = regRead("Files\Left/Item_0", "")
-    If Not fso.FolderExists(dirPatched) Then
-        dirPatched = regRead("Files\Right/Item_0", "")
-    End If
-
-    msg = Fmt(Translate("${Enter the name of the folder to which the patch '%1' will be applied}"), Array(fso.GetFileName(fileSrc)))
-    Do While True
-        dirPatched = InputBox(msg, PLUGIN_NAME, dirPatched)
-        If dirPatched = "" Then
-            fso.CopyFile fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) & ".txt"
-            Exit Function
-        End If
-        If fso.FolderExists(dirPatched) Then Exit Do
-        MsgBox Fmt(Translate("${Folder '%1' does not exist}"), dirPatched), vbExclamation
-    Loop
-
-    files = GetFileNamesInPatch(fileSrc)
-    stripCount = GuessStripCount(files, dirPatched)
-
-    cmdLine = "type """ & fileSrc & """ | patch --binary -p" & stripCount
-    msg = Translate("${Enter the command line arguments for patch command}")
-    cmdLine = InputBox(msg, PLUGIN_NAME, cmdLine)
-    If cmdLine = "" Then
-        fso.CopyFile fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) & ".txt"
-        Exit Function
-    End If
-        
-    stripCount = GetStripCountFromCmdLine(cmdLine)
-    If stripCount = 0 Then
-        If HasAbsolutePathInList(files) Then
-            msg = Translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}")
-            MsgBox msg, vbExclamation
-            Exit Function
-        End If
-    End If
-
-    CopyOriginalFiles dirPatched, folderDst, files, stripCount
-
-    Run wsh, "cmd.exe /s /c ""set PATH=" & GetPatchExeFolder() & ";%PATH% & cd /d " & folderDst & " & " & cmdLine & " & pause"""
-
-    pbChanged = True
-    pSubcode = 0
-    UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-    PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-    sh.Run cmd, 1, True
-End Sub
-
-Function GetPatchExeFolder()
-    Dim winMergeExePath
-    On Error Resume Next
-    winMergeExePath = "C:\Program Files\WinMerge\WinMergeU.exe"
-    winMergeExePath = wsh.RegRead(REGKEY_PATH & "\Executable")
-    GetPatchExeFolder = fso.BuildPath(fso.GetParentFolderName(winMergeExePath), "Commands\msys2\usr\bin")
-End Function
-
-Function SafeUBound(ary)
-    On Error Resume Next
-    SafeUBound = -1
-    SafeUBound = UBound(ary)
-End Function
-
-Function IIf(cond, t, f)
-    If cond Then IIf = t Else IIf = f
-End Function
-
-Function IsPatchFile(path)
-    Dim patterns, pattern, re
-    patterns = Split(get_PluginFileFilters(), ";")
-    For Each pattern In patterns
-        Set re = CreateObject("VBScript.RegExp")
-        re.Pattern = pattern
-        re.IgnoreCase = True
-        If re.Test(path) Then
-            IsPatchFile = True
-            Exit Function
-        End If
-    Next
-    IsPatchFile = False
-End Function
-
-Function IsWindowsTextFormat(path)
-    IsWindowsTextFormat = (InStr(ReadAllText(path), vbCrLf) > 0)
-End Function
-
-Function IsAbsolutePath(path)
-    IsAbsolutePath = (Mid(path, 2, 1) = ":" Or Left(path, 1) = "/" Or Left(path, 1) = "\")
-End Function
-
-Function HasAbsolutePathInList(files)
-    Dim i
-    For i = 0 To SafeUBound(files)
-        If IsAbsolutePath(files(i)(0)) Then
-            HasAbsolutePathInList = True
-            Exit Function
-        End If
-    Next
-    HasAbsolutePathInList = False
-End Function
-
-Function IsNullDevice(path)
-    IsNullDevice = (path = "/dev/null" Or UCase(path) = "NUL")
-End Function
-
-Function StripDir(fileName, stripCount)
-    Dim i, pos, posNext1, posNext2
-    If stripCount = -1 Then
-        StripDir = fso.GetFileName(fileName)
-        Exit Function
-    ElseIf stripCount = 0 Then
-        StripDir = fileName
-        Exit Function
-    End If
-    pos = 1
-    For i = 0 To stripCount - 1
-        posNext1 = InStr(pos, fileName, "/")
-        posNext2 = InStr(pos, fileName, "\")
-        If posNext1 > 0 And (posNext1 < posNext2 Or posNext2 = 0) Then
-            pos = posNext1 + 1
-        ElseIf posNext2 > 0 And (posNext2 < posNext1 Or posNext1 = 0) Then
-            pos = posNext2 + 1
-        Else
-            pos = 0
-            Exit For
-        End If
-    Next
-    If pos = 0 Then
-        StripDir = ""
-    Else
-        StripDir = Mid(fileName, pos)
-    End If
-End Function
-
-Function MakePatchedFileName(destDir, fileName, stripCount)
-    Dim strippedFileName
-    If Not IsNullDevice(fileName) Then
-        strippedFileName = StripDir(fileName, stripCount)
-        If strippedFileName = "" Then
-            MakePatchedFileName = ""
-        Else
-            If Not IsAbsolutePath(strippedFileName) Then
-                MakePatchedFileName = fso.BuildPath(destDir, strippedFileName)
-            Else
-                MakePatchedFileName = strippedFileName
-            End If
-        End If
-    Else
-        MakePatchedFileName = fileName
-    End If
-End Function
-
-Function GuessStripCount(fileNamesInPatch, destDir)
-    Dim i, j, fileName, stripCount
-    Dim matchCount, maxMatchCount
-    GuessStripCount = 0
-    stripCount = 0
-    maxMatchCount = 0
-    If SafeUBound(fileNamesInPatch) < 0 Then Exit Function
-    Do While True
-        matchCount = 0
-        For i = 0 To SafeUBound(fileNamesInPatch)
-            For j = 0 To 1
-                If Not IsNullDevice(fileNamesInPatch(i)(j)) Then
-                    fileName = MakePatchedFileName(destDir, fileNamesInPatch(i)(j), stripCount)
-                    If fso.FileExists(fileName) Then
-                        matchCount = matchCount + 1
-                    End If
-                End If
-            Next
-        Next
-        If matchCount > maxMatchCount Then
-            GuessStripCount = stripCount
-        End If
-        stripCount = stripCount + 1
-        If stripCount > 64 Then Exit Do
-    Loop
-End Function
-
-Sub CreateFolderEx(ByVal dirName)
-    Dim parent
-    parent = fso.GetParentFolderName(dirName)
-    If fso.FolderExists(parent) Then
-        If Not fso.FolderExists(dirName) Then
-            fso.CreateFolder dirName
-        End If
-    Else
-        CreateFolderEx parent
-        fso.CreateFolder dirName
-    End If
-End Sub
-
-Sub CopyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount)
-    Dim i
-    Dim fileNameSrc, fileNameDest
-    For i = 0 To SafeUBound(fileNamesInPatch)
-        If Not IsNullDevice(fileNamesInPatch(i)(0)) Then
-            fileNameSrc = MakePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount)
-            fileNameDest = MakePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount)
-            If fso.FileExists(fileNameSrc) Then
-                If Not fso.FolderExists(fso.GetParentFolderName(fileNameDest)) Then
-                    CreateFolderEx fso.GetParentFolderName(fileNameDest)
-                End If
-                fso.CopyFile fileNameSrc, fileNameDest
-            End If
-        End If
-    Next
-End Sub
-
-Function ReadAllText(fileName)
-    Dim stream
-    Set stream = CreateObject("ADODB.Stream")
-    stream.Open
-    stream.Charset = "_autodetect_all"
-    stream.LoadFromFile fileName
-    ReadAllText = stream.ReadText
-    stream.Close
-End Function
-
-Function GetFileNamesInPatch(fileName)
-    Dim i, n, count, line, lines, text
-    Dim re, ml, mr
-    Dim ary()
-
-    Set re = CreateObject("VBScript.RegExp")
-    re.Pattern = "^(---|\+\+\+|\*\*\*) ([^\t\r\n]+)"
-
-    text = ReadAllText(fileName)
-
-    lines = Split(text, vbLf)
-    Do While i <= UBound(lines)
-        line = lines(i)
-        Set ml = re.Execute(line)
-        If ml.count > 0 Then
-            i = i + 1
-            If i <= UBound(lines) Then
-                line = lines(i)
-                Set mr = re.Execute(line)
-                If mr.count > 0 Then
-                    ReDim Preserve ary(n)
-                    ary(n) = Array(ml(0).SubMatches(1), mr(0).SubMatches(1))
-                    n = n + 1
-                End If
-            End If
-        End If
-        i = i + 1
-    Loop
-    GetFileNamesInPatch = ary
-End Function
-
-Function GetStripCountFromCmdLine(cmdLine)
-    Dim re, m
-    Set re = CreateObject("VBScript.RegExp")
-    re.Pattern = "( -p(\d+)| --strip=(\d+))"
-    Set m = re.Execute(cmdLine)
-    If m.count > 0 Then
-        If Not IsEmpty(m(0).SubMatches(1)) Then
-            GetStripCountFromCmdLine = CLng(m(0).SubMatches(1))
-        Else
-            GetStripCountFromCmdLine = CLng(m(0).SubMatches(2))
-        End If
-    Else
-        GetStripCountFromCmdLine = -1
-    End If
-End Function
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will apply selected patch to specified file or folder using GNU patch.
+    Copyright (C) 2015-2024 Takashi Sawanaka
 
-<script language="JScript">
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+var REGKEY_PATH = "HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge";
+var PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var PrevFileName = "";
+var mergeApp;
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function fmt(formatString, args) {
+  for (var i = 0; i < args.length; i++) {
+    formatString = formatString.replace("%" + (i + 1), args[i]);
+  }
+  return formatString;
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Apply patch using GNU patch";
+}
+
+function get_PluginFileFilters() {
+  return "\\.diff$;\\.patch$";
+}
+
+function get_PluginIsAutomatic() {
+  return false;
+}
+
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Apply Patch...";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  if (!isPatchFile(fileSrc)) {
+    // FIXME:
+    PrevFileName = fileSrc;
+    fso.CopyFile(fileSrc, fileDst);
+    pbChanged = true;
+    pSubcode = 1;
+
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, pbChanged);
+    result.Add(2, pSubcode);
+    return result.Items();
+  }
+
+  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead("Files\\Left/Item_0", "");
+  if (isPatchFile(filePatched)) {
+    filePatched = regRead("Files\\Right/Item_0", "");
+  }
+
+  var msg = fmt(translate("${Enter the name of the file to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
+  while (true) {
+    filePatched = InputBox(msg, PLUGIN_NAME, filePatched)
+    if (filePatched === "") {
+        return false;
+    }
+    if (fso.FileExists(filePatched)) { break; }
+    mergeApp.MsgBox(fmt(translate("${File '%1' does not exist}"), [ filePatched ]), 48/*vbExclamation*/);
+  }
+
+  var cmdLine = "type \"" + fileSrc + "\" | patch --binary $FILE"
+  msg = translate("${Enter the command line arguments for patch command}")
+  cmdLine = mergeApp.InputBox(msg, PLUGIN_NAME, cmdLine);
+  if (cmdLine === "") { return false; }
+  cmdLine = Replace(cmdLine, "$FILE", fileDst);
+      
+  fso.CopyFile(filePatched, fileDst);
+
+  run(wsh, "cmd.exe /s /c \"set PATH=" + GetPatchExeFolder() + ";%PATH% + " + cmdLine + " + pause\"");
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  if (pSubcode !== 0) {
+    // FIXME:
+    fso.CopyFile(fileSrc, fileDst);
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, pbChanged);
+    result.Add(2, pSubcode);
+    return result.Items();
+  }
+  return false
+}
+
+function IsFolder(file) {
+  return isPatchFile(file);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+
+  var dirPatched = regRead("Files\\Left/Item_0", "")
+  if (!fso.FolderExists(dirPatched)) {
+    dirPatched = regRead("Files\\Right/Item_0", "")
+  }
+
+  var msg = fmt(translate("${Enter the name of the folder to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
+  while (true) {
+    dirPatched = mergeApp.InputBox(msg, PLUGIN_NAME, dirPatched);
+    if (dirPatched === "") {
+      fso.CopyFile(fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) + ".txt");
+      return false;
+    }
+    if (fso.FolderExists(dirPatched)) { break; }
+    mergeApp.MsgBox(fmt(translate("${Folder '%1' does not exist}"), dirPatched), 48/*vbExclamation*/);
+  }
+
+  var files = getFileNamesInPatch(fileSrc);
+  var stripCount = guessStripCount(files, dirPatched);
+
+  var cmdLine = "type \"" + fileSrc + "\" | patch --binary -p" + stripCount;
+  msg = translate("${Enter the command line arguments for patch command}");
+  cmdLine = mergeApp.InputBox(msg, PLUGIN_NAME, cmdLine);
+  if (cmdLine === "") {
+    fso.CopyFile(fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) + ".txt");
+    return false;
+  }
+      
+  stripCount = getStripCountFromCmdLine(cmdLine);
+  if (stripCount === 0) {
+    if (hasAbsolutePathInList(files)) {
+      msg = translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}")
+      mergeApp.MsgBox(msg, 48/*vbExclamation*/);
+      return false;
+    }
+  }
+
+  copyOriginalFiles(dirPatched, folderDst, files, stripCount);
+
+  run(wsh, "cmd.exe /s /c \"set PATH=" + GetPatchExeFolder() + ";%PATH% + cd /d " + folderDst + " + " + cmdLine + " + pause\"");
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
+
+function GetPatchExeFolder() {
+  var winMergeExePath = "C:\\Program Files\\WinMerge\\WinMergeU.exe";
+  try {
+    winMergeExePath = wsh.RegRead(REGKEY_PATH + "\\Executable");
+  } catch (e) {}
+  return fso.BuildPath(fso.GetParentFolderName(winMergeExePath), "Commands\\msys2\\usr\\bin");
+}
+
+function isPatchFile(path) {
+  var patterns = get_PluginFileFilters().split(";");
+  for (var i = 0; i < patterns.length; i++) {
+    var re = new RegExp(pattern, "gi");
+    if (re.match(path)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isWindowsTextFormat(path) {
+  return (readAllText(path).indexOf("\r\n") >= 0);
+}
+
+function isAbsolutePath(path) {
+  return (path.length > 1) && (path.charAt(1) === ":" || path.charAt(0) === "/" || path.charAt(0) === "\\");
+}
+
+function hasAbsolutePathInList(files) {
+  for (var i = 0; i < files.length; i++) {
+    if (isAbsolutePath(files[i][0])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isNullDevice(path) {
+  return (path === "/dev/null" || path.toUpperCase() === "NUL");
+}
+
+function stripDir(fileName, stripCount) {
+  if (stripCount === -1) {
+    return fso.GetFileName(fileName);
+  } else if ( stripCount = 0) {
+    return fileName;
+  }
+  var pos = 0;
+  for (var i = 0; i < stripCount; i++) {
+    var posNext1 = fileName.indexOf("/", pos);
+    var posNext2 = fileName.indexOf("\\", pos);
+    if (posNext1 > 0 && (posNext1 < posNext2 || posNext2 === 0)) {
+      pos = posNext1 + 1;
+    } else if (posNext2 > 0 && (posNext2 < posNext1 || posNext1 === 0)) {
+      pos = posNext2 + 1;
+    } else {
+      pos = -1;
+      break;
+    }
+  }
+  if (pos === -1) {
+    return "";
+  }
+  return fileName.substring(pos);
+}
+
+function makePatchedFileName(destDir, fileName, stripCount) {
+  if (!isNullDevice(fileName)) {
+    var strippedFileName = stripDir(fileName, stripCount)
+    if (strippedFileName = "") {
+      return "";
+    }
+    if (!isAbsolutePath(strippedFileName)) {
+      return fso.BuildPath(destDir, strippedFileName);
+    }
+    return strippedFileName;
+  }
+  return fileName;
+}
+
+function guessStripCount(fileNamesInPatch, destDir) {
+  var guessedStripCount = 0;
+  var stripCount = 0;
+  var maxMatchCount = 0;
+  if (fileNamesInPatch.length === 0) { return guessedStripCount; }
+  while (true) {
+    var matchCount = 0
+    for (var i = 0; i < fileNamesInPatch.length; i++) {
+      for (var j = 0; j < 2; j++) {
+        if (!isNullDevice(fileNamesInPatch[i][j])) {
+          var fileName = makePatchedFileName(destDir, fileNamesInPatch[i][j], stripCount);
+          if (fso.FileExists(fileName)) {
+            matchCount++;
+          }
+        }
+      }
+    }
+    if (matchCount > maxMatchCount) {
+      guessedStripCount = stripCount;
+    }
+    stripCount++;
+    if (stripCount > 64) { break; }
+  }
+  return guessedStripCount;
+}
+
+function createFolderEx(dirName) {
+  var parent = fso.GetParentFolderName(dirName);
+  if (fso.FolderExists(parent)) {
+    if (!fso.FolderExists(dirName)) {
+      fso.CreateFolder(dirName);
+    }
+  } else {
+    createFolderEx(parent);
+    fso.CreateFolder(dirName);
+  }
+}
+
+function copyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount) {
+  for (var i = 0; i < fileNamesInPath.length; i++) {
+    if (!isNullDevice(fileNamesInPatch(i)(0))) {
+      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount)
+      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount)
+      if (fso.FileExists(fileNameSrc)) {
+        if (!fso.FolderExists(fso.GetParentFolderName(fileNameDest))) {
+          createFolderEx(fso.GetParentFolderName(fileNameDest));
+        }
+        fso.CopyFile(fileNameSrc, fileNameDest);
+      }
+    }
+  }
+}
+
+function readAllText(fileName) {
+  var stream = new ActiveXObject("ADODB.Stream");
+  stream.Open();
+  stream.Charset = "_autodetect_all";
+  stream.LoadFromFile(fileName);
+  var result = stream.ReadText();
+  stream.Close();
+  return result;
+}
+
+function getFileNamesInPatch(fileName) {
+  var ary = new Array();
+  var re = new RegExp("^(---|\\+\\+\\+|\\*\\*\\*) ([^\\t\\r\\n]+)");
+  var text = readAllText(fileName);
+  var i = 0;
+  var lines = text.split(text, "\r\n");
+  while (i < lines.length) {
+    var line = lines[i];
+    var ml = re.exec(line);
+    if (ml) {
+      i++;
+      if (i < lines.length) {
+        line = lines[i];
+        var mr = re.exec(line);
+        if (mr) {
+          ary.push([ml[2], mr[2]]);
+        }
+      }
+    }
+    i++;
+  }
+  return ary;
+}
+
+function getStripCountFromCmdLine(cmdLine) {
+  var re = new RegExp("( -p(\\d+)| --strip=(\\d+))");
+  var m = re.exec(cmdLine);
+  if (m) {
+    if (m[2]) {
+      return parseInt(m[2]);
+    }
+    return parseInt(m[3]);
+  }
+  return -1;
+}
+
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "Dummy" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
+}
 
-var REGKEY_PATH = "Plugins\\ApplyPatch.sct/";
-
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"Dummy" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
-}
-
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index a7856427fa9..fbb14073f73 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -132,7 +132,7 @@ function replacei(text, find, replace, ignorecase) {
   return text;
 }
 
-function Translate(text) {
+function translate(text) {
   var re = /\${([^}]+)}/g;
   var matches;
   while ((matches = re.exec(text)) != null) {
@@ -145,20 +145,20 @@ function ShowSettingsDialog() {
   var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
   var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
   var tfile = fso.CreateTextFile(tname, true, true);
-  tfile.Write(Translate(getResource("dialog1")));
+  tfile.Write(translate(getResource("dialog1")));
   tfile.Close();
   exportSettingsToXMLFile(xmlfile);
   var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
   if (!fso.FileExists(mshta)) {
     mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
   }
-  Run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
   importSettingsFromXMLFile(xmlfile);
   fso.DeleteFile(tname);
   fso.DeleteFile(xmlfile);
 }
 
-function Run(sh, cmd) {
+function run(sh, cmd) {
   sh.Run(cmd, 1, true);
 }
 

From 29f7a80bc60f767db2fc7bb2b5dc8abf9acd07cd Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 1 Feb 2024 22:05:48 +0900
Subject: [PATCH 21/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      | 15 ++++++++-------
 Plugins/dlls/CompareMSPowerPointFiles.sct |  4 ++--
 Plugins/dlls/CompareMSWordFiles.sct       | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 914a81bd855..28e76a40125 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -49,6 +49,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+
 var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
 var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
   "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
@@ -515,13 +516,13 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   var zf = Array(digit + 1).join("0");
  
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
-    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
     writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
     fo.Close();
   }
  
   if (regRead(REGKEY_PATH + "CompareNames", true)) {
-    fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
     writeObjectProperties(fo, wbk.Names);
     fo.Close();
   }
@@ -531,26 +532,26 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     No = zf + No;
     No = No.substr(No.length - digit, digit);
     if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
       writeCellValues(fo, sht);
       fo.Close();
     }
  
     if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
       writeFormulas(fo, sht);
       fo.Close();
     }
  
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
       ungroupShapes(sht);
       writeTextsInShapes(fo, sht);
       fo.Close();
     }
  
     if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
       writeHeadersAndFooters(fo, sht);
       fo.Close();
     }
@@ -566,7 +567,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   }
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(wbk)) {
-      fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     }
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index 07a51188490..1dce58e49a6 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -46,6 +46,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+
 var REGKEY_PATH = "Plugins\\CompareMSPowerPointFiles.sct/";
 var MsgCannotGetMacros = "${Cannot get Macros.\r\n" +
   "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" +
@@ -269,7 +270,6 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     }
-    
     for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
       cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
     }
@@ -277,7 +277,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
 
   sld = null;
   prs.Close();
-  prs = null
+  prs = null;
   pp.Quit();
   pp = null;
   fo = null;
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index e8776e206a6..e2362f3a98a 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -48,9 +48,10 @@
 
 
 var REGKEY_PATH = "Plugins\\CompareMSWordFiles.sct/";
-var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + _
-  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + _
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
   "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+var wdFormatFilteredHTML = 10;
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");
 var wsh = new ActiveXObject("WScript.Shell");
@@ -149,7 +150,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var fo = fso.CreateTextFile(fileDst, true, true);
 
   var wd = new ActiveXObject("Word.Application");
-  wd.DisplayAlerts = false
+  wd.DisplayAlerts = false;
 
   fileSrc2 = fileSrc;
   if (fso.GetExtensionName(fileSrc2) = "lnk") {
@@ -201,7 +202,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   wd = null;
 
   fo.Close();
-  fo = null
+  fo = null;
 
   pbChanged = true;
   pSubcode = 0;
@@ -224,7 +225,7 @@ function IsFolder(file) {
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
 
-  var wd = new ActiveXObject("Word.Application")
+  var wd = new ActiveXObject("Word.Application");
   wd.DisplayAlerts = false;
 
   var fileSrc2 = fileSrc;
@@ -255,14 +256,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   }
 
   if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
-    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), true, true)
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), true, true);
     ungroupShapes(doc);
     writeTextsInShapes(fo, doc);
     fo.Close();
   }
 
   if (regRead(REGKEY_PATH + "CompareDocumentsAsHTML", true)) {
-    doc.SaveAs(fso.BuildPath(folderDst, "Document.htm"), 10/*wdFormatFilteredHTML*/);
+    doc.SaveAs(fso.BuildPath(folderDst, "Document.htm"), wdFormatFilteredHTML);
   }
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(doc)) {
@@ -281,8 +282,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   wd = null;
   fo = null;
 
-  pbChanged = true
-  pSubcode = 0
+  pbChanged = true;
+  pSubcode = 0;
 
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);

From d31cac720c4fd2271741aa484e00551053daeba1 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 2 Feb 2024 09:00:43 +0900
Subject: [PATCH 22/58] WIP

---
 Plugins/dlls/ApplyPatch.sct               |  48 +-
 Plugins/dlls/CompareMSExcelFiles.sct      |  14 +-
 Plugins/dlls/CompareMSPowerPointFiles.sct |   4 +-
 Plugins/dlls/CompareMSVisioFiles.sct      | 684 ++++++++++------------
 Plugins/dlls/CompareMSWordFiles.sct       |  16 +-
 Plugins/dlls/PrediffLineFilter.sct        |   4 +-
 Plugins/dlls/editor addin.sct             |   2 +-
 7 files changed, 369 insertions(+), 403 deletions(-)

diff --git a/Plugins/dlls/ApplyPatch.sct b/Plugins/dlls/ApplyPatch.sct
index eb0d29a7c80..41a0ac881e6 100644
--- a/Plugins/dlls/ApplyPatch.sct
+++ b/Plugins/dlls/ApplyPatch.sct
@@ -47,7 +47,7 @@
 */
 
 
-var REGKEY_PATH = "HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge";
+var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
 var PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin";
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -109,14 +109,14 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     return result.Items();
   }
 
-  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead("Files\\Left/Item_0", "");
+  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead(REGKEY_PATH + "Files\\Left/Item_0", "");
   if (isPatchFile(filePatched)) {
-    filePatched = regRead("Files\\Right/Item_0", "");
+    filePatched = regRead(REGKEY_PATH + "Files\\Right/Item_0", "");
   }
 
   var msg = fmt(translate("${Enter the name of the file to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
   while (true) {
-    filePatched = InputBox(msg, PLUGIN_NAME, filePatched)
+    filePatched = mergeApp.InputBox(msg, PLUGIN_NAME, filePatched);
     if (filePatched === "") {
         return false;
     }
@@ -124,15 +124,15 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     mergeApp.MsgBox(fmt(translate("${File '%1' does not exist}"), [ filePatched ]), 48/*vbExclamation*/);
   }
 
-  var cmdLine = "type \"" + fileSrc + "\" | patch --binary $FILE"
-  msg = translate("${Enter the command line arguments for patch command}")
+  var cmdLine = "type \"" + fileSrc + "\" | patch --binary $FILE";
+  msg = translate("${Enter the command line arguments for patch command}");
   cmdLine = mergeApp.InputBox(msg, PLUGIN_NAME, cmdLine);
   if (cmdLine === "") { return false; }
-  cmdLine = Replace(cmdLine, "$FILE", fileDst);
+  cmdLine = cmdLine.replace("$FILE", fileDst);
       
   fso.CopyFile(filePatched, fileDst);
 
-  run(wsh, "cmd.exe /s /c \"set PATH=" + GetPatchExeFolder() + ";%PATH% + " + cmdLine + " + pause\"");
+  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & " + cmdLine + " & pause\"");
 
   pbChanged = true;
   pSubcode = 0;
@@ -154,7 +154,7 @@ function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     result.Add(2, pSubcode);
     return result.Items();
   }
-  return false
+  return false;
 }
 
 function IsFolder(file) {
@@ -164,9 +164,9 @@ function IsFolder(file) {
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
 
-  var dirPatched = regRead("Files\\Left/Item_0", "")
+  var dirPatched = regRead(REGKEY_PATH + "Files\\Left/Item_0", "");
   if (!fso.FolderExists(dirPatched)) {
-    dirPatched = regRead("Files\\Right/Item_0", "")
+    dirPatched = regRead(REGKEY_PATH + "Files\\Right/Item_0", "");
   }
 
   var msg = fmt(translate("${Enter the name of the folder to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
@@ -194,7 +194,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   stripCount = getStripCountFromCmdLine(cmdLine);
   if (stripCount === 0) {
     if (hasAbsolutePathInList(files)) {
-      msg = translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}")
+      msg = translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}");
       mergeApp.MsgBox(msg, 48/*vbExclamation*/);
       return false;
     }
@@ -202,7 +202,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
 
   copyOriginalFiles(dirPatched, folderDst, files, stripCount);
 
-  run(wsh, "cmd.exe /s /c \"set PATH=" + GetPatchExeFolder() + ";%PATH% + cd /d " + folderDst + " + " + cmdLine + " + pause\"");
+  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & cd /d " + folderDst + " + " + cmdLine + " & pause\"");
 
   pbChanged = true;
   pSubcode = 0;
@@ -247,7 +247,7 @@ function run(sh, cmd) {
   sh.Run(cmd, 1, true);
 }
 
-function GetPatchExeFolder() {
+function getPatchExeFolder() {
   var winMergeExePath = "C:\\Program Files\\WinMerge\\WinMergeU.exe";
   try {
     winMergeExePath = wsh.RegRead(REGKEY_PATH + "\\Executable");
@@ -258,8 +258,8 @@ function GetPatchExeFolder() {
 function isPatchFile(path) {
   var patterns = get_PluginFileFilters().split(";");
   for (var i = 0; i < patterns.length; i++) {
-    var re = new RegExp(pattern, "gi");
-    if (re.match(path)) {
+    var re = new RegExp(patterns[i], "gi");
+    if (re.test(path)) {
       return true;
     }
   }
@@ -290,7 +290,7 @@ function isNullDevice(path) {
 function stripDir(fileName, stripCount) {
   if (stripCount === -1) {
     return fso.GetFileName(fileName);
-  } else if ( stripCount = 0) {
+  } else if ( stripCount === 0) {
     return fileName;
   }
   var pos = 0;
@@ -314,8 +314,8 @@ function stripDir(fileName, stripCount) {
 
 function makePatchedFileName(destDir, fileName, stripCount) {
   if (!isNullDevice(fileName)) {
-    var strippedFileName = stripDir(fileName, stripCount)
-    if (strippedFileName = "") {
+    var strippedFileName = stripDir(fileName, stripCount);
+    if (strippedFileName === "") {
       return "";
     }
     if (!isAbsolutePath(strippedFileName)) {
@@ -332,7 +332,7 @@ function guessStripCount(fileNamesInPatch, destDir) {
   var maxMatchCount = 0;
   if (fileNamesInPatch.length === 0) { return guessedStripCount; }
   while (true) {
-    var matchCount = 0
+    var matchCount = 0;
     for (var i = 0; i < fileNamesInPatch.length; i++) {
       for (var j = 0; j < 2; j++) {
         if (!isNullDevice(fileNamesInPatch[i][j])) {
@@ -367,8 +367,8 @@ function createFolderEx(dirName) {
 function copyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount) {
   for (var i = 0; i < fileNamesInPath.length; i++) {
     if (!isNullDevice(fileNamesInPatch(i)(0))) {
-      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount)
-      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount)
+      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount);
+      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount);
       if (fso.FileExists(fileNameSrc)) {
         if (!fso.FolderExists(fso.GetParentFolderName(fileNameDest))) {
           createFolderEx(fso.GetParentFolderName(fileNameDest));
@@ -452,7 +452,7 @@ function importSettingsFromXMLFile(filepath) {
   var ts = fso.OpenTextFile(filepath, 1, true, -1);
   var xml = ts.ReadAll();
   var doc = new ActiveXObject("MSXML2.DOMDocument");
-  doc.async = false
+  doc.async = false;
   doc.loadXML(xml);
   ts.Close();
   var nodes = doc.documentElement.childNodes;
@@ -501,7 +501,7 @@ function importSettingsFromXMLFile(filepath) {
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 28e76a40125..41c7b9e7040 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -175,7 +175,7 @@ function ungroupShapes(sht) {
           shp.Ungroup();
         }
       }
-    } while (cnt != sht.Shapes.Count);
+    } while (cnt !== sht.Shapes.Count);
   } catch (e) {}
 }
 
@@ -244,7 +244,7 @@ function saveRangeAsImage(sht, rng, filename) {
         try {
           rng.CopyPicture(1, 2); // xlScreen=1, xlBitmap=2
           sleep(i);
-          obj.Paste;
+          obj.Paste();
           obj.Export(filename, "PNG");
           result = true;
           break;
@@ -298,7 +298,7 @@ function findRowByPosition(sht, rowBegin, rowEnd, pos) {
     if (row == rowPrev) {
       return row;
     }
-    rowPrev = row
+    rowPrev = row;
   } while (true);
 }
 
@@ -330,7 +330,7 @@ function saveSheetAsImage(sht, basefilename) {
   var column = rngUsed.Column;
   do {
     var columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth);
-    var numY = 1
+    var numY = 1;
     var row = rngUsed.Row;
     do {
       var rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight);
@@ -383,7 +383,7 @@ function get_PluginDescription() {
 }
 
 function get_PluginFileFilters() {
-  return "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlax(\..*)?$;\.xltx(\..*)?$;\.xltm(\..*)?$";
+  return "\\.xls(\\..*)?$;\\.xlsx(\\..*)?$;\\.xlsm(\\..*)?$;\\.xlsb(\\..*)?;\\.xla(\\..*)?$;\\.xlax(\\..*)?$;\\.xltx(\\..*)?$;\\.xltm(\\..*)?$";
 }
 
 function get_PluginIsAutomatic() {
@@ -667,7 +667,7 @@ function importSettingsFromXMLFile(filepath) {
   var ts = fso.OpenTextFile(filepath, 1, true, -1);
   var xml = ts.ReadAll();
   var doc = new ActiveXObject("MSXML2.DOMDocument");
-  doc.async = false
+  doc.async = false;
   doc.loadXML(xml);
   ts.Close();
   var nodes = doc.documentElement.childNodes;
@@ -716,7 +716,7 @@ function importSettingsFromXMLFile(filepath) {
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index 1dce58e49a6..2cdbf83a49e 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -358,7 +358,7 @@ function importSettingsFromXMLFile(filepath) {
   var ts = fso.OpenTextFile(filepath, 1, true, -1);
   var xml = ts.ReadAll();
   var doc = new ActiveXObject("MSXML2.DOMDocument");
-  doc.async = false
+  doc.async = false;
   doc.loadXML(xml);
   ts.Close();
   var nodes = doc.documentElement.childNodes;
@@ -407,7 +407,7 @@ function importSettingsFromXMLFile(filepath) {
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 9afcceaf0bb..3d4c008a081 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -1,374 +1,336 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Visio files.
-'    Copyright (C) 2020 dedicatus
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSVisioFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(doc)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = doc.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Sub ungroupShapes(pge)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = pge.Shapes.Count
-        For Each shp In pge.Shapes
-            shp.ungroup
-        Next
-    Loop While cnt <> pge.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, pge)
-	Dim shp
-	On Error Resume Next
-	For Each shp In pge.Shapes
-		fo.WriteLine shp.Name & ": " & shp.Text
-	Next
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function saveSlideAsImage(pge, filename)
-        pge.Export filename
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Visio files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.vsd(\..*)?$;\.vsdx(\..*)?$;\.vsdm(\..*)?$;\.vss(\..*)?$;\.vssx(\..*)?$;\.vssm(\..*)?$;\.vst(\..*)?$;\.vstx(\..*)?$;\.vstm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Visio;MenuCaption=MS-Visio"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim vs
-	Dim doc
-	Dim pge
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set vs = CreateObject("Visio.Application")
-	vs.Visible = False
-	vs.AlertResponse = vbNo
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSVisioFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = vs.Documents.OpenEx(fileSrc2, &H80)
-
-	On Error Resume Next
-
-	For Each pge In doc.Pages
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & pge.Name & "]"
-			ungroupShapes pge
-			writeTextsInShapes fo, pge
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In doc.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set doc = Nothing
-	pge.Close
-	Set pge = Nothing
-	vs.Quit
-	Set vs = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim vs
-	Dim doc
-	Dim pge
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set vs = CreateObject("Visio.Application")
-	vs.Visible = False
-	vs.AlertResponse = vbNo
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSVisioFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = vs.Documents.OpenEx(fileSrc2, &H80)
-
-	On Error Resume Next
-
-	For Each pge In doc.Pages
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, pge.Name & ".txt"), True, True)
-			ungroupShapes pge
-			writeTextsInShapes fo, pge
-			fo.Close
-		End If
-
-
-		If regRead(RegKeyPath & "ComparePageAsImage", True) Then
-			saveSlideAsImage pge, fso.BuildPath(folderDst, pge.Name & ".png")
-		End If
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In doc.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set pge = Nothing
-	doc.Close
-	Set doc = Nothing
-	vs.Quit
-	Set vs = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Visio files.
+    Copyright (C) 2020 dedicatus
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSVisioFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+var vbNo = 7;
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(doc) {
+  try {
+    return (doc.VBProject.VBComponents.Count > 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+      fo.WriteLine(o.Name + ": " + o.Value);
+    }
+  } catch (e) {}
+}
+
+function ungroupShapes(pge) {
+  try {
+    var cnt;
+    do {
+      cnt = pge.Shapes.Count;
+      for (var it = new Enumerator(pge.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
+        shp.Ungroup();
+      }
+    } while (cnt !== pge.Shapes.Count);
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, pge) {
+  try {
+    for (var it = new Enumerator(pge.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      fo.WriteLine(shp.Name + ": " + shp.Text);
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function saveSlideAsImage(pge, filename) {
+  pge.Export(filename);
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Visio files";
+}
+
+function get_PluginFileFilters() {
+  return "\\.vsd(\\..*)?$;\\.vsdx(\\..*)?$;\\.vsdm(\\..*)?$;\\.vss(\\..*)?$;\\.vssx(\\..*)?$;\\.vssm(\\..*)?$;\\.vst(\\..*)?$;\\.vstx(\\..*)?$;\\.vstm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Visio;MenuCaption=MS-Visio";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+
+  var vs = new ActiveXObject("Visio.Application");
+  vs.Visible = false;
+  vs.AlertResponse = vbNo;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSVisioFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
+
+  for (var it = new Enumerator(doc.Pages), pge = it.item(); !it.atEnd(); it.moveNext(), pge = it.item()) {
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + pge.Name + "]");
+      ungroupShapes(pge);
+      writeTextsInShapes(fo, pge);
+      fo.WriteLine("");
+    }
+  }
+
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    }
+    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      fo.WriteLine("[CodeModule." + cmp.Name + "]");
+      if (cmp.CodeModule.CountOfLines > 0) {
+        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+      }
+      fo.WriteLine("");
+    }
+  }
+
+  doc = null;
+  pge.Close();
+  pge = null;
+  vs.Quit();
+  vs = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+
+  var vs = new ActiveXObject("Visio.Application");
+  vs.Visible = false;
+  vs.AlertResponse = vbNo;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSVisioFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
+
+  for (var it = new Enumerator(doc.Pages), pge = it.item(); !it.atEnd(); it.moveNext(), pge = it.item()) {
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, pge.Name + ".txt"), true, true);
+      ungroupShapes(pge);
+      writeTextsInShapes(fo, pge);
+      fo.Close();
+    }
+
+    if (regRead(REGKEY_PATH + "ComparePageAsImage", true)) {
+      saveSlideAsImage(pge, fso.BuildPath(folderDst, pge.Name + ".png"));
+    }
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+    }
+    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    }
+  }
+
+  pge = null;
+  doc.Close();
+  doc = null;
+  vs.Quit();
+  vs = null;
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"ComparePageAsImage" : true,
-		"CompareTextsInShapes" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "ComparePageAsImage" : true,
+    "CompareTextsInShapes" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -411,7 +373,7 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index e2362f3a98a..c8716f41b92 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -99,7 +99,7 @@ function ungroupShapes(sht) {
           shp.Ungroup();
         }
       }
-    } while (cnt != doc.Shapes.Count);
+    } while (cnt !== doc.Shapes.Count);
   } catch (e) {}
 }
 
@@ -152,8 +152,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var wd = new ActiveXObject("Word.Application");
   wd.DisplayAlerts = false;
 
-  fileSrc2 = fileSrc;
-  if (fso.GetExtensionName(fileSrc2) = "lnk") {
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
     fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
     if (!fso.FileExists(fileSrc2)) {
       throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
@@ -191,7 +191,11 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
     }
     for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      fo.WriteLine("[CodeModule." + cmp.Name + "]");
+      if (cmp.CodeModule.CountOfLines > 0) {
+        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+      }
+      fo.WriteLine("");
     }
   }
 
@@ -359,7 +363,7 @@ function importSettingsFromXMLFile(filepath) {
   var ts = fso.OpenTextFile(filepath, 1, true, -1);
   var xml = ts.ReadAll();
   var doc = new ActiveXObject("MSXML2.DOMDocument");
-  doc.async = false
+  doc.async = false;
   doc.loadXML(xml);
   ts.Close();
   var nodes = doc.documentElement.childNodes;
@@ -408,7 +412,7 @@ function importSettingsFromXMLFile(filepath) {
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index fbb14073f73..0f393432b12 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -195,7 +195,7 @@ function importSettingsFromXMLFile(filepath) {
   var ts = fso.OpenTextFile(filepath, 1, true, -1);
   var xml = ts.ReadAll();
   var doc = new ActiveXObject("MSXML2.DOMDocument");
-  doc.async = false
+  doc.async = false;
   doc.loadXML(xml);
   ts.Close();
   var nodes = doc.documentElement.childNodes;
@@ -248,7 +248,7 @@ function importSettingsFromXMLFile(filepath) {
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 0b229c8ece2..6b02d258e5d 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -41,7 +41,7 @@
 
 var REGKEY_PATH = "Plugins\\editor addin.sct/";
 
-var wsh = new ActiveXObject("WScript.Shell")
+var wsh = new ActiveXObject("WScript.Shell");
 var pluginArguments = "";
 var variables = new Array();
 var mergeApp;

From 99f69018048c4aae507cf63fe69078e7667eafdc Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 2 Feb 2024 09:14:52 +0900
Subject: [PATCH 23/58] WIP

---
 Src/MergeApp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp
index 15095447f10..3e9e33b93df 100644
--- a/Src/MergeApp.cpp
+++ b/Src/MergeApp.cpp
@@ -100,7 +100,7 @@ void AppErrorMessageBox(const String& msg)
 
 void* AppGetMainHWND()
 {
-	return AfxGetMainWnd()->m_hWnd;
+	return AfxGetMainWnd()->GetSafeHwnd();
 }
 
 namespace AppMsgBox

From 9c07d2b002683dfbee514ef2564e0facd92e9ede Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 5 Feb 2024 21:29:05 +0900
Subject: [PATCH 24/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct          |  82 ++++++++------
 Plugins/dlls/CompareMSPowerPointFiles.sct     |  25 ++---
 Plugins/dlls/CompareMSVisioFiles.sct          |  32 +++---
 Plugins/dlls/CompareMSWordFiles.sct           |  38 ++++---
 Src/7zcommon.patch                            | 102 ++++++++++++++++++
 Src/MergeAppLib.h                             |   4 +-
 Testing/Data/Office/excel.xls                 | Bin 47616 -> 49664 bytes
 Testing/Data/Office/powerpnt.ppt              | Bin 89088 -> 86016 bytes
 Testing/Data/Office/~$word.doc                | Bin 0 -> 162 bytes
 Testing/PluginTests/PluginTests.js            |  69 ++++++++++--
 Testing/PluginTests/result/excel.xls.txt      | Bin 0 -> 2740 bytes
 Testing/PluginTests/result/excel/(0)Names.txt |   1 +
 .../result/excel/(1)Sheet1(1-1).png           | Bin 0 -> 31086 bytes
 .../PluginTests/result/excel/(1)Sheet1.tsv    | Bin 0 -> 130 bytes
 .../excel/(1)Sheet1_HeadersAndFooters.txt     | Bin 0 -> 242 bytes
 .../result/excel/(1)Sheet1_Shapes.txt         | Bin 0 -> 180 bytes
 .../result/excel/(2)Sheet2(1-1).png           | Bin 0 -> 282 bytes
 .../PluginTests/result/excel/(2)Sheet2.tsv    | Bin 0 -> 8 bytes
 .../excel/(2)Sheet2_HeadersAndFooters.txt     | Bin 0 -> 182 bytes
 .../result/excel/(2)Sheet2_Shapes.txt         |   1 +
 .../result/excel/(3)Sheet3(1-1).png           | Bin 0 -> 430 bytes
 .../PluginTests/result/excel/(3)Sheet3.tsv    | Bin 0 -> 8 bytes
 .../excel/(3)Sheet3_HeadersAndFooters.txt     | Bin 0 -> 182 bytes
 .../result/excel/(3)Sheet3_Shapes.txt         |   1 +
 .../result/excel/(4)Sheet4(1-1).png           | Bin 0 -> 1151 bytes
 .../PluginTests/result/excel/(4)Sheet4.tsv    | Bin 0 -> 70 bytes
 .../excel/(4)Sheet4_HeadersAndFooters.txt     | Bin 0 -> 182 bytes
 .../result/excel/(4)Sheet4_Shapes.txt         |   1 +
 .../result/excel/(5)Sheet5(1-1).png           | Bin 0 -> 704 bytes
 .../PluginTests/result/excel/(5)Sheet5.tsv    | Bin 0 -> 12 bytes
 .../excel/(5)Sheet5_HeadersAndFooters.txt     | Bin 0 -> 182 bytes
 .../result/excel/(5)Sheet5_Shapes.txt         |   1 +
 .../result/excel/(6)Sheet6(1-1).png           | Bin 0 -> 1154 bytes
 .../PluginTests/result/excel/(6)Sheet6.tsv    | Bin 0 -> 38 bytes
 .../excel/(6)Sheet6_HeadersAndFooters.txt     | Bin 0 -> 182 bytes
 .../result/excel/(6)Sheet6_Shapes.txt         |   1 +
 Testing/PluginTests/result/excel/Sheet1.bas   |  12 +++
 Testing/PluginTests/result/excel/Sheet2.bas   |   9 ++
 Testing/PluginTests/result/excel/Sheet3.bas   |   9 ++
 Testing/PluginTests/result/excel/Sheet4.bas   |   9 ++
 Testing/PluginTests/result/excel/Sheet5.bas   |   9 ++
 Testing/PluginTests/result/excel/Sheet6.bas   |   9 ++
 .../PluginTests/result/excel/ThisWorkbook.bas |   9 ++
 Testing/PluginTests/result/powerpnt.ppt.txt   | Bin 0 -> 298 bytes
 .../result/powerpnt/CannotGetMacros.bas       | Bin 0 -> 514 bytes
 .../PluginTests/result/powerpnt/Slide1.png    | Bin 0 -> 2895 bytes
 .../PluginTests/result/powerpnt/Slide1.txt    | Bin 0 -> 64 bytes
 .../result/powerpnt/Slide1_NotesPage.txt      | Bin 0 -> 168 bytes
 Testing/PluginTests/result/word.doc.txt       | Bin 0 -> 154 bytes
 .../PluginTests/result/word/(0)Bookmarks.txt  |   1 +
 .../result/word/CannotGetMacros.bas           | Bin 0 -> 514 bytes
 Testing/PluginTests/result/word/Document.htm  |  46 ++++++++
 Testing/PluginTests/result/word/Document.txt  | Bin 0 -> 4 bytes
 Testing/PluginTests/result/word/Shapes.txt    |   1 +
 .../PluginTests/result/word/ThisDocument.bas  |   9 ++
 Testing/SingleInstanceTest.cmd                |  12 +++
 crowdin.yml                                   |  54 ++++++++++
 57 files changed, 466 insertions(+), 81 deletions(-)
 create mode 100644 Src/7zcommon.patch
 create mode 100644 Testing/Data/Office/~$word.doc
 create mode 100644 Testing/PluginTests/result/excel.xls.txt
 create mode 100644 Testing/PluginTests/result/excel/(0)Names.txt
 create mode 100644 Testing/PluginTests/result/excel/(1)Sheet1(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(1)Sheet1.tsv
 create mode 100644 Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/(2)Sheet2(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(2)Sheet2.tsv
 create mode 100644 Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/(3)Sheet3(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(3)Sheet3.tsv
 create mode 100644 Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/(4)Sheet4(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(4)Sheet4.tsv
 create mode 100644 Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/(5)Sheet5(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(5)Sheet5.tsv
 create mode 100644 Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/(6)Sheet6(1-1).png
 create mode 100644 Testing/PluginTests/result/excel/(6)Sheet6.tsv
 create mode 100644 Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt
 create mode 100644 Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
 create mode 100644 Testing/PluginTests/result/excel/Sheet1.bas
 create mode 100644 Testing/PluginTests/result/excel/Sheet2.bas
 create mode 100644 Testing/PluginTests/result/excel/Sheet3.bas
 create mode 100644 Testing/PluginTests/result/excel/Sheet4.bas
 create mode 100644 Testing/PluginTests/result/excel/Sheet5.bas
 create mode 100644 Testing/PluginTests/result/excel/Sheet6.bas
 create mode 100644 Testing/PluginTests/result/excel/ThisWorkbook.bas
 create mode 100644 Testing/PluginTests/result/powerpnt.ppt.txt
 create mode 100644 Testing/PluginTests/result/powerpnt/CannotGetMacros.bas
 create mode 100644 Testing/PluginTests/result/powerpnt/Slide1.png
 create mode 100644 Testing/PluginTests/result/powerpnt/Slide1.txt
 create mode 100644 Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt
 create mode 100644 Testing/PluginTests/result/word.doc.txt
 create mode 100644 Testing/PluginTests/result/word/(0)Bookmarks.txt
 create mode 100644 Testing/PluginTests/result/word/CannotGetMacros.bas
 create mode 100644 Testing/PluginTests/result/word/Document.htm
 create mode 100644 Testing/PluginTests/result/word/Document.txt
 create mode 100644 Testing/PluginTests/result/word/Shapes.txt
 create mode 100644 Testing/PluginTests/result/word/ThisDocument.bas
 create mode 100644 Testing/SingleInstanceTest.cmd
 create mode 100644 crowdin.yml

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 41c7b9e7040..5ea80586e48 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -62,7 +62,7 @@ var mergeApp;
 
 function isAccessibleVBAProject(wbk) {
   try {
-    return (wbk.VBProject.VBComponents.Count > 0);
+    return (wbk.VBProject.VBComponents.Count >= 0);
   } catch (e) {
     return false;
   }
@@ -103,10 +103,10 @@ function quoteIfNeeded(str) {
 function writeCellValues(fo, sht) {
   var varCells = sht.UsedRange.Value;
   if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
-    fo.WriteLine(quoteIfNeeded(varCells));
+    fo.WriteLine(quoteIfNeeded(String(varCells)));
   } else if (varCells !== undefined) {
-    var ary = new Array(varCells.ubound(2));
     try {
+      var ary = new Array(varCells.ubound(2));
       for (var row = 1; row <= varCells.ubound(1); row++) {
         for (var col = 1; col <= varCells.ubound(2); col++) {
           try {
@@ -118,7 +118,9 @@ function writeCellValues(fo, sht) {
         }
         fo.WriteLine(ary.join("\t"));
       }
-    } catch (e) {}
+    } catch (e) {
+      fo.WriteLine("Error" + e.number);
+    }
   }
 }
 
@@ -140,13 +142,21 @@ function writeFormulas(fo, sht) {
   if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
     fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + varCells);
   } else {
-    for (var row = 1; row <= varCells.ubound(1); row++) {
-      for (var col = 1; col <= varCells.ubound(2); col++) {
-        var formula = varCells.getItem(row, col);
-        if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
-          fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
+    try {
+      for (var row = 1; row <= varCells.ubound(1); row++) {
+        for (var col = 1; col <= varCells.ubound(2); col++) {
+          try {
+            var formula = varCells.getItem(row, col);
+            if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
+              fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
+            }
+          } catch (e) {
+            fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + "Error" + e.number);
+          }
         }
       }
+    } catch (e) {
+      fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + "Error" + e.number);
     }
   }
 }
@@ -170,10 +180,12 @@ function ungroupShapes(sht) {
     var cnt;
     do {
       cnt = sht.Shapes.Count;
-      for (var it = new Enumerator(sht.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
-        if (shp.Type == pbGroup) {
-          shp.Ungroup();
-        }
+      for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+        try {
+          if (shp.Type == pbGroup) {
+            shp.Ungroup();
+          }
+        } catch (e) {}
       }
     } while (cnt !== sht.Shapes.Count);
   } catch (e) {}
@@ -182,7 +194,9 @@ function ungroupShapes(sht) {
 function writeTextsInShapes(fo, sht) {
   try {
     for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
-      fo.WriteLine(shp.Name + ": " + shp.TextFrame.Characters.Text);
+      try {
+        fo.WriteLine(shp.Name + ": " + shp.TextFrame.Characters().Text);
+      } catch (e) {}
     }
   } catch (e) {}
 }
@@ -456,13 +470,14 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(wbk)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
-    }
-    for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      fo.WriteLine("[CodeModule." + cmp.Name + "]");
-      if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+    } else {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
       }
-      fo.WriteLine("");
     }
   }
   sht = null;
@@ -570,9 +585,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
-    }
-    for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    } else {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
     }
   }
   sht = null;
@@ -828,33 +844,35 @@ function importSettingsFromXMLFile(filepath) {
       }
 
       function onlyNumeric() {
-        var k = event.keyCode;
+        var ev = event;
+        var k = ev.keyCode;
 
-        if (event.shiftKey) {
+        if (ev.shiftKey) {
           if (k == 37 || k == 39) {
             return true;
           }
-        } else if (event.altKey) {
+        } else if (ev.altKey) {
           return true;
-        } else if (event.ctrlKey) {
+        } else if (ev.ctrlKey) {
           return true;
         } else if (k == 8 || k == 9 || k == 37 || k == 39 || k == 46 /* || k == 144 */
             || (48 <= k && k <= 57) || (96 <= k && k <= 105)) {
           return true;
         }
 
-        event.returnValue = false;
+        ev.returnValue = false;
         return false;
       }
 
       function onPaste() {
-        var paste = (event.clipboardData || window.clipboardData).getData("text");
+        var ev = event;
+        var paste = (ev.clipboardData || window.clipboardData).getData("text");
         if (!paste.match(/^[0-9]{0,4}$/)) {
           paste = "";
-          if (event.preventDefault) {
-              event.preventDefault();
+          if (ev.preventDefault) {
+              ev.preventDefault();
           }
-          event.returnValue = false;
+          ev.returnValue = false;
           return false;
         } else {
           return true;
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index 2cdbf83a49e..adb57ce7195 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -58,7 +58,7 @@ var mergeApp;
 
 function isAccessibleVBAProject(wbk) {
   try {
-    return (wbk.VBProject.VBComponents.Count > 0);
+    return (wbk.VBProject.VBComponents.Count >= 0);
   } catch (e) {
     return false;
   }
@@ -97,7 +97,7 @@ function writeShape(fo, shp) {
         writeShape(fo, shp2);
       }
     } else if (shp.HasTextFrame) {
-      fo.WriteLine(shp.TextFrame.TextRange.Characters.Text);
+      fo.WriteLine(shp.TextFrame.TextRange.Characters().Text);
     } else {
       fo.WriteLine("");
     }
@@ -189,13 +189,14 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(prs)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
-    }
-    for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      fo.WriteLine("[CodeModule." + cmp.Name + "]");
-      if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+    } else {
+      for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
       }
-      fo.WriteLine("");
     }
   }
 
@@ -269,9 +270,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
-    }
-    for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    } else {
+      for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
     }
   }
 
@@ -467,7 +469,6 @@ function importSettingsFromXMLFile(filepath) {
         }
       }
 
-
       function chkUnpackToFolder_onclick() {
         if (!chkUnpackToFolder.checked)
           chkCompareSlideAsImage.checked = false;
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 3d4c008a081..12d2a6b85a1 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -59,7 +59,7 @@ var mergeApp;
 
 function isAccessibleVBAProject(doc) {
   try {
-    return (doc.VBProject.VBComponents.Count > 0);
+    return (doc.VBProject.VBComponents.Count >= 0);
   } catch (e) {
     return false;
   }
@@ -86,8 +86,10 @@ function ungroupShapes(pge) {
     var cnt;
     do {
       cnt = pge.Shapes.Count;
-      for (var it = new Enumerator(pge.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
-        shp.Ungroup();
+      for (var it = new Enumerator(pge.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+        try {
+          shp.Ungroup();
+        } catch (e) {}
       }
     } while (cnt !== pge.Shapes.Count);
   } catch (e) {}
@@ -96,7 +98,9 @@ function ungroupShapes(pge) {
 function writeTextsInShapes(fo, pge) {
   try {
     for (var it = new Enumerator(pge.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
-      fo.WriteLine(shp.Name + ": " + shp.Text);
+      try {
+        fo.WriteLine(shp.Name + ": " + shp.Text);
+      } catch (e) {}
     }
   } catch (e) {}
 }
@@ -168,13 +172,14 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(doc)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
-    }
-    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      fo.WriteLine("[CodeModule." + cmp.Name + "]");
-      if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
       }
-      fo.WriteLine("");
     }
   }
 
@@ -237,9 +242,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
-    }
-    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
     }
   }
 
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index c8716f41b92..a1843825eba 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -59,7 +59,7 @@ var mergeApp;
 
 function isAccessibleVBAProject(doc) {
   try {
-    return (doc.VBProject.VBComponents.Count > 0);
+    return (doc.VBProject.VBComponents.Count >= 0);
   } catch (e) {
     return false;
   }
@@ -94,10 +94,12 @@ function ungroupShapes(sht) {
     var cnt;
     do {
       cnt = sht.Shapes.Count;
-      for (var it = new Enumerator(doc.Shapes), shp = it.item(); !itShp.atEnd(); itShp.moveNext(), shp = it.item()) {
-        if (shp.Type == pbGroup) {
-          shp.Ungroup();
-        }
+      for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+        try {
+          if (shp.Type == pbGroup) {
+            shp.Ungroup();
+          }
+        } catch (e) {}
       }
     } while (cnt !== doc.Shapes.Count);
   } catch (e) {}
@@ -106,7 +108,9 @@ function ungroupShapes(sht) {
 function writeTextsInShapes(fo, doc) {
   try {
     for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
-      fo.WriteLine(shp.Name + ": " + shp.TextFrame.TextRange.Text);
+      try {
+        fo.WriteLine(shp.Name + ": " + shp.TextFrame.TextRange.Text);
+      } catch (e) {}
     }
   } catch (e) {}
 }
@@ -159,7 +163,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     } 
   }
-  var doc = wd.Documents.Open(fileSrc2);
+  var doc = wd.Documents.Open(fileSrc2, true, true);
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     fo.WriteLine("[Document Properties]");
@@ -189,13 +193,14 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(doc)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
-    }
-    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      fo.WriteLine("[CodeModule." + cmp.Name + "]");
-      if (cmp.CodeModule.CountOfLines > 0) {
-        fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
       }
-      fo.WriteLine("");
     }
   }
 
@@ -274,9 +279,10 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
-    }
-    for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
-      cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
     }
   }
 
diff --git a/Src/7zcommon.patch b/Src/7zcommon.patch
new file mode 100644
index 00000000000..c05f96ec724
--- /dev/null
+++ b/Src/7zcommon.patch
@@ -0,0 +1,102 @@
+--- c:/dev/winmerge/src/7zCommon.cpp	Mon Mar  6 00:06:40 2023
++++ d:/dev/winmerge/src/7zCommon.cpp	Tue Feb 14 23:00:32 2023
+@@ -151,17 +151,17 @@
+ 		return nullptr;
+ 	String path2(path);
+ 	// Map extensions through ExternalArchiveFormat.ini
+-	static tchar_t null[] = _T("");
+-	static const tchar_t section[] = _T("extensions");
++	static TCHAR null[] = _T("");
++	static const TCHAR section[] = _T("extensions");
+ 	String entry = paths::FindExtension(path);
+-	tchar_t value[20];
+-	static const tchar_t* filename = nullptr;
++	TCHAR value[20];
++	static LPCTSTR filename = nullptr;
+ 	if (filename == nullptr)
+ 	{
+-		tchar_t cPath[INTERNET_MAX_PATH_LENGTH];
++		TCHAR cPath[INTERNET_MAX_PATH_LENGTH];
+ 		DWORD cchPath = SearchPath(nullptr, _T("ExternalArchiveFormat.ini"), nullptr,
+ 			INTERNET_MAX_PATH_LENGTH, cPath, nullptr);
+-		filename = cchPath && cchPath < INTERNET_MAX_PATH_LENGTH ? tc::tcsdup(cPath) : null;
++		filename = cchPath && cchPath < INTERNET_MAX_PATH_LENGTH ? _tcsdup(cPath) : null;
+ 	}
+ 	if (*filename &&
+ 		GetPrivateProfileString(section, entry.c_str(), null, value, 20, filename) &&
+@@ -169,7 +169,7 @@
+ 	{
+ 		// Remove end-of-line comments (in string returned from GetPrivateProfileString)
+ 		// that is, remove semicolon & whatever follows it
+-		if (tchar_t* p = StrChr(value, ';'))
++		if (LPTSTR p = StrChr(value, ';'))
+ 		{
+ 			*p = '\0';
+ 			StrTrim(value, _T(" \t"));
+@@ -318,7 +318,7 @@
+ /**
+  * @brief SingleFileEnumerator constructor.
+  */
+-SingleItemEnumerator::SingleItemEnumerator(const tchar_t* path, const tchar_t* FullPath, const tchar_t* Name)
++SingleItemEnumerator::SingleItemEnumerator(LPCTSTR path, LPCTSTR FullPath, LPCTSTR Name)
+ : FullPath(FullPath)
+ , Name(Name)
+ {
+@@ -408,20 +408,9 @@
+ 	while ((m_nIndex = pView(m_pView)->GetNextItem(m_nIndex, m_nFlags & nMask)) == -1)
+ 	{
+ 		m_strFolderPrefix = *m_curFolderPrefix++;
+-		m_index++;
++		m_index = 1;
+ 	}
+-	const auto& di = m_pView->GetDiffItem(m_nIndex);
+-	// If the current item is a folder, ignore the current item if the next selected item is a child element of that folder.
+-	if (m_index > (((di.diffcode.diffcode & DIFFCODE::THREEWAY) == 0) ? 1 : 2) || !di.diffcode.isDirectory())
+-		return di;
+-	const int nextIndex = pView(m_pView)->GetNextItem(m_nIndex, m_nFlags & nMask);
+-	if (nextIndex == -1)
+-		return di;
+-	const auto& diNext = m_pView->GetDiffItem(nextIndex);
+-	const String curRelPath = strutils::makelower(di.diffFileInfo[m_index].GetFile());
+-	if (strutils::makelower(diNext.diffFileInfo[m_index].GetFile()).find(curRelPath) != 0)
+-		return di;
+-	return *DIFFITEM::GetEmptyItem();
++	return m_pView->GetDiffItem(m_nIndex);
+ }
+ 
+ /**
+@@ -443,7 +432,7 @@
+ 	const CDiffContext& ctxt = m_pView->GetDiffContext();
+ 	const DIFFITEM &di = Next();
+ 
+-	if (di.isEmpty() || ((m_nFlags & DiffsOnly) && !IsItemNavigableDiff(ctxt, di)))
++	if ((m_nFlags & DiffsOnly) && !IsItemNavigableDiff(ctxt, di))
+ 	{
+ 		return 0;
+ 	}
+@@ -505,7 +494,7 @@
+ /**
+  * @brief Apply appropriate handlers from left to right.
+  */
+-bool DirItemEnumerator::MultiStepCompressArchive(const tchar_t* path)
++bool DirItemEnumerator::MultiStepCompressArchive(LPCTSTR path)
+ {
+ 	DeleteFile(path);
+ 	Merge7z::Format *piHandler = ArchiveGuessFormat(path);
+@@ -536,14 +525,14 @@
+ /**
+  * @brief Generate archive from DirView items.
+  */
+-void DirItemEnumerator::CompressArchive(const tchar_t* path)
++void DirItemEnumerator::CompressArchive(LPCTSTR path)
+ {
+ 	String strPath;
+ 	if (path == nullptr)
+ 	{
+ 		// 7z311 can only write 7z, zip, and tar(.gz|.bz2) archives, so don't
+ 		// offer other formats here!
+-		static const tchar_t _T_Filter[]
++		static const TCHAR _T_Filter[]
+ 		(
+ 			_T("7z|*.7z|")
+ 			//_T("z|*.z|")
diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h
index c89c05a6ac5..e51f49aa90b 100644
--- a/Src/MergeAppLib.h
+++ b/Src/MergeAppLib.h
@@ -7,8 +7,8 @@
 /* at Tue Jan 19 12:14:07 2038
  */
 /* Compiler settings for MergeAppLib.idl:
-    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 
-    protocol : all , ms_ext, c_ext, robust
+    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0628 
+    protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 
     VC __declspec() decoration level: 
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
diff --git a/Testing/Data/Office/excel.xls b/Testing/Data/Office/excel.xls
index 7b9ce65907a1361d9ef2a47386f7669442a0fda1..262ff98426c6d401aafb0402a7b2d30c039524c4 100644
GIT binary patch
delta 5992
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
P>TswUUY^fB)`9#FK&a>^

delta 5126
zcmZ`-2|SeB`#<lP&DaK$ZEQoz5_ilXTb3ClOV(sd_I(LsiMlhWbc@i7h$11C7A7eb
zQj!~SyV}r#Zd8{DSB3oEq5Ajh{{Ck^-{+ip&i9-%?|I+vdFFXJd-ymrs9a;nv~EKO
z1ew4X)O)orOG`@|0RT=2%n>jUFcDZFutZ>mz#4%IEcctTrZdvwjc`S34+L8fxFOhz
zz#V}n0$#rtug-IV52GXbTgP;*w?{vQ%-{rc21+6k{)`S6ah&~S+4;2-j>p7`v?kG4
zh!=HuH9U=J#9;vhP=F6^#4<3dK!TD2f5DnTY}gd1{4XmZoQy2H#Lk6~ijVV+G>uSE
zuq0ki0fm9|qc2e#skf*XsM=r+2t}BB;42>myWrIj=5D+kVoR3o)n)q_FSp^Ru`*x~
zS%ma`?0?U^(kuGC7uM$I&FQdgqn7Q#WqW$rcJTkt`5}M@*HO#Y^3&?_%d6v8=0^b(
zOd(Jp6qiZJ#+)=IVx@NBNnjTq8Tq}Kf#4TOBHT;~BYD~m-u(tx;1U`X#M0gign?A-
z4;~uNb0q!;4;@z5)n9)T!h@U0hH>;E5R7+2z@w}b6c7Pm(roz)c2W_k5i;OIY7~4y
zR}#LjE3<Z$0FNUiz$0NNrM_}_*GJ&Bzd{0*)YC=PNpLsoT_fN!fgs`+go)<q#3dkx
zY>1d4@*VL-8FHJ<uL%-UU1aSKjHvrfCZ9H3b*XU%rY5f@U=c#mCIIf(z&^>25Soj2
z=z*LBdA|o)Nd(|gMC7Rg01eQ*b-(*~gr9xr|KY=|_~6w}4`uw70U!eWByTr(7qSW&
zAOiR%ZIt2GG!59qSyEPrHwV%O1A)oSNRy2K4LG1TG((OX>%4@6<l$IPaYzWZjnIVa
zJ%54v;bBh=NEjCOa-z)g@wSW)2q4R}BQ4QM#DHx;5v)RX1OQ=}<3$!P!HEF$WC;#{
z3PHm1k0HV5y(H0QSxItmtg{J`hET<U(i8@voW8Y$<+eB*pfIknjDbSfJ6Miw9z8%M
zUY8tGz&{u7jFZ)|dIjwBfMu^t>@=sr;;D`5VHN3)32p2FlZx%CDHEwPc@u~0he#XR
z&3Bbs9_TNADyQYpQ<xnn;J5AEmiwuhY9WkOO|=i#jjrFWCHy@0wQ-GDrJK^I#?Z&7
zW8)=%28Cs&q-YR&sC(j=-giF@vQz1HVq3c``6e96Cnlq+qWI)bB^KsO$WxP*;dS;o
z;vu!12i<!o6^6+sgt}vXLL|4*Qu;52K9AlCmyOsq6cyEF_q3mCe^TGnwX=+l5jq_C
z_{BiS_VJOj#Knw;cV*)#&rH7DF}Rmpzj%N_ZP|6<h-&F0@dua4{TQN@mIix(r9LDr
zL#|mRmU-g5`aa)|FjKN`#a4r!l#LyWIw~xw3L7_Kacxq1=TL2{+~P^`e!CeZ(f+X7
z=_8Ey_6MBGOTB9S74Zi(MwR=p=`TwQ6Lvb;eiGY+e@+~IP>;D=YO4_6lEKJz9zWPF
zANMQmF1F~-opPhnqnK<jZF6b1^sHL(MdM6oi(fNH>}{VL`<U8^D8I1Ew}K>lrd!;v
zDwd>p&5Iv~ii`)$LStvFWOPZ1dR3(1JZ9NTr}kKzfOW@R@z!@&NsJfN8Cf$Vx9q*2
z611Qh+I!*Qy`l9D4=&$Z5+BG<B8zMljS1Kr3O=A_i{mWwt3T#shiqT(%kKH7EVic7
z>ZD}7UTJs3;y>^EGcXyimr_LBb_Cxrew_TaSF4;bSQf8PlEeCy!J1Q%Ff4w$o}lvk
zKFB2@=|x|5^SRUZbbc0{KVb*mT<F2}y`MB?cgc>}&kD`W=q>i;tcj;8@g;`M-gx7L
zn;jb4*UKmfxVU4Hy+><U;sjHC(6V($_1T%~>qCUtl84ErhrXb=klzvL>mz#1-vt_n
zr~H-VW_apDipV4pv2i;5V4+13e7H{rCZsjXIwB!DGK2R7$cvXPtD@`&RjgW81vPs`
z6|it19>>3|2tIDJvmpvoe$%?^C?W_|w%pT01&<itRS?gqv+$@_b5;rSx=+KV%U5hw
zZJOB0$`ju7G~vMcVMU+bg{;@z<YwvP+xt}3YE-i*mUgLYx7id~2YT-JuzTO^lknW7
zLTEqf3Ta(6x%y2zqJn9|EqSH)J^b-aM8mf1qStp^orq(rLsZ7ZJ+#?rr;1%wq`c2~
z<f^-$oIZ?OjGkN9Ti~Djwp4rikFwsp>2n&+jEX=zHSJox>qLRld1l>F*MPr9J4YY7
z=P6~s;fO&h*r$;SC7EU2x84WOAJZ97=uR9kUTD)bsJi(@<6U~u=ZxCCE6+sMonk)j
zPcw53ITPv8M%OQN#0$zQv5SMyH}9tmQEyws`1iBdOYPI&$l9N)vMG|f_?!qcH>FFQ
z%J6$ZMw<{LJk+Aj7aJR@`pdPu4rw+4zl4+7-M6>n1x~5_^5AUx^bzayKe5+d9jN7W
z<de(h`A7nt?RD;fa)0_g5z)>L+WWTG|F!-^r+%<ojYCH4fI($fha@|3YP2s+bfR|K
zK4DqE<}0C?SC#=)mEHU34zCM`y06i8UgkIs*JPg`&8>ObS534PPDrmhFw%GE%ZDpw
zW(P}$s&3E{1;YODC_GW`Bh40h`_XnP?qd+8GJJZ;Lhp_LsiCfs@yeGN-v-}#yQVsd
z{geW^r!KtpcvSPt+}Ph3Y=>kgr^B`hOYfh1n(rN6x{PjDb=tSxrq(cDU_W|1Abi*K
zP`_Q|l@9D{Lyv@7$r9DSuyzmqJtV41B`@2H3;z@3UlG6FTzGKs%B-wm*`1Hh&raI+
zJl3!X*6BRqzo>TAEzV;$(u;ncbu41d18vnSi>8csu{pg;@=8y%o<5%;Or$&$uSmM~
zWw$K6#FXI5hGjrspUz|c2Jo|R8EA^92hzv?(t~g?KZu@zwIXDpRfr6BKqBz<2ruaZ
z6dpJra`_fK)+`4PJP?7Yk<t(Z+e8{bL?qnM;l@ZMIe8>Joke0~-47$ag&QI-+`x@d
zVi++btfAo62vayDN(&PEI@84{X^i;y9-(M0NSxP0UJ10uU<%I*R8vT}WMEeUl_<O;
zS`u9zfds>Y(Xx<G2BOC$gl>k!sib99@*9#Kr`<#%_G8#LSdv}4rF-)rmDs%Xt&w{(
zv%ba5BHfc%pziACDDQhzKeDw>dElACdG9N;dq3-4w+{Jxwb`||Y1@Pk(gS+tx|gOp
z&lE;dvd&$y`Q&T*+OEc1vY^TSQ}^8T4d(q?zAc<So6239>r6XMe%1F`wFWBaY48hW
zJVj&F%8VYbb_$%n%C5ON@y<%Mudu)G<>a4(R(sP_WG)2hWQ~Lcl9kIZ##078dMCRE
z5^Z;@S1!Dwq}S*)37_)57a1ojiZlF-OTM!1UZk<S!?2H~*ah8`VmY+7oRRb!+|*5{
zIdsC8-_|dtkFs*|>{CZ>WE~eA5jE_4_Z*0Leloo~5_Vnm>Mbr?=qzQu;a{Z&b#e91
zbIHQ3;jz!U>}-bz{Da-MRPJgkPM4w2E_{6VX=-kIM4UWb(_-l`d2fEMpEFyn=uuD|
zElzlE9U@e~NXZ?m4?LTnGklWrI)ke#@%U9JYk$a|O!P5710Ve&`9s!aBYQhTbq?Jy
zAy|z02h`3h%{;1<VoNh}&{Ct)ZNqJbgmwY!kcZ~k;p>OvB%LOAD{ijx6UbG|G?x5b
zNDZ~WU%BB8UakD-<!DVzUfx?9U)kO48%A>O5>jI)l2VjUm^*f#Af}D3zSD9@rGa+!
zr9mp=cI|Eac$SxKIWtAB*4*}FyK<;gp;D3&U(S+bQSNE^KT_G}A5OHsvkBw=#$nwU
zg)V3uc9d~diJtY4jHsC5TMC$u@mhNYJE-y{-}x7p<M+-C369R+dO;g`b^1=+oy$UG
z#lN&z4VNa4;-hWbbM^;&X^>=OBLrV*PUuM^Cm7S;F=dH+K79AqA>Uy;)VR@!f1=O-
zq4q{=VNUMv-N%N$q?)xFW%P>XUg_!~zV#hVZSx|XDN0K_+r7_=d1FXotiex)8FlE|
z?a!1br?+#ZwL20^)A-J8DqCtKKe)#*sW$~MWI^H|X}6kQi#+A!u%f#Zd%Hs$mDK*i
zenGffcgo&#M{6mGq4UMI4_~CxTyXBBK!ni%VPqf`N0EAwGO?j0HFYBN!PtSw%IPXy
z*(N!x#nG<URUWY)y^X!w&2|yjNEYZGzO^}}D66N(N~v@FQP-<rc{g;XR2g1aeUIUZ
zz7U)6A*0KM*wnoVp6L8&OLqL)%lh71FLgZOggeO$mRo4P&+mFPt<XJG;xrp7@ov6R
zJ>iUSSmd7<il*-!3{DYPeRoZ1*Y3Z3hW}3ZL>W2hXF6dp+KY2G9xpuK71D-#qwi~C
zcW{$mmgv#&a9Yr|d9Biix1VZeQgXZ8Qe|dSosy+<eQ%YR3_md}tWa$uP@>-WibT%6
zd`ab8-oZ*d3C-i?p6L3NSG{?WQ?4(UxF7(Fgy;Tn44m-SC4b*RWEYXt;)fyyQ$3aF
zk-RhjDa1+M-(&zVz!u=ZDJ1jR0ujJ4;`w$O$}FFT@<0^!P1+;KJ5N_mD+~snO!6f1
z{%8DO5sd$uR9r|t2(6sGaC3$oj87JXZ>8w{#6Fnt|Fh$ED{|HLJci(xXz}`eE_mWu
z{Z9b`zuvH{J6qj)Fp9Yac0`llq(h=2R|m!BuN5;Iq5ebn@(0A=BZpKKe)9c1mizor
z1qwOY)AAgJXdn>i0A1h@=)i#cJWmD>X>vamuZ19pODQSggN?HSdCf9178y~OC7tJs
zMUpH&BuPS&d8ELhRTkf8@dLqNJ$$vw=DTNkUYJ;I^4+t-@%opix;hT-Iz`R%4TO7Z
z&{*EwNDR4{C6njNf)`HZyYJBbO}2QuyG8S>MD1SgkzG6n?`9n9|Iid97-qYNlRUic
zkI<5Des!6%Iiu!c3@%RX*~{OJK7RAlgkJXQk4M>D^szq|#l-n=si#FzY_)n0gv2)9
zrBTn=ppeYp8ilgv2dzpZtTpd)17D%>Xe3vYbz_)2a^hmbg92C>AX9@xBNPFPB5Xhr
z+;FHkh=j+A@uS2H%rs=2aX=7dW6X~tNC3zno)s8_j|?(FNyh^gK=wTbM1mloDg;7-
zikT1KQ}+fNQ>j!cjjHp6PSpf>G@1zrC}9W^qf&MBb}Q3>7FC(5%rx`{Tf?FQW0K;%
zfy>T#R!|h3R#A&$qrCZoXj-gDB=K~xvs5%sV8ygX`LV)cq5%~^<{6d_!NFkxdn_F+
zKrjb{fq-<&<3b$Kd=8XmNwcuh2NqNvrlu~#3YcqZQ?(hI3~LKZU5=%>Iftnu#KF+^
zTXKp*;{2k3qE%RAP`o!&F(xW1CK`>kM<$D7$Hd13vlNlH2Yzuuf!+?l%4!qSQd`d(
z*t<ArS=iYr^JNk<>=m{3w5W<`2miF2igscCaqfO`I}!asBI$i-3m~4(N4YJXUgHWv
z!{WEb#6|d<#l%Ex1X3JvS98wUFc1&6wtB=lf(YQ>3dOWSGOO+j(E0^rTg76K_fZcS
zkTxTk&Vl6_C<s%ru8q=Gqr|{#Fd&pPW7o=i4fTy}WEV5#ATxIs2-OBM);QW`Tn{<R
z#q3NsSwX6gOzS4oR63U{FtXlVYfB%Q-c6==E?c!%<Tb^eWFlh=OhJotITxOwh#g1b
zKWKKBG7p<{G%_N*XSt#E3YdRu_DCb;XT5Se8plxf`gDD5a|4<_@?ri6B_V=^BV&US
zRgbDeW13sgm<+nPB|~QgNbg4G1|@w1eTF$5aq94(!{9D7EkKYU_tW(j2nXsg%WuqD
lnq#3sSi8j*YJhjQFd;tpX3J_A+e$%Nu{#a8X05Hze*jKCZ$tn9

diff --git a/Testing/Data/Office/powerpnt.ppt b/Testing/Data/Office/powerpnt.ppt
index 9b80b90f433ad1d48b19798e980813ee29bab016..64de7d2514b9084fc57535bf1126f056412edf0e 100644
GIT binary patch
delta 63
zcmZqJ!P>BZb%KE+0}Kc-Ff0YK8G-oU|Ns9%!XP%&#z1K%c83`U4(|`Y)m+T9y_kuy
G*B1c67Z7Lw

delta 140
zcmZozz}m2bb%KH7at0_6U|?7cWHJKrzyJULgG5&X@rsRs(oF0E0?rrKW!-EpX4+oN
z#MtXQi7AKuz}Jrb8?$b1E@tXwoWwRo1gHrNRsnVW1+qYR^8~gOMqU=62rCea1M&aO
Wk}UF!jB6%avL0W=$F$6ckp%!9moj$%

diff --git a/Testing/Data/Office/~$word.doc b/Testing/Data/Office/~$word.doc
new file mode 100644
index 0000000000000000000000000000000000000000..58d84eee0a34ba3295ea44b87f126a16ad8653d6
GIT binary patch
literal 162
zcmd<+b({6@LD-}=22ubELu~Z>h$Z>Dehdu%>lqk6$W55Sz{J2H(0i357HE(Z)Uc+9
j&U--eFaT7-08+;w026`GS3`oh6E`EoVEXU*d+Y%KiZd3n

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 52a40b34913..ffb2bfaacd8 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -3,9 +3,34 @@ var g_testname;
 
 var FileSys = new ActiveXObject("Scripting.FileSystemObject");
 var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
+var WShell = new ActiveXObject("Wscript.Shell");
+var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
+
+try {
+  FileSys.CreateFolder(ScriptFolder + "\\result");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\excel");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\word");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\powerpnt");
+} catch (e) { }
 
 var MergeApp = {
-  "Log": function (level, text) { WScript.Echo(text); }
+  "GetOption": function (key, defvalue) {
+    try {
+      return WShell.RegRead("HKCU\\Software\\Thingamahoochie\\WinMerge\\" + key);
+    } catch (e) {
+      return defvalue;
+    }
+  },
+  "SaveOption": function (key, value) {
+     var t = typeof value === "string" ? "REG_SZ" : "REG_DWORD";
+     WShell.RegWrite("HKCU\\Software\\Thingamahoochie\\WinMerge\\" + key, value, t);
+  },
+  "Translate": function (text) {
+    return text;
+  },
+  "Log": function (level, text) {
+    WScript.Echo(text);
+  }
 };
 function setTestName(testname) {
   g_cnt = 0;
@@ -26,12 +51,13 @@ function assertTrue(value) {
 function assertEquals(expected, actual) {
   g_cnt++;
   if (expected !== actual) {
-    throw new Error(30001, getCurrentTestName() + "\r\nexpected: \"" + expected + "\"\r\nactual: \"" + actual + "\"");
+    var msg = getCurrentTestName() + "\r\nexpected: \"" + expected + "\"\r\nactual: \"" + actual + "\"";
+    WScript.Echo(msg);
+    throw new Error(30001, msg);
   }
 }
 
-function CompareMSExcelFilesTest() {
-  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
+function printPluginInfo(p) {
   WScript.Echo("PluginDescription: " + p.PluginDescription);
   WScript.Echo("PluginEvent      : " + p.PluginEvent);
   WScript.Echo("PluginFileFilters: " + p.PluginFileFilters);
@@ -40,10 +66,39 @@ function CompareMSExcelFilesTest() {
     WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension);
   } catch (e) {
   }
+}
+
+function CompareMSExcelFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.txt", changed, subcode);
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
+  p.PluginOnEvent(1, MergeApp);
+}
 
+function CompareMSWordFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSWordFiles.sct");
+  printPluginInfo(p);
   var changed = false;
   var subcode = 0;
-  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result.txt", changed, subcode);
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word.doc.txt", changed, subcode);
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word\\", changed, subcode);
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSPowerPointFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSPowerPointFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt.ppt.txt", changed, subcode);
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt\\", changed, subcode);
+  p.PluginOnEvent(1, MergeApp);
 }
 
 function EditorAddinTest() {
@@ -246,5 +301,7 @@ function EditorAddinTest() {
 }
 
 EditorAddinTest();
-//CompareMSExcelFilesTest
+CompareMSExcelFilesTest();
+CompareMSWordFilesTest();
+CompareMSPowerPointFilesTest();
 
diff --git a/Testing/PluginTests/result/excel.xls.txt b/Testing/PluginTests/result/excel.xls.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5e7f86224a53100e741dc9d49eeb7aa39a679e07
GIT binary patch
literal 2740
zcmd^B%T59@6g^u^{D%n(qA?N}9zk}9pbIfXG%kpXL0$$01DN=0{($kT)N|Volv3lw
zrDoEZ_V(P<+tc1@KR>#-K!isOu)r;Lv7<^C9gJxkV2Ql3N9f@WDL!fSES1mFw8R?G
zTQEE5vu{X?@QFvt)ZTKhx%XV$j%e?(2y0&<2CSv%nZii5`>L(Ig=;getco(ilZr$~
zf5rL>qdvxr-+<9q`IgyeTwd|IsL(-$L<cy<oGj1e_j?t#ym}t5Ge#7VY018#@(^XU
z#jkf3+DBBJb6skfQlBPcnUO`?^lZ=B8q#LtWxjd@?Jr~0iJKZ<7n>ooU@mb_)yE#T
zHlrPpAwULgg^kCxW0G-)R*derE_R!B9f6C@;6#lpoc10F&EC}Ov)$|4AwHC?$#3*_
z=W6qbF4DiAov-&hMO|iBnN4P2uOMvA3P!V<SJ48JXeKCo7Jpr{qS36y{XOM+Hkl2Q
z>m`;PpQ`l^aE&Ww+yQMz${rx(H)Qt9TDa>`Or*G={*&URRc2?YoKLq>BHaY_pL8o5
z-5NYO<n)^3kox7h_sXcSR$!@^^UU3e<wS}K>hCLBr*?9FO2+qj2Y6sT%e)@*lw9CO
zDLdgmK+fce(Om24_uRfub;v6JkoX?8hkdor1KQ+iah%cW9+QT?JLx-BL){4EULzdq
e?D%Qy_`FOOX?#*7L&yKfWav1*lcD2XE$A;}c%dx-

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(0)Names.txt b/Testing/PluginTests/result/excel/(0)Names.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(0)Names.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(1)Sheet1(1-1).png b/Testing/PluginTests/result/excel/(1)Sheet1(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..c279f471f1d1c70240ea7113da62ac999634ce0b
GIT binary patch
literal 31086
zcmc$_by$>N_cyB2N_Tfimvl*YgMf62(jhQIOE=OW2m&JA4MUeSNTYO#^iVS}z`61J
zJkRer*SXF)@B7#L2Nw*p?|tvR;<G+$?X{z{G!(I(l0SX)=n<B(lAO+?M~~saj{!O=
z@SnUdLO#H+#~wP0GLI_9DffU6$ad1|(vKe1Bs@b{q5z*UT$PMG9zDYDefW7i=u&L+
z=n)u6Sx#CHWOmq&0wOYK>s-F~9tTf=R~wZQLBVZegsfU$K&+gvel63zMJ{S?YfHxc
z#fgmmIO*lDNZk4My3J0P3ITpg7WL%GuOF#$Zd!B3N6DAlvVNVFH@q1$phXX+MbBTT
zv7aqXX9NR(2R{!lH)|*V_un74FdhbE$Rx1<BO|SzD(5^r63zOr0pI>>K%{1*LP2+%
z_c0#>9i6n9EH1J(4ETD30FQzqromx8-+g;HlQ;0rudly<$QTz{nve^a1t#aXQ2ki<
zo7xAJ!eLA<c#ZYo@PB>z_3Kw!QBiU_I=W2WcRv_0$@t_}9#-T^H$>3KLeI;KXWZmG
zR$f~5s)BqtjWg!m^tb<>+tAR^qATdJ%%%7fBqUy|KJ-{h5uN{<z^Xr*i1fu<+~D9~
zxs&p{w&M;0{YzwN+<WA|OJihVvECj3oH=^|VOSZ6qbO<3p^Xg0OcIy&lhM)D#UmhK
z2=?w%)znnf(Mf`&{cByo^K!gljGDj}ar+5@!4G@YRe}N^k+s!;h5tVW_{qSse&^@s
zZ!rNv4kZ3Ne|dR%pH?F<H22Bh&%_*tv;$Ru8eoKfrCRH{E)z>GpaS`_bNI7~9=2~s
zgpZHUH&R!{0E{sNUU!O7Q(xa#ZP{DxFwdn|@mjy{SBpp3=;p>opOjKz_F%bDU7znR
zpx`^~huwyj8#iGysibrzF{yreRVF{0$*&k0aC?10%4ehWMkK*@B+c>;0f(*tYob8|
z3_+4EhJ>5g35t*xc)GK*lfi3^dI#IYp#$tFvL_hWe=hC{b8fr0M7nrYnt7WSXE-($
zTe`|5gEt@#<iDE&W%(sgOW@++(WNUT<%)W;y{a^c>JC90Da7|P^*RM4wMFuG;H!$)
zVO5=Xuj{+pnwuln^e@<7m3QSx`11I{PDb6S0sFyodQe;-+CTH|iaIzrWJ~xG&z9;F
zbfe_v<iy9uV$%5(W}|houI&Rh{I5;FeI~}rsvPP?M$)d6<4+}x+c)^XV(d?e?ly=t
zH8puBB5W_9Q2evpBp3_?gTWB*01w$v4Pn$IBuAjI8#g-QA+?^s$FhX(-?^p-lHcW%
zNEVMayKVL%pxYz7UI&I?PT-~K{ff#t2~CIl`!V(PFIqxrC94DP170})GDJvT9xcZ(
ztAFx?u0Ew9zl@*>z}?-p?rw5f?NGWmgMas?IZJEF$RLG)PG#g=U8_x0aFG-FX_(+$
zT`%=YbWjo#6WuYS{nj@6V*peCm?0H-CmwKr>&;t*MH3@IOZ(D{O<3GG@apI@1esFw
zJ-YQkEZ!L!Hsy1uk$7OQNkBve*0W~>E>&elb>Gk>tFZy=cJ`~^0u-RcJxY5gI2cbQ
z8-Y!=RT$j6I<it>ECg1*TI>C})1+*@0s)gs_|!ufv9bX;NTd)^x!WE|2i+lBBIm2j
zM+$MtbT9tQ%KPq@8C2cX=WK3mrL<Jl)ztx8(9!1)oVD)_$Lc@s{rS^4#o@)L(N)ZZ
zgG|Ze(V}*<p<nQ^orA@?sd6KJ?eVOnXi*5WESwTj8nE}HFf(a)HK8^hZQ>WvN@pOq
zy|T~c0qb4dsV!ibkni;HloY~Woq^^EyjP{ja2hQxe@O_li`dreh2O8kow2N#3(nW|
zxO}^T#Z;7(wFe_j>$WrDny${vtthgxvWQ)&d%RAZyBz^8!Igk2#2XMMg&^kL-JKPU
z8P!Cc=i!A(G&MDKbzNOZM~7qwe1}4Nylx{OGhOhQu-Fe<GF&211j|KdP2FN7jdR3g
zFr+g>;hp!c^-?;kE^47lD*nEp;{xq4;Fj(TF<ZU8y;Fs%B#9!dCyoU=g(@4`j5%Q^
zQpFGteHocxT&am10J@o+kwIw__lBqL)Z&{PgPS+_$W>-5O)j~=Ne2UI{J>X7%YmgG
zyHqeyuY>11V3*rQr=QValz`-+pUdz&2%6M=9P1$a@QL>j4k-`q*(%yGe^>ul?xVHO
z$aS4|W^L^`fsL8`cF|2Udp&kc==pCyT6;=VMSH)0Pw2KiOq7w4fnIW^7HS7wI_}w_
z-_1m+lG$<@+t7z2pBhk#gS5^;25T}dGsW6F$8l&A7DP3<;$VEKdxS^Y#S+yau$b`N
zfNNzlwj~b3>PJXu*eU6ZAh8<&p5)$)-w?kI90yRyb`SDBi&-I_l9d||Km~Q;p)<uT
z7!65I$=LzK>u~Aq<d?_i=jU>s;_2cfV0ZUg2%202+iJWWRKR`)ced;)<T|&h4LTY^
zD{S&dJlR0l|GFO3DSF?|s@)mjpLoG04mzP7@!=AcKNp|g&4h4Ozn#h-Ey5uLa9A#U
zyfYm@#W(P5$ezRgTm>`@R|sjb&L6O+U*GA$D|drGg~4-`u6sY2GCqBZ=F90mE5Exu
z{0V(s@;T99_iWc|Y;?5t*Q1khX#@zeoJuPU@xQ$}?o3Y)0<gQlbAJw+gj|K??(I!-
z2EkC?`%+YGJs3Z#mMf+3P4AGz6O{Ym?)GLx6<6IDBAR0`a@Kf#(0%|IW8HgZMj)P?
z)*wpM?*?fC`{F2sPR{pqf3^D>*bv^|U3JQfNu*x{-p&U`sl`;)H8n+4RB-xS{6P^C
z5_*5QL?q<0Lbxps^O*iD=KW0&OrQLWge&ro_ub7J{qEtu|MfXurw~)~Ny_d|&CjA2
zMHdjo*4jJR=_c%A-n{=bW&M2&8)WW-sww=c#;X766!QerL>4ayE9`PNThhPv`yCOp
zW)7n0)1wDT!F034N%)S5Cbq}R^ufflZQd@$dTgiP@$W-M2A{ahmZmOzQ_m7qQc=Ob
zftLD64rl5tf3M>_9L=E>9v)*jHl1kk*wxr^2}euM5}dCz9jVP}Qg`sU_@l3FHsd?*
z5l=1g2`&Pv7+CL(kT;fyz}YG&-|SXAo(|_eQ^W-v3aT1Ub^O41f+zj|zrykVZ@m6L
zKfn)<8K6ZP8X8di2YTU0$p}wi<l@3^Y;0^9xV^dBu3)mVw)XfHKbXpHaHq4C&TXy`
zM=tO{FaUNStOTWrN>3*t7jn*az@!w`T6x_wHpV%42-2%GAp^KtTGQw-@JkDD4RF*0
z<CDZrLfGxV&vuKo@`52LL|kxGEb{NFK*U8pb^Ev_^~6j+@N}b}WA+fDay$N6%xKur
z(b4tl$P`@F8E&w7ywXm=pctQ`TI&v|EAjAw0`;waV7$jWDZK__n@tn|W9wyA9oM?>
zFVZ1f?RTHhaHzY!e^)ZQ=5KOdmH~KLe_a3OV8XV}!w$aFFv6eol>OYFDPiE=&h6{_
z%Oa=0sVA%6jrK<1oaWvm(8fLq$mUA=yWSzdzuLSt%~SzF;kL*oanp+T-j&6B1cm{8
zwbgTf5{OxD$tMOUf35);MS)#hTwXXWopYC6K9FB}G2m6ujs9nVXAi4_dr>Aj&)qf$
zqRg&LTi?T{8N8p)oW=u7dX5f^`<R{0QTj_Uj+`kSA@J_qJ7M3;a#&9UCK-MD6D}^U
z-!mn;@l+RoZBI^`cIX}pR0ZNX03^L}wHlbN>cPy+tl-$@x&P{g%L*m1kMw!JuGv}r
z$Q<wb>F~dd5+F{9)u5&X4@(?saYHV+!>{G#{zf29Cab!K$4K6s9vmF>S%~~qj5qBN
zi6y8Aa=JM<@*h<_?CF1v&;x3JVElIs>mff+ng;RYEZ5f8KRg8Phsna8J$&O5ev?u2
z2ZLVd&3JayYQT-U89g8hlLz~1Z<ny2D+l0OuA4_lXmB!5cKd<e_An_90Zi{{1P%?c
z+s-IiOUl}b!3YrZaQF81GFR~enK(`#OEz{wmrvGK$>>gxmfJ>;`=_UM5lAxumUsaB
zuuPJNMny#l1ArX>TSu#ZH?7c@Aaxh1n$8s^REgJBXE&i$s6uplDY7m0XSq!Xn1RLR
z)RushG*ZA}&L%)e9OQX^u|L1f*<k|n#oU?5&4st0fVp7*lY1C3(vXqCi<(MpZERke
zo6}fYTDlLVkBy{rpB@L^i;X<9qokrL`E2$EFzmN;<(Ux1ZkM2M8lTy?{aZ$JBq#t6
z1h5^T$2|)R866Y=+vL5gZOySe7Y7a4TUiAc7e5Cdrejt4RO%MRLl{qgPch7t>Z_Vv
z*RIb_imNi+jpob8@VuR*1uORq4@Z~oV+6wnfk+dl5OTIVQ2+#ow?7*ziW`rAweVwN
zV)hkShcdzeQyx~uH-SF*Z+eHLdy=?I#5XT^HdCj~5I#VQaqmfu7$<(}-k;^(e^<o^
zC?2kUbjpzG$$Td?i`v-OxCPnO-5q}wk4}GH$Z1K>ENQJX@6T-6h^jeP-J3C)&Vbu3
zrmn$3wB=UM0zrV~-|^NeNdhp$pb*;yMDYj4dH^^&z@EA~?=HA&;y*Ip&l;HL8C02V
zh;7ukZ>y+f^2x7kjO+j^q374{prD3?EcS#wd(cEYl~}lTfr4!Sw|L#Ix+NqQpwYRs
zgMx5s37^Q)YxBTc{qLW>F{5K*lIH^!n_F5e0d|RwgF~{4mjL+VkOM}1U7g2{cW+3O
z7y-UPrO6P&Oe0qk2#C&+0o;JW-Xn{s{LNm`mm~gnlCyt-y<A@J;H!li>j-ooEN%e3
zb{{A{8^HSvYplXR^1KQCF(e}n4?d%brJVCzPa|9SLmH>?@Pn`P?S?YmlYA{Iis411
z3VZCtLc(F}2n2%X{ckM*agF@!{Ll?HCP2Qvc6XJq5npU7Q8|}A2J{V@4~)4;0D)iV
z@E2=+zZd+#ljK%A{N3PCTktb_7D`IWJ_itB_?#X5<aKuwkbqlqkDbvWgz2dec^Ze2
z4g@nAaQAAuq1{IlrK6*xTTB=$b81z|V_6=%<9Yr!mr(pfs=L<3$4IE(Rf8HD1QZge
zIUg7nketIQL2xJ&K&q<2XKx%AYvqvx322lhU9f2+V+Ea-zN^Z40bZXe4}C_=(Z$_~
zp#RTvYgH<@*ZWmdfF+Lpo-V=xvNt9dX#^1?{MWj=q{(@fpc6hX7;1Cyt3~$#mbIHd
zZg~V5%x677EKPMoL+Wm1XE0-~*wN9EVT(HxDh@SAuqX>Y@~Ngw(!^sL8X6$;eF|uH
zbhMe6%Ovsv;EZtt`+<Z|tIA9Q9Q8duEDWVouOt`<I+1Iu^MEIAHT(;-xFcg?WC2Rd
zZ#|sC3MHo(0t_q^NN$HzLj@t>kxkv2*}~f5_Qic)m6Kf$mjuA<52yub8#fnyCFP-r
zaB2eaaviENZqitJknRcXLoH$p;CsKP3KY}U3Xt)Ur4a=GRT}vhlK#KcPLhhY^x232
zTg8e~U`T%mQpkDFwpigoL67{dmc7xRJxf*vW&l_V3N*z}OAD7xzce&55*^4AAO3Ah
zt2pEW)KDHW;<*ZAJR+hnz-g2JR&Hb-K%?O`r&-2SlZ*MO{j78ds^vf|84oY7^!xYq
z5TXb2fZO^KVAG{=pgu###3ax4IN%O$m%?dG%*)FQWRCwH5fK_1Id5U_UAx)7U-qg(
zW%lClO0Bn8!DeBae+xwD%bS`&t;F7}tu+8B6->_07d_wvu<{3_5ELW^Y_l6cwrT*7
z@PP2y{QwhFBmeSBx|l5@fZ#^~RM)yE6hlc(tq(|%6F+{WtzvrEs0_(>?Y~77>EDtM
z^(RRR&0LAz%H=k<lSxZTQ9n84-23X$B9*t?sz0G%+n>FP@wMMO5-6>*dZ9iY6@)*0
zwuK|)-nuYUOvm>w)Y)+Z9=N6X5?7w$0UUGVL_Ee$0k~S<cTru-!e=^l8q$G%Qcnd_
zGpVGGXYXz=?RQvqHyJb%XzS$I_cy&hqq&?H<&whgM1>0vpVm(>HCm4#d?s?lSOT8}
zKVN##Kg`k4h#SvJfVYgcr(ULi6ioewh}|~4HeOSGjIF0!hDop3P{bos6Yd33lPesi
zNm~?87~RaO-TZ#@Hdj%ET1pVd%@N)_>^`Kk+I{(h2~L13H}yaS`s{jrhIIUl^9j||
zGaZReYk35DlhbV1pO$3tPC-AW%V%;}AL4F*bIge{T4cV_%bbrt7<}bSTwfJ4*u<pL
zI|oei8}%P4zEU-0zIPf@OJuX!K7**?)zX_Ef@|V*2EHjMFi*}4g_?o=1qFig^6+Bg
z)cLQpFGu*eSA}gzL~sJA{Mw{cI|u=;xBWkY#B$g#RD*IPrx%uTf|&@1*xcu^xlW<m
z=UO{$d_0zmfpJS0TAgnEcz!E=_4LDOtRe2UBT*N_HSmti-F1B^v?WC=zDlCXL@^53
z^+4MHtkeVwL82t7q}O$7*<mzgWs5BTtk{kkH+h>LkRj|#$1!)@^{0KX#(myx^v0S(
zVcalsy!|H6tl%5Z3%>BjBPT>gc2X=jhqVX0+c&3cNlgufe|%(w0QW^cU97Hc91vn+
z9I{I<<(rsig>G*{+RZd49;KGO8stU_x0t@$Y`z+x7{{w|jZzNvaC~Z}P`LIEL{E)8
zxYol?Q!Wa6+>RFavXD(buc(UK_JZh+1Iz>ir%XyVeH3qF1<HP{Pk^FX<V1KOQ8J>b
zkdJA&DEcJT_HZqjdji?K&P!s{#3t^B%lSlAO;$_vgbV3J1Jy(?NLTzMSd(B;4@*2A
zSwr%yZvm{T)$V1Q!lnPTP&HjTvvymn5+aF-8OJ|S<bQM^MC$iC`p|nX=`#WY$kb&4
zzuc(nW||PIW#!YCF|J?Q;55*{(Jz}1ZrOH+_>ergQ;72}2@*?g)wMyThD>w`ymDot
z%~VfzW!DOcpc?`ar^eg4b)n4j#F{qady)%EUyuuEH<=;L6zh|GJD^-mWsRt{9f@%?
z#cR8Sr-GBj^Hl$_{FB|SmaP`?29&C0=SuYX?+b(j18+!0-{9x8-aPHTsZ(2)AO=w<
zeqjGlBD|R#Tem`Pa<08unoI7zQgSM+6}Bsl;fkpqZ2iKup9!}u{&WB3@=cB1y=D2&
zdZOt!Sp~fbQh8Q|rTMHuS2MdC29@%7;tBXnCF(hoR1XB(Pq4h!7HU!&ZCE#wYPWb8
z0K;S9UR8K&kNQOS5l-4?G2Wl%PnG&DCm1QOX4W8@^p!l_tJqqbbjgTm3jwpvgb2IP
zrytygA~jGql63IWGeSYc+HR*H63XBRO)AS4cZt`HPB{Lu45Z}bbq+9E@OEo4@NTAm
z-p#>T(dPkO3N{EG4oN>7+-hFyyxlR5&EP?Ck?p}7xV+GKv{KD+r=TSo&(lpq5Io;C
z&W$H@I}7SUKJMa!r5_Vytj(gwP1C-ru(Z+)XA{9Ht;Z~07z-AqQnE_?9=}I`m*8*b
zI8~xZGo>-%yX9a`knT66qXvDkL6yhwZ|H%>do$fLdQqDcZ}5spATgUTOa*kfk8r_Q
z80j;V7eCvc#^ZH~tP)b5POecBAedI=Ozg-I63j3bwG-}Of)i$r#{t@G$ckmSgr9?g
zz9YjFtKSjg5cw70FRH(!7pE6M*Rt*66eTj&T*x;qa^~UTAsj<S_>6At?!7ZKmP!A|
zv$RV0iH6QtaR_wz=|E<4B@Q@hIs7yfm(&C8^DBV0M+7D@f^VwdXJ4rID05>uW~^1g
zSvIhf5u3C`IsDyXbsQ@ps*-%v9UQ7x*a;z;APBnT@z6JC$M!Q{q8!wLb?uiNIiYVC
z)PtXTymFCmc<m`C=)%m%ZCXG&mj+O0st<nwQ?|{!ogO61K#(#&t+>fNX4wH^t(5e8
zGQXw;8(;~68|zKC4cc}w5re)n27VyBhcuxYWURT=VcuEN5(p+E*qNQVTwR#GxnKwD
zW3^x$W_Xih);t{sh!i(sBxkC5jXI3|IH_hYNka6NPif{kX;ubbw`#%4sUTdnai%S2
z66+t+05RWR06^0{qJO?UvR@#*`DUTng9gEn-;M7jSBtLvc%?Q>F>kLKFD2T6qZ0L7
z&j2@u7e~zQ;mH+Pz`y#bhPyyJ2?1Cmc-QGTXB|W4ge&g{)(3x!U|fXuE)S(gRM+D{
z+Su3UXl#0=PyM~7^K78!=v4pq%I8VD?z;))r@L!qdKHgHh#c^6%Yvhw2);gkvM{>;
z8*>5m>&8b#KI|4%iM>KE5LRU!M^01kPe2EW7%TFX-*)*Xl%Xak&Urt)Al5kq$q=NG
zJEx4T1jy6=?({t2y^@|$bw#ZxQ%yJkOf@=0+MBdXTfn)=B%Tr!{1GUQefdHQ0)e`w
zr;~%}SGxoGB_$;z6B5z`)#bdJw^B)FT&L364XC9&kK-b^vlF}K&^)@!j8JKwEueg}
z9Q<i>;8)O%#|)cBfI-YKhoy<$I*z*rTu4gAjcsxpw@ZxO{;x%>E(&IF$KkWa1Z$o)
zX^W($v&e33W;hbJOyB8PQ?6XYC(qEWRAv+|aA_sWdz2(U>JzC+Af4{|+2q3dTv9Yg
z9Q?%F+Z#SFXA^-F&Vc1$tbP8a%CLm*+jtJn)!Nlslfvk-3^bva-*u85MQquS__!PS
zxUd@~tv_aW{Wf)X9o!%`GMU-eGKoZg&jDVMyq7*<OYA<QK)U0&EqEy~vQ^-gVS9Q*
zCF}Z2BF7dQp<SWi^gETE#mqr<_9C=WI%y(gVZrb;;uCO80i+nNUS4VGkq53rXMcR|
zUbR54udO1D_GkAqV+-)Q=RCS^%7T6#PghScklic`2(PE6z{L?*jUV1d*cmkw5Qw{2
z@6Mi79?$Aj`7nFRpBpW$%i^CT*`3g_30Id$BqL0{%K2UB<%t7>q5{%oABA%paw>FB
z&rcJ~e=i`EkWu`N%Lo?-d>Q3~!8~yM@<9Ak1i?9UXNo&)1{L9p&nhyCd&9Q;3BInJ
zU&&6pjj|i*P3Kw$H(gAx`Mjh*sy)aum=@#HKD+eHjTEMX=~fO2U%tj_x^hF0PovH}
z+mP6UV?ByVS381y%DL(Z#7~KgI1o;6x0ctx4Pb^BxLDOdf62bTb9xTj^cz6%wmwDR
zN%?5xOmYG?^)iX&=@Vs1Zw`4+f8|8Ftc(m9O--8iK&r@y${ZP}q}mBJBF<gAE7hA-
zczdjDkD$N#T>NZD|6n4c9Da6!$n;+Q4id+lv^Y8>jBWcm;8X=u8}j`gygPf&ow1c$
zb8!34m7bb^$lRJmbe(d%7Ir0k&K4XcNw}HrtT5J!Woh%4v9d}=eh;rRsc-~9-p@eJ
zhQ<iarv-AF2q~5-z4<eaOm9e;b{Y07#}$++VXR>OM?%ctJ2gadB&LafI!8`K=XRA<
z@NWLjkN5~XQkRef>&#Yi#m~AtznC#3G>WS)Yocw>PSIm`oGu_j?N6&f#56q-5dHN#
zF``OP|N2)|WNgu}jmdo_N<XrA6ko0{p1V0be0=!5e^iVhfb(NHsQ$+Pw+?}{YJ>AV
zw7O9opmSOse&G7I%h*2?azi56$O87dj0H~k6!33DCSQnSDu1}WVHAHh+Z7e&VMuS%
zJJY<E9IT(9!@H4>YMM~OdmjAMZj~_-8>|_Ee{y2_<On{v*;w^-9-`O0MjW!KcA{un
z;Fi6tegGzqY!TBaaB4EQu(x8y3hqVbwkKCBB$-7Y`nfcm8$=r|_+QJDfikJuy$Xvl
zyF?8K_~*<0OQ|0BUX2Bjj{Z6xW_M<vbepwQR9CCBc#JOov~8(4BuYc^SmevLCmzn<
zEMlGT10+%-%~)m)VYFl<e$#!AM7@ra+*bIhBR&&UPix1SPJn0qcp8`epY2=E^Z4DV
zym&XQtv5wMrovsco+MO8+kTy9Ze8*NqMq}Yd;ZJ#0l^tD-RG%f8zi2^gAk_;l1LGj
zE2U$G{%e?XRCWC{id<H+-DiewYvO4%%|V4X6IMejx`v(`#A&OTgXL{qp(7=v&RNms
z6U+sx0YYj&y{ONcDErDUd}}tgoE!rP<7_o`c;^QQHVuyCR;P3)A-9^vS|v|0fnyCt
zv7C1HF?8|J6QdKw-^Bo)5&^caWte0T(LS)eDdsAr#YNkJt^{p4%WE~mhj@`@outo@
zc12>O<H+f@*n8?#zLGufs`{SBu2&wZqF)*XRY_$lFx%WA6?UQ6F^l^Ex3*Yf__Dh0
z{Z{<#W477in5W;q757}yyy+lzI3Db}CgVW_@qhB7z$9Q`_?^x@F<!(yK3Em83R1F4
zx8atThx<cQ0FL`uSrSK514^dkDjBz^%VN<J8kJ$&V5Uds-eZ0=FgnMa5orGU?!0*2
zX8?%S2Yp1qNt)w^?#rYJsy%<`kA;h9t-|t5&BFOMsF%;meuv3o?Q`RAm>ujxVt@1%
zZr?ar+P{8mtCC8{@FSJ|jOveoQ=FvkE9>9k`@cJnn3v*SM@Ki1*ZOzh-3Z*|QM@_s
z2y3`3srE^UW^GLTEovvkrdNg3UR!86Q2Ak1>v^6@x}GUFN&~QPWMJV?Zn%wHhv<_S
z>IUt)8%DKHFHmI_@4}<fCi=gdYF9?o6dOx$*e&)JF%hl1I97XHGsaR+V(Q0@@f@h7
zK;mIVK%FI?9()%r<TT__!nP<ugQAIF$%s&KT=HLVjD2kv@y+zQ_xnrpgOOZ2AzsUU
zc76HOPZx$Wiv7d07Co1|lk)^**VQc!)u)zEUP-Bh%vK;9RyzhBU}(NLx)zI#!?YN1
zCa*`S3T5;GV(I`8y)c02wPg;S0=0WT|C6#G&TrrHe2SzgUhL_RqA*SWkARCBSS`b)
zCTWBl0ZXrYFA?mUa@LbQr4tBxnVaKss4|av13~=Mk590dLgMX?F(h{r)!yRf6PL^H
ziH^U{;$uiQ*IMBZMBVOM%xWm6wRz~^oz7vmRm@q=PgU?7>!59NCv8bRRCW>vD$}X+
zHfN7@h(t&rgfv@hW9jV1sOrXzy|L|AJg23otC~MYYEN2uX4qM3eYkvNncw@TrBbBa
zU=M^}yJtRbBjf2RmN%}x0HeOD3;dz#TvoFo!gJ;>{2C`?;L=VA!`&DHvW)k0mOmQS
z10wgotPRQy##&i6jX7G?@8X{GI!RU~%3s#7c8<|`JLB|%IW8xdRo3UryX96=UxAbg
zbp=ot(!nR^coE%&R_)G>2<F*I>ozgtUT56wcuRXzSwATY4(52veZ?#JBA*H#i*|_~
zc=zV&I&`k%?c$}K+WJibX^`{bwe=j4%QqNKv6<r_jK)5BONtJVK}~HM<3!jvN|lls
zUOS@+Kd*q`j??y=-(t?xBRvc}f4C;yB5?j7UQiC8`f$Vu;R`*L8HLsmDpQb?cYjpA
z8|>({2>6ZhN=j{j2D>YIkd?G)|1o*P@mM1-Arka$u5K%~{K*fX7*P1WcGDC!rpuLx
zas@I7Z#y#d?ZHsR>Fk0sXcz^j9}3?;ZNw2j9cF*RTS~b1NIo=(hlm=2*>mdPQhmLU
zE7i+KTo&KawLZetyh$1)6fhO3ycVe3sRm%m39l2B6=S8j)$#e#C%-u65N50OCDoJk
z`Tpk5U9sV|Q}33*a8%kyMZ19sPYJjfKB!8b2soP)4HGvXQ73$patz1GN^p}19rEmy
z-8E`-<i@^<XtjL)$>38Q+7LOiscB3A=aN;;oUfKiyjmYlMfs^(iM~as<YF`iBV6+-
z5XqajR8vySv<f(NwJ*40UX5mDNLTq8)gR4J?VwRxbl<+fZ2J_SQ<OYuKklaYZt}Iw
zA<=^RBdPG(D)(s%M|-x?Yw&Dfn^_3251d!+=NYbSI<?}yS+7=&yFU2$>%E<z<0?+C
z!~JB`-l@-m@Ld<#>b-Mzj^(pQszTZQN%9mH0$^qiG@Rh=E^|wfV)MB*+g^n(`%;lK
zj^!}hpH<e|>$?kf`<RMXJn-V&_$zI4FWrp~7c7~5R}wuxF6=BMT!_jC)PuK=k=*Yv
zIm!oOBQCNF4O^|G(wsZPZ4dafA?xAZmJsKQkq4$gGk+SN94oX-((Bjr5}{Wm*~;1Y
zfuapB-dzN9WF@Zp72G%XAR)q-C2x3*0i76y483VJXvliNVzfE$_k14bCxO>t>5l4K
zF%pKq+E@i!qp-+WPdYov3)nmdA0Hz(Q<BELUY$`$m?Gd&IFKU0ZF?at8*(Rnz1{&F
zzmd@n?PAlM#;cko*3iFl8am^#3Z9#1Pmr|Uv6{VoJKBPSDOM%j8T0P9J1wE7k9u%T
zfJg>8MU=HoI)v{F*2EleuB}zzEIZ@0ggU$bB9u%jJu1qt5{J(~=H@l*^nKo@DaS~M
z6OE7M#X3v1$@j04@6iS05GX|~7k#(yq`Lf_Js4llJuY{kmoT=ejx<?#R9R=daXmv*
z6KF!iK?9{ISBU%2Fe_O8>mGNW^2x`PPh7c&x!q#I*katR7DLx{)t~r`f2BB*!zso!
z{ye_fb6OXx!bqyHkJ%r)Bhx9jr*jRk7XLg&Zt(5>z=u=+>VqqDO94yrv~r2KL%Zyg
zrQH#jm=eIY6VefA;+mQYyGvu$Q!%!iF7ZA2iV_?R=?3<GZg!ibdQ@(xyks>eowY<E
zqVJ_w-%ay44IpD4PoZ#TRdhQvzKc)lY$InFYqjjuq|C-qQ%r__=CxnJRNK7K%!)Vi
zAhB4!qd1xQ-o~Q@&81HAJ2I?QyZedH6eeC5ld7tpNzRW!@tc1r!8n%a(tgzXo^f!g
z&<f_cw)>3iEsrZ*?1B#g1GC$dk%lPts)29LNRGkHekywi)K*2h)6b}eV`**M3D)q|
zJmJ#w<oR&#(l_4YoR-ZfrmRB?5r4Y5c*-C#-JcB3Zl+(2W?v@RIu&#7)34-9=937?
z&6vx@$|E(ZOSmz7bTo=lu49%Ve$jLIj;h9)l;G~b*06EEQP?26)U~X~yg9;Z<Q<D)
zmFQDdFKahH6Cp3%ANUx=o{7ViA%UnwSqav;bVUvZ^l23aL%DQe{^9Q%tD3<4**ObH
zBMO)ivp?DmJ^CJxuRs~JfX+A|av4K0q+L5&Xjmk+Z56iE+20p0Qf5Is5)r>+ltxeb
zFZMp4b~boP|ENOs-l>-kQ7Ai&=In2!9!L=dfaqET7JX3zYIYKS-Dnij#2R(dT20s~
zKpsT!TK`NW@lOCQzu4?xY@7Sz(*#+7U=*sG;S~dB-mL;uBDNZrZ!CA#?J_)AFp^y!
z6>ziU?Gm%h9G#2B%C$jwlP}Pe&u;5hU!L$0xJd@^(|tDZ6_bamJl{|C2am~WAAm>*
zbAp_TaxA<1L>7cvSxk27W%A{n-ezn8LjA5CN<&bihKM5eTsXDg>@ROz5WFTaRR4rh
zrk?ILU$TZ21VbIPI@=?uHmoNbQN$XAM@i8+TFQDQYa9P^B^<C@6GBy1gC)lN+5D5D
zVJP58Tb_12xE(>AKOy553cv<D4f02VQd3>=_^8tgXssa?$fvn(+>4cDuk2<I!?>TN
z9{mxZAvyJI-T?b$rg;J_`6+rc1f!jNMh2(x7&ZjiG$E)jvBFYpd{@5DJL-H&_345-
z!7XI52JJ3*yaKHU@r@f4X5{{r-*FCGVU-%`tH&8BKZR<7SY5Uhk~VdEO-?G-!4mGk
z{oT_6r@+CCmJwH|C$%?<+=mAeRG3QCakpcf$a<zFmu=b%A)pQ<tW-%YeLHQ98(><E
zgEY7D@(M+9vUw0)ulP06H?@=eI<vG}NlMj3PmR3x&-jb!sZKFg%=a))+*gj`F>wTn
zz1AAK+NNW5%fD(bf{`aag2Rsmn#e8_jvkl6%iPYB2=I09%!ux=(4;twJuu4#Fb6AG
zrD#7XXV@LogwbAR(}z=~ua*}ts!yiAld{|^mtXL>R8HKtF(m!Cb+%?*y3dclx_<O+
z@u83L&8SV%vLDLut&>&8v!mRV7)5D!X?sjWu6g&ks>@f!WgY8vKWDm~YX9BZdsZ};
zj=s$h>^1-6UaG6^)<6bBQ@5VP%!7qGV(Z&GgYSG_;|6f%=f;!9Imcb%E_PSxQ<WtL
zZiu~V`OLyxEZYf*&)!(hC1Ewg!cqI-4<r&h9g;NU@J!$MN3;bv0n8vPON?4<R`mGK
z3zvk_i%-#)?+L6K^k$Y6Guf=h#lz=LQz)L<O5QXs<(a;k;e)d$_*=GEaK@`6$P%CJ
z$NbsL?z_}PuDaB$D~&4R|7mscm30BMCMc7iyv06}^*&9Krt|1&3>mSoSczD&uLPsf
zEHVE0o?jRh#OtNCHd@tg{lF4NLACv^K&Tv1Rc8#4t36lB^0UO-X+}G16X>&Fd6qEA
z3M3x|rlwWsh8SG-hwgMng4+_?SXk$lh8^X_`RUXZBdt~RHnxF<X)kXE=-ReYZ&ONi
zzEMFS&z0{skhnQMHKKceyQ5ty2YbG^!REUu3NhHc`6SdkSA$ez(~APZh)k_IsfyB6
z>(4ohH{=D2=4iTL5RH^>a!AJgY6zM4IyvTgYbJX@ee*2MsZrX-?{w(5GLRz?GTyIP
zKKs^C8Pu=hE1Aa+q~(fY$p*+}oO(`h`zjKrKUT}RKS%2#7R*!^0vqDIPWZM_X?>Mk
z@@^1G-k@9TXFKIRAte=IHekD!Y{tuy;HE4^j`9SCO&_bF;a=CvA3pUg6jP_<2g0Yg
z`^<46R|f<6{1%q=EhLOEEFDC?=z?UW)ZAf9c<9%_%e@bpC_ttW9lSMrY`%Gyi3Gx@
zC&3j(`pbJf{s7|BH?CJ{$rR6>zRdi&rIn-md~o+{N!QlQx1Dc-ADlITKsPOCBRjhn
z=B8$eF*muYduE2QBBI&eEO@}|9o`SU1ySHKn4hA-2p$<H{IuTuI)%>XLVJz9^}c)p
z4}#NmgM!85J)^g<?4~d*g~(Vd3IgCnUK$#D1e~pYZu#dBEXpwl?KqT09)m8hFm~c>
zZF^Xh2`2bM^qu*k=hA+|L|%J>-nVl05BGkz>N}0YUQ0J;`x5>;<p>N(oQMN6%h~$O
z69E^UuZ%+>c3V-z4X&2%LWbp{@j<Q?yC5<}uFio!th(z`2Bpjsd!)JiRwVO-$%|Ax
zmgCrv7_A|LiZ;L}gMb5eWFS<E2Ovl(1fBchKa16P%yS)VO@D3!TAGhW*S3F%8*`)O
zlGGTl#H$zH7CIG{yr^o=$+a8A-ZQakqx_aR_;KVbjHmP6^cxV^cO-Xhnt=FoWTtBT
z`ta9yEn~k{4KEr3$Y<k*W^C-({WzkmaXNZ4pR|?B6=Os7&k;g(pLo0HN8DB?sPd;*
z^IJ27?4NS2yjS?K>Sy((7|2<XlEk%fm7sE#9(y@ipskn$C4-q-(BVfLBb;Xn8eN%X
z8Yh^MJ(w}K%@Pd~1b$R<##@lpUF?969tQ?4_5COmRctzXu6xaAg!2C>W#v3~+;M7+
z^549U92}GMwrhaUJG=Qq0M8fM$>Mb%vZc)AN6mXysNpQ)WUd!{<+fI^iAC1_g!%(m
zid8EGK##{j{{cEsf#O*&sEw<x?}xil^#=)wV3Zc4Oe`g69HH%NTdxTu;Ak4ZDBEiY
z@urP6TzFKVV6-u{ADpmrCGy`>L`BbAL|?F)e1;Z~;&HJ^6E&>OuI4?XptF(Q9Nj+n
zN!YNaj<v1^jbRz@gJ+E^DNip;y8v$YPgySKx!RMJLF;c9c)vc)X=9FjO8ydUb@IpM
zu7}hVR~&~6oHJDQ=>?vmQ_kJtx=+lL{}h2V37NIs$kj~U$>$B3t5lQb8$L3w;*PMW
z_hX1DzEy(u18w2|NIoeo=L7GYV0Gq60Z7bPBRKy#NNM&0i#IS|#1Y8;xe}s)(ElGj
z@ms=~vPo|UW{B^98SiwQuTdS#ki6*nm^kNpj-K2JUVezJ{}k_{dftrP`7TIWq6hB^
zU2|~1XFck6$p+CpxoY9$u{dXgMKFC|g*XFF^Pky0_BzngCK`iA9G5|q>hm(>zF!_6
zz$}DSap>p;_p2eTsDSGO<^r^S5rkpU%y~s`YnyzYS*P*y_Vbq;uZaB)K7hrLZ&!D~
zP+bxd%nWHf21bJpok%_hDr5c6qxZ;V*y00?QN6geUlKttI9ZHt4-Na`n@-UB%oi{&
zYC0loD#N~qi8vZ8@OF~7)f5kn-@`xA%IQlaLq@V+k@A8i5G(s$`VtYqW=){j*w{c9
zp&#YH3(dgoiWBVEo>;h;TcAC~+oxh#=6VSjO=$QM)`|8~R5c@IwC>W_KZ#zsmefTq
zc2Y(O>f+ValC_n<#CuoVy9YTc6DpF!tw%mkXfYKItu{a4N=S3F@UISkV?^E#85v6d
zVBbTN-p&{WP-Djp8yrSTsP=$rh4MWnu@~fKT*b0a_f~3=!sd-R$K`FOr?=CW+45UK
zds)(vUUqJG>M6c3_9(qB3=*KtDL4M+=K20E>&=|>7G>k%uhJjanM4ad{Cx`|w7nie
zRtB>QeWQOI11lV^k@IX$U3MD#wuac(Hwfs$@#Z`Mr~B8L1nl}+N6YU$3=WT?kPm+D
z=w~P>m27)<^{t-$S0h|)=!OA)ty4?`>}7<Lu~Qs#w(&C3?EBVO-LZ%|o_ByyQnm~2
z;stY(xsw87I4$zi$l#3KPeZJT>nVB0&h>pR8UHUx`JAN;?%h>N%`Mm%cJnVcyXM+*
z<db@B8PUQS7{*ChbG*OQP{n5yVlAlm7L~Q`2Jhzj!(nd1pra@a9NRLWtq5p>P+WAI
z!=U)4G0+B%dsbD{{?X5%*zAUu^962670yc!53HosL59PAnn>eWEt?Zwv@3>-Wd}y7
z<!2WSaZ1pumw)O!Bh9A>wRbvYJddBhNWh^@tU8OaGP-`nSnf3HjLj@dKoxbqrS)}*
zCU|G*Y4L%e^yW@Ptg9m9;_-(+-?<|jcjlq*7$<yZ2DvID#Q0k+zV!zn%QFwJRv$f_
zHV02?_gLfex@==)=gtth#q3A#ws|BiD262siQUkR-E-(={b6vo7m@qi99#coMC<Tv
z!t)VnB}{agKg&^(IoeMw3+{XQyj2+$A;CN6E|EE_C~k_d8PfHFh1Ls-MEqOQDBo5F
z`%6;Bjs%6))i-^dB_ASLnIqR`FG!r}mTmd13}&vs&R(bpv`;|ZWbj*39|?n^6H#KG
zJ#;&uQ|%NglI~<y4fd8)<gvwSpVa@{a=}uJ^+b^yFN^suA@0$Md{L<p`ML#jNLyP8
z$0w99y-dgRc7#Mp@rlj>D#IHy5jp3Kgg(3ZkBA-Oq-B%D9BA-inUdsF)}|YVr6lh^
zo3mRNc)oDSAFD?SzrtTdW}6G`I^3Yiyl*ttBT*fU9k{F0{Ai+9x(AeSffgFk@xsB5
z>Wp_$K(vu|(nd=Z`OdML#|ghl#%+s@0#S?Y-1VwK8?}xRiOK;O$q3`G;u4{K>=cP0
z2a1?DE%Vx!i0iq?6=5v$<9Q{p7iE;eysZB*^N$&9rI|DYQUFr-&)@rj9}!uf)u5bG
znOndiV$X)CF#m-e$7^3~yi-=F&}+YklUnKD!s2jo*C{-QB6ay7ux#Sgz0=e#8(1XS
zoQLp}g%qPXRd{j9D!reha;WC>xRWTK$ZTCC?ZHZVhB1t&eF{3i-+^?0im`MAxRib^
zbJ`7Ymq#p=B_vY2Ql19Bkn0<@KM-|qZj`~~g2DPd-5g$d8@_gq$Z}~$I1zLI6-9s0
z0tm~Csx#qmdXUbQnnWVm6We`+A2_Vr-72E<YIy-Q-OA%vde#}&*KUd@P)2QaiTGgS
zqWBfGDqXwp#Mo&&P2zypx#KIxxj%S$CI4wvmr=}IHhRS2YcJWKWeGe9hbJ$1-zoX?
zeNyiDq-Q$8NYj2#`a@6KF?UeuI>LAUS$7>po}I^%^;9+y2s&(jM;t@*U^bCfGN4#g
z3NQ2S5AP6gFjs9SgAdp8F`jQ1<*8VpOuar;<7n-nR5<<m!rQ(|=YBr;Qe?I%P0bC7
zjKB3We3xNMA*7lznDzTq+;&f9JqX+V&a2|fI61_-#^cht1Jr!}4Gj*P!8^REG|%nW
z&!4ATg*G%e!>+HHixcjy6D}%u{fS{$8!y_h(#C81IDHeWPQ?-C(hu(TTmd<}-+DG&
zSC|hjB*!CiFEO>t<8>QM4k*Xep^KtJJryTp`6OeE&m+hG?Bc9`F0<~oPqf3u)GJ#h
zpMN#tgQwwJoE&R2<FvqaR1&`@Vx4Ed=Bjh7u-klHwp}V<f3HJ5e*;2Mus$5vT#&Mj
zB*m+G>2%)D2qJ19&d1IfwZ|#jJG1l{L@DVP2}}Qb!HrPXFL<*WT*TR^K^D>lj{EW^
ze?mFHT*kG#jMIMea<tM=)CHwd{5<F=K_yq}ALXZfL?`m1X$w)GX6app(9PU0l)Z~_
zKG|J^Tf5s8-No9zGIqTW%S9aekv%jx&_?r4ohl21cJMfu$HJ#a)3l7Bk3H@(&GzLv
zH()Wq)vw-h45S+OLtfzythCNl?uV;kz|A}sjnvpPZ*faWYqCnUKS2xfo=lH-Xa_cM
zRnWxD&zKEG-Y^PMH)9-s;Xaes{;PcMP_%J6L&q8--@z+cn2edfIbvxKeBnobY$4Pp
z!NH=|yW*jVN1e_Qh-6Ov&lBi&xz8OJoMVUxnAZ;vb|wwyEUiY3GFpitUcsHkyQ3*9
z)!9u?cb!{g&Y0fkO`tq1t&e2jrdW=$;~c+^#dzZ&)H%{juk*xA|As8sVB)L@ZDri)
zgDr!i#bRr6bs!aE;1c)W#<e~YC3kYyeR<rpa^avj0);MbGhIeLZDJUwSFW&?(dD@L
zu!qx<rlIf<rSG_8n70xH!HV(E`(h0&IJ`cCf?5cO*Os>8HwrleT~Z*L6e^cTLRA=Z
z@l;RB3ftV4S16RthmlU;p$~1dr(p!S8PV+6cZT(#XLG!k*W(W1a#OF&U(htfSPRhs
zfWQ8yzLJMVjLJAcBB;!~9`O#{>92xAyZTx1#o||cM={Ra-dG9saaD5Xluant=Q6<5
zBL?yXO?K;hek3wjw%BkVP=l(o2vt_^pFXS<IZ^q^$e$`HoW37KXw`4e<%GxWIjNO5
zdnS}2xoj|x<71K+JslXgmXiHXZYHF9DLP5vrBOf!>BAjN1fWVo%Jz-m%;_}i!Hm_D
z0856q91eldcrYaJ(XpYogAd6ljR1y&m)U?s5$)Hn{)-6%+Yi?cfz76idtvm4o2K)4
z|8mUEg%Mbh%*y7Ik_*|flDz7B{o*BlTM0;@j3_OR5?giTv#|FKmQ20?G!+m2&~pOZ
zQ&N#DM<t<wb@{*pMrkB4go-=~x&4)^IS^(rUf{TUdD+*@qnwJL)T4;AKZhUN^|UbF
z^Y0x-V9(r;U@NzcYhw<RYO=I~!8Lff*9K8#*y;Dr=Sn72$YU<S?F7Ivgs_LBh@Zg>
zBcuO%!5q=Uy-Hx++K|imJ~~OOmGe}X^$c$Fm{XYC$Wq{bp^(WDTTE-DkqM3+^VPs;
z;<S9*O~vjpZjnafgc8E^ucG=CdvDrBAXvRex(U3V`Al=M<mfmaTsNZdr1r*NPDNgW
zqn4XBez&Y90S6&hGe>4`|N3KOXPl@A)s=aK#bC`%2H#5X(4BYlv&G%)MTe2wBo6O=
zq6pXPMhZV!eW-TS-wUEZn{fuRI{8sYl8uySFv?s!d7sTHAAj9_-7glK;bn=F5x@Bx
zAU}N&B_X-V<s!c?4)cv6*VVgaUhC({H^Z{RzJplQj8}n_f48muyU$~hJ@XdUPr4lV
zB&}RLsE)&fr6o}GpKVE@P8`rwkFJbMKFVRd(!^GlB+=2)SvxwyR#a33u1^O4(~(kT
z)-GdX^A+I$TxEcr1LXobNl9uP8c8{z^)@&pg!MU;3LymCRSX3#PkrxXe(3nd0jAp6
z*f`l5A^`5oNMcJ#NePRIji|~2UEpB+TQuyx-@MkmZ+;2Kl8I@IvX2xD*0OSM>ee7E
z%~%Z@se}Ta48&99wj_8xxAl`)P1EFWN}b@hKPPqLsEM0v9BxV3#Ju+B$&m=;`d4eI
z2Vh@>$Uq}>^WT09jZuNz2;lb2)73PNF#JN5f*Ehyz7)lwAFEMow&E~|VUd1iN|e*~
zp?mZX+u`W7vmd90)^8((of~g!X|i0-X76wAU5^mpfAyE<0$k~#f8lIk*axG-GFV8U
z?74hcG!JjtBLZDw$KmubHoalYjyS&UeKx)F>_UWWHB`m%wYJ$C-Hr-(zr)QFkEp}?
z#wkgFZbP!i&M1(Lf2u-RXe0B1EQUnsZvwO%_t7sZDQTv~ag4EqJS#(ar1outZP};;
zw_V!M;JWUiQ!O9{gPs@rjpA&tO6k9H#}_#cZv4bAw6L~j|G$YL$#2DV$m5+m*uC4m
z#y&>y1_IP@0{FYa#)}jNn1QY|e9O0QF&P*LNbC3rbhpFTCyYAX9hqQW(K8KAQ!9;f
zLqC9{>xUZ5f7aG;p~DRSkx4&W8DJn|+^Ukv=h9_kW~NCKu6A%i{z4(5QevuZ)#4m+
z=#7|cVfj<bCo9X4!fl?jjGhsFo3hEes}rAk3tQ?QNuhZ3&}9Ui({g>>iV6mb1{8@y
zb)&*8C2VIV1B=@e{N550NO~o&sidxMsOB7+tX5mfg#E8r$EDo5GZndnL7NzYIjzAW
zWli~4#|2syZ=4zvs7H>}E%QAQ2Ra7hd7)k{AH{8<q1Zs%P*_irU-l{$Wy7b~WM`o6
zE&uR7c6J9p-F&@oa&<AUjOMubEizm3KJYGi9R%A_c(0`;qls@Mt)~xkoY{1lB0;o~
zst6vl2>KJI#qv+I^9J5h*W0fe*<6aJ#G2ih_?4!x?~Vn8XeZf1)43Lh{?)r-0uvr$
zq2Ic8fA2U?USZs%kRD*|x@7R0;MAV`O_M-x584kXi~KD%P9q{-@Zi(yrgsr5);pU^
zzF^Z1W%=*R>ZA*=t{ugF;@=EnBpU>B%^V3gHB$soHlnkbE}CD_1BtT>2f$skAoM>D
zWc1}mc3b?w#$pLv5&;A2F$Qa8KWK%iPOR^5Br+#IZw9d>l7Vn@;?eNlfd~_^Bi^nV
zak#PwW9(~~4&p4|d{J9;f8K9n+6d_=##@`cL%<eMs{8|NJ8bs&s@vr<#q%g0y#78(
zQ*QEBiU(q({@&P?P%+`C|5|{b7rdli-N_y4E)m>sx^D&7eYdZvD4cyLX!V_Yy5{hC
zTcuMB?^k)xdQvAODR7Lqazf~I9`D;<<*eac+qrRr8XUQjk97m2Ff_q+nyU2Tjs})K
z$E!T97K-(ytH>VCwe=N|fFdbMHkTv*_{c*|8ka_*w?@*ZWwU4k2!nAnG`epvFD2^k
zFDlhG5@e>`L}-af{F5y<i@Nm#v7AvDH?+0rbHbQ6!Gr|<N^Em{Q#jOO7ytwftgRPJ
z?#@4cyVy#F8LM`(>}@Nr8|1FRRG$uJ2HN&RD*;;xL#RrUSE3DkNtC9^R{j{nm%n~F
zgF`MzvF?XCay{FfO^|Lm6>i((^mBcl*Z5S8$?0jMenzhsW?J3hQSY0sIrG;9+o#Bl
z#zI|3{Y)HNH?<d?>c1Wr>AjO+5jn^3!ggS>U36--hH;36Mhe)6-gNfs+Fg=p;l@R<
zqvctqVpJ3CzG7HA@;OhQxH)SMYo<GVo*djYxX)W?rhdM9N1Er(%EBN@%GI>IfJd-?
zb|Q`)+t7Du>M_~qNfMjwtL&Jy5lFCq-IQ9jZ>MJBLvnCjPCIid?8R*wr25$X!!Xi3
zj#FQ~1b5e+Geh4xxg+*r=-8ok2HoX79s@~knhTo_-u8Bov6r{ob}`X_*Sj#dH%!R1
z9ylkBqX%=H9mp7Lm8P7=wrMP*8g>Mr`B^WzWE~z;;XtAuABBHiPtoLy_qBJOW5-MP
zn{8gN8n}HaKp8v(!lT65)gt<3{bQZFq+1ooTv(*Do83T29DMmiFulsU|I@|qr8e%-
z1<&966gDcRE$dooswu$L-qr_D0@_jtLq(3dU$!4l`b{bbGY<9h@lxCI6dZMGw`}up
zEPGN83Ua;7J!bzhZ%NbmD&*xAJIwmPo>J2735yqJ@7uJCrh3pQ;V9$%HR*uCHL8GU
zY~K%wK{vk%omi)7WT%18A<a1GfpPxNUgw>@WY1o^aWRi~Yi}($7DTHFB<6eK=CX*c
zS7H6Zj#c@@v$p$>TbWzvag!4ss^_~{?6MsH1@1)>1LE88PZztJtU@mF#cS@)*suLB
z1pd6wjwTwMSo<Skj@&5{1HLu>vR$1j9FT2#l_pPm>CbX*`W^|-k^5ftjQ4JE$FL~&
zn%p|Ui68aLHL}>(x_<9@gMwUX<(Yi}r2Y7sTcL?Q7xfNB&6uo7XD9UbM$(X_rk*EB
z5RIO){Z9C$tfxeJaidnh_%nhu({wIVRDU$g54RNDbRhGz?zX|lI7X-wD1i&IA=7Fn
zjgs~zcEO!j8gVSrY!Gzqb#=oh!Bzx#6&m59Ojtt)SJ^%B-4tM$AASsaDymQpq$>p+
zqupjE>!q8=?eoxZP15oG-<_>34_y;`Ly4{uO~kVMw<NI?4bsPWYL~U%`Ky$@zg~SK
zZG{&Wcc49SvjuzWk$UEE7SYi$qdQlsyv}_(?>{}&3MW4a@R=G%<Eab72zLf!rB(AJ
zom@}8e_tX@)}+S<%58Xgg(^`kJrqgiY`62pw>`7@^I=82eU(S`!7G~OIf!M`|JB)9
zhefr&?Ovt3yQBu`?otqt?ve%x2?6O=Y6t-V>5`J}mK;*LJBN^lfswAW*uTBscb{{v
zbFOn8{^XBYYi6x)J@<Wo9^&_5SUAB2X>@W#2eYcO&F*PEUP!hi>6w2pzAQR`QGiDp
zba>i!d4D5dGh4+8GBA`Q)vUg0V%{+<$F|DU{&*)O#Kr9Kfsd?!XYnxC$*0H3wV0pg
zmIABoLll{$N4L(_9eWjE4}!emOYt&#BLVwKBr8x7#LU$4T)SIt?dLR?t3wMa&ZUVp
znPjufWh;Wbu`V9faq?zePdRE9N|qoWk6GXY_SV3z*-R%REHX;&MSL~W;JS&NbqDA<
z5;%EHl^e2n$*}$y0(hq7Nm<wlUqcjXSN-IeN1p9$8{ET4$Cs$Q!H=r?MoLeLM@qZM
zvqGWE=bQlD%<P!x3t1woT8WAuDJiLy)#(6#+$Ne45F*0>92P2c2X*WtG<rcrRJPf#
z9<VB{LnGY9pABYW!TMOeav1`|76kCLk!cc&r+L@cyzTiGYVE@l%Tlw=>J|!DZTO9=
zwPQKYO`R)1ddCBTn|YlND<3f{#-28>g4Tv(s|xQq5vClb$=Q4E*~bfikQM7v2F8n7
z>V$oSj8xUBRUD(YsBLDEhg$o96}Io%nD=zcgRBk(UNtE({9MC~Z;@YgaM~V}SBH7o
zM#h76EX)^W#~j<pS~xlnHyLhquH+7M$gkrKoy;emOdU4L6+3)AX>P;kZFcQ@<<1Ga
z*Ex#2Xs<=(y*}%>A4*Gl-6F<?hhTdji0~GLv43A6Vv`7BH@FN0Fo2YsT-_f3c-y2Z
zsjxGPig7EBq#MgKJ@g}D3^6ptKC;9f8jHC04viaDwxISil@PEJOf^W`lPK<qM`F*7
zOwk$*8O~~$&}DGnARY=Q@e!1zF}N5O=WxTqhBq?)zVUW|rmJAca#l;;_0NX(<?VGN
z%uDXo<NgP5S##V{^|J;q>4!p;_k$RR>Eas>j7by^w-U%rmKOPtwdFFU4P_AxvDscP
z5=)!;?GdVEti;sCqvTS>izPYaO;WS%&6C=hC^ny>%dRd4n7+$5ai-%!t~ei&O^cwf
zJi2|KzJ8M>5>>P9;4}!qf-3Y<>_;GIlINObg)|<}dXT?C3%*O#w^{aP(20N_^;X9s
zoLHn`(J*9Dqk%K%$FprE(<eTB?GrUjS*9V<4;^hia<}EV*13IZu%ciW`#U`Hw*^f4
zCIgljdFj@iVHAjV;F75eS6Ydazn428)JFW$tt({Cj~r!fBY)p;G?z9ntrkM!V{QJX
zRb43eEW-U^uzK^@%8s7-8L+jM-8HKCWz?St6gPa^3`R|0eThbut#&a?)b}~!%Sm_s
zzFG$!eLPovP%@>Xexa^vPtiokD(2cDj712Mu_IjmM%m^WfiQu0Fy&kLiv0>b8@A)T
za)(|0A^n5U5-hscZB=LqO}?)<H)%Y_h>6>ln&v#w1V=t|j2{qczdH8!U9X)~_2^xx
zy&txsli(&gvvY-HzI^_BSY6MxBwqP6SKV?-rjYm6+3o|5uaO;rCKD4W6IfgBEVLxp
zeq)8Yr<=tj*FWnFHv>Mo3UQz3w3)LYS;^0T4*M;FX*Z6xPpEH24>?BGxv+~mM&X2H
zJa76Me~!%5=lW{b%ICT8BvrG2QJ_efAT8WKFm}fwh|!@f^!=!CV=sjiQd?!l3JIue
zQ|W$+;Z`Gi8Ks{d&3K#rM6<O%*;iAb`kLQe^)TA%E+*o9O6aDHbUqj4-vAvZWQGax
zQn_L7e;@7?l{$rZ=t2eWCNBMN&5DR$-920U@#l4#8Iw$mZAhiT4C%Rro!)(`PgMY5
zMOk^1;@gj-{m1^T@#sq>CY7wH=FtqiJOxA-VX1kXE)#^7h-U{~lP6)8Ck@gQru$h8
z#gF+2qJxw*6R!8oTo9jNd8vzOboq0od!?ff_7u9r6)PpMOCvG+rCg^a{%6)p8<pF!
zB*-d8&&xw%3JaD#ePb~S&5UPqMFxfjV1$vcg8i%^Z*M3E6SKelE>nYSvr<T6mE|Fg
zc+*9A<t;h1sN1;?K0POQTr%cG3`L0MhS=g>9q@sCE5Hl(tM%fG&^}|o@rK_TEv9L*
z?Gk}V8Bya7EyBqBR(&6)P>0{DKtA9UWqGHHAdZf*b$n06%6Ea=%wu#3N?2B7_Dx2K
zpF993NE1I@lEa0DSBh<IlP{H8*MeYuDBRT{Pxq>;X|8MK`bPY?zwgqlx1{9R!S092
zN>i4|-0TMW9N(fO*fn%?l&!pZ7w9e_K)yU6*!6P=g!G($1%X88Ayj0`R{n<17Cb^w
zzg{0RH7Q9C!EvWR`Q9e+F!Iw3rrMsf|LMqv&uCzC)yU*Cvr%z&-!Ea(vGhZe3cQ6s
zmEHP@mM6tN75fz25mXKS3DuX^0rwb|CH&I+pKF|8`8q*&)}ahpf`+Fi0h&_pei?rE
zR{GHkBH}VXcqbOH&n)s;mIu<lJqlrZ;;~w=@x_Ei#gl2H)&qZVJ>IEb)fU`7i1;A%
z<~=wDEK1PgApnUqC2J8RXb~m3^~vlhft`vUhg9IlN#62&yNi}`USh}AoIR56VVTa>
zEvIb8i|w5*klR81&w8V6lr<m|KwO}jW#vqqblmoN;!j2#?lVUwpGy|i>U<_Tku@yp
zrZ$pRAFtmO*8{}cb8Xw@M&KYhu3O4m+|e0euNNY-Dy!$tiK;qUX^~Y0Ib?#oA-L(!
z>+3k2A-h`gO;c>VVj(0`3XRRg22e3A-n-96UhH!kclnvDgqF#UVNf`)z#Be5iwwAK
zvu+~cR!sC0Sc0R>eUjivkE~9UsoMg2+9|9G8VQseinNeFo&jPt!c2!QM<7aHo|{7q
z4U1dYRA_*;uIcew^d~h(v9mD3n6WFv>W*}XQ6)5%lNx?EY7E(!RS@@MF-I_l60=JB
zK#1LS%RA3+$<kZTaUHLWwDACcqo4w46lt`id+-}GSjS<Z>wHEWmZgi>Y`xLWy3&8-
z{zl}yslar5k%98h*jjKB^0q#5K!``JPeE_)OQK9}NV|EU2SyZFmpU+jpt#d65h99I
zvPPQI8~>93K+N1J_-;}7k`A%Jk1x4-gQ0k;Fz8h3RKr2KUxSYnJ6jYu#$`WuI1Q0W
z-uN(dynxF}wH3&TNYgBnywHr{?r$?SD-1}0xh)|hr9gtC%=w2EDZd%Z(hAb&RbCzs
z`cK1Rk-s{)j|uGq;)Cyw<m1--^4%{D?rp_@X;=x?0$(y{ida!~tsNwnz-vLzLd&#-
zjTpk%B0b*41&|MYz+YkPoXL>C-}0e!!t9mDA+mB5jV|Wje_3JQG<4CQ#A5WAPkRiE
zU;qY;?9qA)9q?YI#sa(@w}m6s;#Sq6N`BX`BIt3scz3!AQ)+wm=MNST|D@6@H^exG
z*{CbibTAx`G6XO&VEKs0Rm~a&Z5Yc7ZPRN{u9{N7+&xdk#0VN#2iKOph(})^k@V9=
zu6enSet71|FJ6&j{c(GA3~qd>8i?QH0@#vdBiQbrMBZ_(SS(Ep=lnEoH}pEupx71m
z8rVcz{`)5TParV=GeZCQOfSwO2HDGwjWfkcL}hEhGZ2-)Us0a40Hi)kW=cblW?1#>
zshE+KPZgiEY}H?OW%jf2<&bCK82Ch?-K%_mD~5CYqM-{eaM_T}VtAs|Y3ac)*0qjH
z3J?lJ4ZYKkum;z>L|X_3SF)<of|y>hMOw$T|0amp7%`jMCJpT37}xWd#}fxD;|e~P
z&1q==)}O?tJo@*E39#3oEr$SapGKN58c3D*#850iedrS{J#=S_Df1c@fg+|SX8pc3
zDnKF8{c=(16bGm+fbLT*PsD<@wg0FF@m02D1*XhudmfO)d?n@Zyl+hZ^Cm+>`5|5Y
z{;xa`Wc8f~L4gsy(^$CWiHe!f0cFVUKF)XJcw#OA9{ikb2jD$?d<CU}SMaY|9k9f_
z0J0?=KC`;`RL6V#_FoRcs?ZD&(&zV|3@F#|5yUVR!A386IBuMoOJHjm5oqF1E2J7b
zHt=xqP)42jM_S||sEhCZh!l067og=tNN}YtBUUP{XuH;H^7ivWc*o&s!TW6|LL21$
zh!50YW0^J7!S$q!pOMk+nE0c=C;$p0o3U4LG!SV4vOtD^<+*@gXl6$7!~tyuG>Xz$
zgi4>-zrVYmYcWeL<h~`KcZzKSx^7_U2oKN1@ps{5Ai4;OH>1gc)Leu+p(}T%aq-7D
zl3(1#SItNeb#Z{81r{t{YSkel(tBUFNhxEPKBIa5;h?@i&}!T&>12!{O*ape+#`?L
z_<+V1i4!tiMX@sxfC$7CJF7hjlB?J<1(}k6A*_F6(<TQvM*myAaL33buH9Cr7=7F9
zyW<mpe&xD5k3xZy(P?zy;YpT(t&6pmirHeW$;1x}3}5Ab>e<V4w|(--kI?Co-PE5I
z$-+K<>>@AK5^k#}t`chWGL=+l+tw7_z6BpxpP%|<XwBWw;e(As%^O-d?<>6m`%Bz&
z+-6slc77a?1LLI~v`gmiPp^?pC(fk0L;SCwFan4<=SMpvbi+?&WqYNn-S!20k1YyJ
z=K;)sKNRF{(gvnVIx=1CS)BU_6%eSI^E@IJNN@ej?vAbJCx~400fB&{z`RkJ<vLTb
z_gK!aY7OSVCTWi`=(k-t(o1b{m|Jx#Pfk2{W!{@;LCWJtyWn;lS<G+OHP-PdV-*)9
zb#%MMCl-|S;pJs5p<4^RE9$?BjpNO2hykyn7`&MCxDTSd<irxE(~?uO70yx%^$R3y
zXB<9}*X?JM$8!fbV`Xh`P1{Y$#_LF$hV}R-n<#cHfjhq4ynM(#9{26m&?=e5)GpSM
zK6~rN?Yr`}w3!5J-?}3#sA8<8&osGeXc<7|v=}F@n!@(i1gU9wu5daz^@|DZALB|u
z{IlursGcKRSt;yHa24H)MN0d3e)NX~(|7irn|7b7w+6Be=Xoy6wdBVoj0@Bioe|W|
zn>AjT)Kd;5F$aaRFKjf-0~V+o`rEcMJdrOZK?-hZ*-AzDYzjH@X&lK-8zM9F1s!|p
zETF~Uje?X#wQO7VounHTOwTT#an{^L=K1FO1I2Hf4*x`z{;Bs4gICTX-Xz%HOUrVi
zHSiE{jUGj*$CmAjyc3ZvZwdoaJCL!Lss~KH?bhl|wpdyvlX|Zi1su)IJFEYkuB$iF
z*63Pv-RYJ3rz4jvqUqhfK(L5z${kllFtxXNE;7#?INOH2d(F_V=_dXd#QpCXAqe_{
ztOY+pjc8n9kVwDR7>LW%b^TfP;D%NMahc^PbpAcan~D|&ulfwU_`1)=`lP!_L1>N!
z+uA3{8rE&G7y@R4lUk+qD2Yot7CpSCz4^Gc)LhyJcAX#SE_rYCN3+g;db)`N)#1nL
z9w0M5nx?$E7)NQcH=b=dtZ9fgGUy$ykqHD?wMvDc?})lnvpI%ZOi_K`z&4rM6?xW+
zd@VIL0Y9%!-x~3~1wp=Ao**mTOP*7OHlZ9=owgyDQ0H4*b-nwtc!e9aaDgv~0s>ia
znZ<1nKN0(8;kQHji_s*N$4kl@sGtG-gGWkMOI5vbAU<P0$<zy}Elui(cL`ptA1%j!
zxNs)Z_y!|gOmH8dkHNL@-wun1utY6%cB^GAV<w{&vEDFeY<mifE}l1CF1pf$#VX>M
z?Tz@5+Pk5a{d|ayNGPdJLv$yAl<d_k+rV5D1u-<nD(izefNJVLUp#jiR1pj~z{gM7
zj7=)U{HYyAs$qY{9NNDI-wTjk?wShioo6Ci7>hfWe&K$|E;dTp)}&7yPvhRzEioeD
zr{I&ROFdKjoE5Z;2*4_VTgutqdYtF~{ZwsqXYEi(O6YVoi49Lfl}=mbI6JCQPPhUv
zztkvph1tD4uIaZK3!wgjIl$XbfsSXVTfqvC=)TJJYN^S5Dw>&H_**b`q@d2PN1+97
zqyuE<O@08N3LsAZUq9g$j98=y%Mh=m-qg!Sj6}Sm+;KS{=f{!PC;eHiWKVvgT>Gh=
zwh`*Og$s+g*`T8Es;_m`6?BIOeT3V*+#%c;GAj#<z`bi8p7~}9a;o)-O6mUd@ojBw
z{|OwYt7XP-pK84;ri$?F@dj;1B(UVXzd73Bcf-2o5DprdY{)SNw{evi%4jvgqrC?F
z2ig=~Y^zC;jjNy?I(XRt#?&??pql>p+q}xxfCAJfCnu+l$pTd%WzBNw*tfiFbkC0`
zd;-<3(YH)Bni%lDPZx94t<Y#CE}nG=9N^yz+g?-Fhhe+SUuYK3C)_2t`RW&mtNpHP
z7%Wm^E>QZ5x6t%8Gn1qG3SerXN5n+$?AS0cGWNHF=$Jlws~8)UF2Gavy;QxVrAf*6
zAj!&6O`ARL6X(K*eIdgI^Ny6Y(#)Da1|-D3rJ)$B#61c%fPk8XrKngk1k4Ghbs@#<
zZ!KGst+#Hy&e4U-EZ_re^EJ+v5<Z*mn3l$9<R{VpFdts0wWRm6YW#+Xb~8Wvbtz;T
z2ddBA=Vz@sb$@%2zCSDwA2#m2&>Xl@4v)fm%vJvlV2LC)SPQs6Yag2w{M7b2JDCNJ
z9P0Z`gubeD2>$WVO@S<n<;FHC+>1C=wm0WX1!qM;mL*MFCMT=rA<q`+Lf`f3!;K(^
zVatoZRk26z3?dRz*Z4Rdpk)q_SD4f=V_2q=4G2t}+O=hdBwLlwX4+OHo%=DX*3Cv*
zmN`@>_CvPy0SWXO!2J1p;r&0*ivC~dxc_(F(f{8kNQkC2*voAE7#@T6sa#fRTHnq!
z)g+S)+P7ISl`$KP77Vm#lpib>4XW-;H7Wj<FsCRxy!=){vRGYoUhlimwh^<g2mH^W
zhNeJ&P^Z!3q3tg~%Hz$f*H}n6O0->9JjkYe+>-e=IVm@P>YV~f8r-J{TO0JH06fo&
ztb+sR`kfuP-fWlNyM{F9{Sw-NoUGfE95=@gcan2+|A{e!9_=3zqKP^)m-X+MlT)>a
zFbO8nxdiwLG}U!pq1T`%bXW6isb`ySv2B@WI@<OAW*vY75^1ERm!zcuK@Ix4*Z@xq
z+akdKNlIcnqdGX?7<`o2{`uTQoy*^gaVb)|uLqNeu71DxsNXn0sH8MxIuxjyZ=ukq
zRzKL*$^(d55?ks3eZl#IWd{Cg;)@W)q=UauM+9-Va$jR(U%fhM2>eBb0rKKd=FsKP
z;sB;Z7I*}#E-1+*8_vZeU}lDHK@9p~#kFN_Wkxrk)Ge@Z^M2G0MN-urYQ35WOz0%Q
zbb$cy=m4_hI>6tmY-lL>{>uZlIuy^Oii?j=_mCQv{<U~t(K@!MUM=C5@yK@57c8tO
zGn;pT1KPzo(>PS)+ZRw$5oeLmFIl0+ci<eE#ppt<CKdo?le}|<)qxTYPm5?TW&}q2
z;5R?{(_ju@1w(OmcJ}<UgSWo1@knX_5ODN?mv){YlR$an*s^-9gsTId-w<981O)mi
zyD`#SkaAx%!L}KE4sF)N2l{*QrJ;)#7-Ll2dGiRPRKoRXSHY<CUGMOmL@1ZJAX3Cm
zg4#%ay0niUz(r$}KYcw8IAn1Ekfw})EP$3aF){gDZU?yHP>QCX63uFLNeMh0`hFl=
zf_U_uv;CI`BF;}oeWjrB$=DBk9in7Tiin0<9jyFo-JP@|RPG<lE;quke*Pirh&Ds^
z^FvUt<6JnN=k~J6k{0$*5hTrTXT@k91k`tc+%x)@5gA}gKO!KF={|OLc52l2v+@jc
zXh~GCn`E}a>(B3lz#9`?1*l5$(zr>Y1kDCw@!ou}=WJ9Bs|D*EkvG{zl`+3MYDjgc
zQ$v?$vvT{s$8vG;$<9}A%}>47x`3biGS-f!P1ZfuqIkS=e*JUR#}j95f6|K#W;G!6
zWL3uQw_;&zGWtaF>;PfWCk8Jy^YeGDj!4VHij?l-&^$;lC(^cGoYS}<p6(ri^GybM
zOd$TrK`U}J-g~7#yK{cSPkD*id%o?~aJd{k`;x+yLRBLOup^>BZk^?;cvsH>l%OF1
z51WkvT=+ls^{bXx@7bggUqfZQB6p&nbaSUl9Z_lZ9f^K@Cn_0VE_Rh*Y(5@l^EZGc
zj^;w4(^(a3q^fphL^UeysjV2QRu`=vR>4=#7Bo!=lK|0EXJ!~0HW+|Z`K}^$4Nsz+
zk7iUpTry*liBnJ8&fra7<s`NFvNL!|%|5=@fA5oO<~lXRm@3%EC5LO)GPV?wID$TR
z$!>&Phz8gA`Aq@mHmBoOhD&-Sn03k;=T)(Dmr2wOTVw!!US}jO(Ngl7^g2G?;0J82
z{-QSu2yr}5up$}UYdW?q;wE8#%5X|&KFG!smt_|eaEe^M2LvSvpgN26=Je|C<iko>
zw8yIdj%S~AQI76_XPQ?EkEIO%bzr{T8cEWp3#9>S;96t}pE2&4g*LMxWFSuifZ$^h
z*nXpe<O90ghM+m2DSvYOMt*EDjT){_FZ4EKZSFPg-B$oXu^x94Ehk0(jNoZOhmD^7
z+~?5Yw-FLg=Ci6e^&=KG!*c*j3k_lFCNB@Lx`zJA5fF&*HR7`xlmrAx$8RfVhM5s>
zya0Nc{4XN_l7&SfD6{%G$m~NMW)gMVrz{bydwI6V7^H))3FjFmfCi#?2(w)>4-6nJ
z?5r^*GHzA<<U<<o`|jB--8z(jx(}GVyf}$JK+&AAwISR>)T8<{$Aqzg6h~&sT#n2v
z+U3ZAy&}0^8BHvHJLcA?Iv4NwFE0s=Z_DOnY+QP9ULFGjQ-PGTb?u^8Da|~VLB?jF
zs<L-P<Bz<&cX@gFgCQ>qH=dS~FO&Gd?_LPr_^u0`S}R!!qMoLX%FDiuxHObGw0bNU
zEVS+uL0n=_`!<WG3q!K$`=A{~k)CS@$lGggJo|oh${~3&K5^6sJqV>+p8EIaqyluD
zReYc*FJ?*BLO^h9kl5qnoXrclvBCgYK{1t{EtY~$D*)cgm?ZXWOOErrD6(LXM%C{j
z_S(Y<4AALwk%78#m%k@B8v3g*n`%I0H<CrWB-i`Q)&?fcY467&&$YfKF|@CTl^B!n
zAW6lh8ROcs>vgDJCemDPt36%_e@W@dI?uHOd8>3h^`r#u0*}Q*?#rzill7I@<rUcH
z#+O_9!E+WsJ(02$e|KcD|LbkxX_u3|Um{xtGx_6KFMcfCc)`vuPT71ajB5ng5-WNY
zk6#AYr1hiLANt%ErjvUT$I>o9k1HGT($Nh9q6&YsLl6V9(C+1N3B=;-SqWO02z=d}
zT%b2VEu5zbp7w;qofo#(N*=SyxR&EX7%dFm*i5rI@L30EyCi;>%4gvk6Z}>lV+sG0
z{-1IG>Yj1*-eztHqN=@bzRoS!;<pjDFOX&`ae_}bzwlzat8&MfW-#;JbM5#Sp@YgQ
z!<p_sXqmb3!hMa<Z|p#DGt57jd6j-W*He;q{Nge}ud4#^HF#p~s5v=G`(UvKu;l*U
zvvD-GBOMwyAL>tn1{Bwx^g}*%-PcJAeIx!xm{B<8oV%ElvQ%bnpQ*q!gVWU8Gn|l8
zi5qCIK>r)-6u!Y90EhOw{M2*iE9u0n%u+W88VT|nL;D-PLo3XptLMrbzf3iEYYONY
zT>>mE_zhJ#yJ6VvrgOosb|!x^{$82*wI6{D9Dty$`|bBXf`5H&dfBuF067B5;KW_*
zT*-GP$ekMVSj;yjHv-s=y*}eU1#4l}_$uCv(3T41q}x3AOP`OTE%XE}gEyX@w=&4b
zg9EL}Ys-WXIEy#P3#Gn-J^mJ&bnN`K2Q3CsY1IigVJ^x6ATf2jIge`sd;G^mJLoTq
zhg`w;5a_57=?fBCB5vBMgLbxf4~dBUcAdUpha2v;xBOZqZ;^(74)rju$Rx+cQe)v5
zu(}fO7w7ojm{e}mG1NG1@6U;Ppx2u$1abR{5B3_knS`<8DHWSztWY{(!xwbT_Al?F
z#=JVHg(7c05f*OHok-Bh*!O)9guT0a!&kvgCO8)ovgjDp^XWRd){I0p!mlKEm~*C)
zEZ2`9`*UAD5~*RU@b6Vr*&IWbH<QmnT;%d<(5Ph&HU~-4-;v1KwspNby!UK@$?08L
zR2@@^+FN#Zp;>)YU@+TWhYv;7yCq!86a2^n<6VB0TW*rpBuT=o!{su9xw>vjgP8KZ
z=T!k%uGDRKG1I;dB7EZz*o8kzUri);j;0-3qjcOXzb9z4WM6q$FA;FIVX95GY3eSy
zdye>PAIS2B-(k;vX=b}z{?I>nr4!UeO`d)_vG&Xne4)89BAOUJNOfq;3uy-Tbcy0X
znnO<oe29z@;dfJ&I9gpJ^vH51A?s_AxasHPrbp57g>P%H2a;H`=JQ?#L2-XR0VZC6
z=&`F*TfmjA@LtPKoUGuEKwp-v!o1rvz4zPRL!f?*^V~L!xV!<!?Bgi9P3w3{KO3Gu
zhk%~&$rDO(ap=_&F{_+!401dted6)HH>QQsLr8=JXrrU1!Sm)oEb-!f^tHHqIHt(-
zF?C{0Id}$xvorqq*a>e?&b<o<US4SsW1r`_F>vc&IPsC)FqtXW<fsRA@<C>c#tOQl
z=x*<mxhp8QVS>|Pw1Om0EhJgOS<Gh=KAZELs)&tOx5oZXI_g>c?Ny4+_4I7v>ORg~
zs~gzS6f-dMpnL2*YV3VD)k>RXUwZ(mOY#>39Px0|dfkpKndGT5b^&JUFU}q3^Fit!
zd)l;D-xo{9x0@fN%Zw9+1~1whC^Q%O<<is(pqz)asI>;4UIDDXpTEEjW7>qAY0zWG
zEG|E6u|R1+MBxR>_wx7ho+8*j`CJet=y%b<^;SlRi51!H;gh-@o4!S;mz<~|$dkkM
z;g@}&HI$0ht=p%o-e(x`xV!ptTj}&x{~COZZ?-|r&U1wj4H1H7e$qFH&asVJ7-QAN
z23ctw2Rtg<Pvd+gE(-;&T(LS$i~}u`DzbI6c~V`I!!aNl^}{9mB(8<gDcfE8GlOq%
zI->Xy)Zbse53XU?h{MP2ulA31EI`^A|GjIodWj<h_cJ-{T8if9?h|;X5$S@zl3CN?
zsND-yuz$8fof3l0AJ8M9s_#^!?&<vw`+6$*lj1xZ&AqGW4_EszJUQvtSkhs4Rzo{#
zG?C?U3frON71(JTg7p<xgXxImB<ZPBBmkb{(FgLeR~}wp_%<J%Mb|d0yi1ka%(~-n
zis296htFFv-wYqbkIGX+v)-~pf|M?LyZrb0Zf8u1j{wWaW+?xUi``%c$E|6=2;y`9
zhA+cS+Sl=^E*n?d<b~e(b7Bql0L-I`jIh<zp%C}smWsn?w<>Y7^4|b(*~-P~HFBYP
zGj^#?8Cdl-AKiS+rz;A7rBgsq1=wZbA;?Ug{H?0^2e<e@T=7D`c(i0eMotvu*`P+v
z;t4LPM$Ob+_TlM|boT^Z0I;xV`@N1I=dZ#W2aiA_Z2<NTa4$G{$Fz<<;~p?)2U^J>
z`-zLwdajhd1ZohE8%s#v8)I7TP73N#PK%B2p@j?XAOh~e<djWzAAt@9Ilu=37!ky%
zwZYVKFHEB0J=2y(Y6-gXx)p&Dp$TdQ^W?F@a&2=#A+2d<M!$VjG}e3u$%BR$%(f|r
zR;Vdr_8v5eiR`An7I*7w3Gm7;|IjoeU_9=8^XDh}pb2aCd}9~tSG(gN>JOj1j*qKC
zbkR`bpk|^tK`ixsRx&NA4MMzioGkS#sN-l^y5nF^XxSuE=~WrRm$p@O$sd~yOd#m&
z09BP{k+-UElm&sm^r4E+{58&{kwIw6@=s`o&+|V&h~j;%?R7_Jj>G&g<SZ3d9wz99
zc4iT7cyYdmZme)0fbs;--{+q)crEt;riC=ed;zbO+&0@Y^5hyD<|S$R*Vdw|h(%0y
ztz)i~X9~S$?z}#|atH>X%Y7x72f}m?)qThk_NdG~NNf0A#+OMBThNUVqKx8}G4vz9
z_@iEPi;>tWX?Y`ow$A@Fym6fhY*8UyHOh@BXJ}D*y>8*UEBWjPaH<4Qz;#$+Z~or)
zTqXL-icDz4%ea@~p1h;)tuKz8K5+D{9mLaftpMkrpDIM*9NAL_73YpfC*TD#+4bhg
z<_ZgKA7VMGqNLZ52VqC)Y!EH-O}yv)?O_*|AM-7j2?9U;h*>0oUyoPiSvN|VVK>@A
zhQsLzztg|GzM>ZrLk`ao5D!ATM^1b&CMW|@1~NJBd_(iD#j9x+=qa{VaBO_tm|4~F
z^=+<G;sxpEJBGFCs{WlG#I|`xnP0k{DD}M8kkZ3?rT&YuDQbg+v>;da4Rd}nBmcSQ
zx^R~{nwcOtcgq#wIMdo47OT?X@=2Gn>=*I+Vd~HyHJ1G*^&Q_<GAeuYo7#lt9Mhs#
z(^UGj&%q|p<t-V~i7G7O<=J~l*cBkEVFd(7E3Qm^37_g#5+iwlI|i9P%xJp4J+peq
zy8152srNPjFn|^S11AP}G7Jx4@|lu2$3xYg_d@9=@5HFv6$7sh36)w(JE@L6gPr=p
zeKluj2guJqJCtZm!f71|dgjh&{nni)7}G6bv_h8vXig<Nxze7(cG?b=UV5d*m^=?`
z4Sy_gJ`SN*ZHzQq(FUTu76bB+-8%~PtnO`=j|(*%xm2oL85XXd6W?iJ%nZ=GKH3x{
z@rl4$K_c|H7i`zk?a}<11vP0QV+DG%Ml{;wZ{lKHM59j<?n$&4M!`leMBQPU2btqo
zQF7_B49!ibE^{IMlKwGGvpHW!&Xee*6P=OiOsKkddaVjYZRj(RdT3J`3Q7pF<(1_w
zBbP~Sfvz|+J@~UgH#3AIi^;rl8(}DAr{o-E(JP$F-K0~lOaJHRE$<djMoFQcf-HP;
z&A~>frrTaF_G1154w1ttqe}&}uo;@2<yyS!Be&S|leTCgi=WwtTB1&JB_@;|jV87^
zeH^Ow61Xw-x7fLH(_`-AM$UJ%7djhB)eo;)S7$b8S6BD(*}xvseZsTJN4#H0K9u6?
zH|-atT-Leq4z*CCY3G0xaqdUafHPE{+>QcQxWZ^QJlccbZWdBp=CejrA%%NG3u_o`
zI{oZ87jwGTOlWwb+RYyDzJsEODicGD`f02)o2F_v_ckGBjl5J00ZXah(BcjOF6r<O
zU;~GjaX7^W*WEyC7H*{Zj!$;WJc|k-0VBF9=$+Rrg@_MYKg}3<L*{;w0*xk8^Z{96
z&q$Tf4>)l?UyV~$?7YzhbC<cv0KLKzWElDEC7vys$VOIG<r+qJ{`4Ryb^Y2fd%3=n
zh*l_m&6ksmIi2ZISzAEOQt7wvZWDe)Z*8%6u`h#6d3K7+=3gEG(Xr!d<Pmk>O0^k(
zkMyBCY{u_hUh&$6jcBi61w&SvOjP})<(5UI!4o0-Tcp+7(SQxfEtYJZL-L#p|7nmo
z_wRI+923KipZCk$%jW296`cdD)4dnsGwa6o=i9^c{IbH3-!TvyQ&3he`c3XqA%RtT
z<ZG5VsJA!E_3Ta{Rf_h*!GcC7Y!k*;%kBs|hKqZ%i{WGmU0pJ(I|+5p?4KN$u_K>R
zgPq}h-@5_<!_ZURM01^X5UGd<v;W48ZYfwL$YcGzn4_aw*WCpA?Z5ylc~YMT&>yYk
zJ<-&j1hyzuWH0;_*wM$XNHGB^J$!)omAkZ?Ewk@F=YPPqv=O%!kKUq<P_h05{9?^a
zPlP(;$GW^8PbQcV!YqcyfhX@tkPT5@B`gI9bwG+9fGTobwxC<D6v9&b@0jDSE!-`f
zB%eQRxYKIfE9*pRut|4{>Q<k%q4c2uFRR{iTi?jn?q1gzDm${2M*{L`vO?}@0?Qp$
zl&2h_7w}xyau+svHE=0*&~R{Yh%;dr5hJB-s;cU=0(68Ci^(am-*BTY)NPxj^+oXM
z{h&SPXQvl^H_5LVf_o!JoXnzqDtD~igJ7>i)KuN=RcR2bl^9t2!~6@<(;PP<KRLB2
zv+!{rLrGxRPyJV5S~EU3^kH`=o1+ya78c(%`qnap>Nx{DtHl_S67p<X;2I-Pq^$31
z3}HB5KNGs~(Mfm4K5w|Nj!XT-MZ@`?rs7F(ucdMgZyW*cURT934sAB~o3U<MHd$MP
zi>6vq-W!je`Xpym;_W|OH*a=-1O62G6DX?bR_00@%wjdIqJc^5E(kB7P#f!n>~ZQm
z_Ur?PPx~WK(a6rcTzyiu;MS4DpXNLcA;V^a`}go%>mFF&Ng;_@!&NtU)^OuL_o-_v
zVIZ70Jpnk9=0o`mx9%)>ttue%`#Xm8GnLNiCs_8rQ$qX1T|DQA2cG4f(bjl#7k{Yg
zms~@8vIo~gtH&=6O>N$x(py+urFyb=fz3P=(fc()s)RrS?rQDWwT0DQD(g7#O7*O2
zy~z-U1oeCW6m+o{OqFBMegx=LX*h97JYFX)j|S#f6r`jP9xWaZmQSqoDj*XX;41S~
zdA3Ct${Ep^PTM{_y(2N?$V0g*n|)d~aaT0O3S^6OD$|K+zAv?keHGhrCyO7fm5c)@
zYi5r+Yqb|E59YA!{V5rd3sU_c1Qv-OWR9~f#`D~KlB?~w#<q{Y3F5(N5IKikcHv5y
z#rxqoKt76w5UC$5dI;{}EUT2=O?g0q`t*?3p#14P8UmlYVLaOATK5&vtL&@?#XO0c
zVq>cam99Y`jcu{}YhC)pLkbEq`Hcbi$9ltDckw?NZOAnaQrs6$xwfcbixQlCw{9RM
z7Ol^pGx@#`tHJB^d?blyMn6GOGRE^3O-ac}UuKnU*P-4f-@d(!0s}xCu;;5`MqtnV
zNDK7^z%HXD*Bf+QxF&q5DU!@ZsY2bdGE&;LBE#Dhz@4$xS9Z*<`m*K?gs`}EX!6(y
zmsnSCJLYYqv_6e@2D%-nmFXbV?#y9m7taR!H&t`-aRvHcofb}33jd5T4*oninteRs
zVsqCl%ra9L1CX{NpE@kK?Z;e!vrL!c`Sir!^!{P3+Hvs0OxWi$>$_4(^s&U7xJqEV
z4?0jxWEtiGSm^4tz<U^!^W00y<Ix}kpjZJZp3dv=E04DWl$@MAM`4R)hZllx(Xc89
z&+O9IaeShgI1I<zRZ<#$4Ho7VF!_8unm6RrN3pXXeh_fkayIuzFKRj_dDD@xV}hF0
zV*o|@Cr(Is746Vm+rU+IFUnsM^S`U8>d0NOJQp|si9FS<iEbc?JxJ#;pfjCbmHWt+
zr7g?lS;C$`i27A^+}gam?;1Hhy)?*y9uz>JV+FE(a*5Rm&?u|=jf18Svd*fT$xD5a
zhbqye_E$lcM<tYUH@6G3um0X$|5w=-;6U<ttsryM1t|tjV`s)vkdb98OxuzQ`3bXq
z=raYh<;fM(sT(gI0+IL{(gY4BVO@NH6r|U?`qRz?h~|(fI`*1w1-;W-jpz!ib1$6T
zlN;x79H2?CxN#Y0t=27%QoZ7N^k4wE5a0jy6nGwc?;`O>s9k*nyURM*o1;I9%GuTd
zY$9j)@MBBULL+4FEEQS1$ic#eQUWE+GgGSp(P6(vb+r%VmsOYCo)uR=Bwb}5^zFE9
zr<reg9I(ji4nZS>qD%6JCle9_bvA>UDB80Ge;v^OiE<qZcrn)Y6eH3wfG?ttdEKAt
zh=1uyzv&3WAjhml`biZj-D>iqORt?$=}R81O<g{q=rNNBJJxK|Rp>Ppe-&{AZ(H7`
zx5Q^vXPw{sQe|!5oG4`?chN?O{Oh~bmh9I=YR8uFou;E<rfm9rNk-TgRezL|+v7gR
z&O)la`1kHaC}fenbEq;SlffS;EsdL;*J74V1biew;*QU7*R8h(ntHHaGOk>4lx$vo
zL!rS01Lgk0f0g@xcNy$3gtM3rQ~PH4UwyP$DaYt7Zw`A;(!~YQ34s=LjrS~I^S^Z?
zi4){cK(10hhi1PqzR|n&)i}FDf!H|~gk=I^BHU}wQ|^CyFyDYS0AfTbwqQErs%VsW
z&kWFNE-=J)xLqg~qAFhw|E5ZwyYe>1dN7l;G-3Saa;t6QSkfAEE`|fR&Wr#y(ci$7
z?P0L)uvJ1S-TQpQl+$Pz*^ddn`7G1(wbeV?j<#0lyk0aiN4_+Nw(eVv3;W;B<{LC0
zg`<!E%cm%-jP~0_YWqmIh*#K>NH3pSL$69q^I0yI&NuM4HDyj07J=)FYXe_zNel+`
zQ2L)F3F!3M#LcGU8$*M_g&b`};AyJmWlRELdSkMm_)S#ODJ<|u*80E4pMIka_x<te
z!)MyTp#(sC32gfe&H9~SNxja<e_JKur9U67n&6OsnD1Ae=%=T1J|2Bwxd3#hn6<O8
zpnnu}Q~xE2=(m}N;93I<nOd`o5x4g5{Ytfg?vKmfg~QwWFfYb$ZUb!t{^qSSEgwr$
z>ueP*PkFLP`VtE2HqR8uR#oP+P}-Xsz0XqrRzCk0n69tmHsLSJbm-~m@YU7TMF@a~
zLvK{>pP69D?+^m7VF%;G<%z`!PHNz~1<;T3u@g?WHDCwC(PAN@mhcUei=jrF*HrUW
zdhD|H4h|qKvdDp&$gf|&UMeV{$Hm3H0F*jU0iXvf$3rS04NFixilhL!;NRVY|B{R&
uzTOsVmzZB-BK`Fza}usyqSJHxU@c7jE=6(L0O*nYL|#Vab-9#j;Qs(!$jx^E

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1.tsv b/Testing/PluginTests/result/excel/(1)Sheet1.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..2be88251fe7734bb778513fd38fb98b9fb39e46c
GIT binary patch
literal 130
zcmezWFOeaMA(?>_2$jIFgdvron4tv91BoUwaDmluF{A+H(tskoKoO7*PAKb`!A^q{
h1~7giP&^5UL8hjFRipx0oIstN4C!Eg3YZVk4FJbL4}bsw

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..aabbcdaf14eaa515f27c0521e0deb8a30734a51f
GIT binary patch
literal 242
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41%?bHJ}(0ogENqy2UG`=M^~%H;Kl$_6U30o
zkPg&|X<7i#>~x@B1qL;S0I*t^y>1NoKnO7xWN#W0AKhMbwV0+NT!5}tjll(MF94Jv
BD3kyI

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt b/Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a71a5af2aa7e7b4bdab084e51c8c656bfb281091
GIT binary patch
literal 180
zcmezWFN7hLp@N}=!HFRsNGmWHGFSo0V1^8aM1}&OoFM}*0~Z6jDkC&iMnKgH4DJj?
jKvPPA`mpOV#?Y07MVANA)<mF5B|te7u#OD42*@n}IQJc8

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2(1-1).png b/Testing/PluginTests/result/excel/(2)Sheet2(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..5091fbe51dbaac906bc76aca5c0057bd38f2074c
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`Jpz0}T>t<7zjyE6_wV1YTepszoBP6r3)7}e14`bxbEl!9p}4qMSXlV#
z)vMat+UL%l`~Ca3hK9!Z^XJvn)Kpbf|NZ-S<Hn6|-@XCWFZ#445=cpu1o;I6&BO*6
z&I;?j0;=IG@Q5sCVBk9p!i>lBSEK+1%{^TlLoEE0C0L!=4U8NmMVQ>m_%ynW4jl7S
zZMN9CB1M3?+2AVAqh=!w*2QdsY*&ohUo|u`GAK7OD)?ls?f@FW;OXk;vd$@?2>{SP
BaGU@D

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2.tsv b/Testing/PluginTests/result/excel/(2)Sheet2.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..ca9053508c38ce794241a50d536ce683f2f662f4
GIT binary patch
literal 8
PcmezW&yazafr|kE5MTmE

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd9e062162f0e802be6cb4d09e1f785ce6505003
GIT binary patch
literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt b/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(3)Sheet3(1-1).png b/Testing/PluginTests/result/excel/(3)Sheet3(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..86595a359f5d8729ab91ab1db751503cbf405014
GIT binary patch
literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`rv><gxc>kD|L@<w>(;IN@ZrPc$&<sv!q%=``|sbs%a<>!si|GMbV*iL
z_V@4KPo6wcQc^l}=#ad;{Oi}RtE#GI&Yb!5>C?u>#@^muX=&+~FJHcY|2`xn1Zc3g
zx3{04pN)+TGc$8_b@ko5ce%K@7A;ydd-m*Evu4ekH?Os|_1?XE3JMBWuU<WT`0$@U
ze?EWy91#)m{rmT`XU_snFy&QU0i=vdg8YJkE+h>w@CM9y57f<B;1OBOz`%DHgc*<L
zuSfw3CVRR#hFJI~OR#=n&k302q@a1mOLnrzRFSC*d`>l}%x9FJ;wd=cN^-DBP<xRE
z<0OUpz=Qdd)?6|&D!Meq+B0yLZ^R7Wxkc)ZNj?)FJ(xDdkRdo{O@iJ}2caB3fdelR
c86_kbDlAwvySL7{4z!NJ)78&qol`;+0MabYU;qFB

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3.tsv b/Testing/PluginTests/result/excel/(3)Sheet3.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..3323f354391b7d5238900363722196567eebfc7d
GIT binary patch
literal 8
PcmezW&yj(bfr|kE5WoUf

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd9e062162f0e802be6cb4d09e1f785ce6505003
GIT binary patch
literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt b/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(4)Sheet4(1-1).png b/Testing/PluginTests/result/excel/(4)Sheet4(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9064d5df2da6fa16e9708803ae810f815c22f6
GIT binary patch
literal 1151
zcmeAS@N?(olHy`uVBq!ia0vp^K0qwQ!3-piojoxRNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^B>_bI?9#P$FG|F2)a-oJnU)vH&}pFjWi@84OoW^LKB<-vmoRaI4GWo1vF
zK3%b5#gQXN5)u+-&YXGp@Zk?1K5XB<{nxKw|Ni~kv17;DwQIkA{rdg;_lAZBKR>^y
zsHjbwHZ5GZP)kc|_UzeQTwL+-@hK@O2M!#ltgO6z`Ep4~$@AyWSFT(c78cgm*Z1PZ
z3l<g@p!4qEzyI>(%ciEL^78Uy$Bro}Dc!tzbHaoPlO|0H4h}we@L*O}*6P)(_w3md
z6BDy_>sBu>ugJ*A6DLlzwzd`*7vH&aM_E~U*|KG6X=x%NBD}o33JMBKmMl?MS6{GT
zL1AH`o10rfL4miocVlCtrKP2jk<t3~>oqksw{6?T&(DAH;zd(a(`V0~B_<}$n>Q~m
zE^hkt>4JiSJ9qB%@bH*Ab*hz>)$QB2+uGVnOG_U;dQ@LuudS_p?b@|DbLN~ocW&v@
zr57$-m^*jwx^?SfV`C#CA}(FJR9jn{ot@p%(xRcE@#M*qprD{tt5&I~sC0C6czSwf
zW@b*FJUKc#+TGp#<HwIYJUkB{KJ@qZKY8+`y}kX688b{wOul^ivU~ULDO0A1i;I8$
z{Q1U>8vy|UU0q$~=H{K9o$2Z6p`oF<xw%eGPDx2gl9H0Pwzj>!z54q4-@bkO@#Dv#
zLx<kJeS77~l~boq-MxGF`t|F;aNZX=qYX$cD+%%o2FCv22Mli6Yc+r_<}C1tEM{Qf
zI}E~%$MaXD026VFr;B5Vh5y^2jlC?2JWH6h6gRv$sL08h!@Q2+BBP<DQ18DR761Lp
z<!e41WVOH4bavKF$?C)Q|9G-19^80zaJ}GT-;JGN-3`SjdLoiyrv0!};?vDYuV*`J
z^moTof#8`-D}JV^&S`b9EAUCkKCye_vMp<0HM+KN-+bh2dn9vVVgWOI%5*+HfwH*V
zCdJiLk6qWEsS>N#t*Eo5`$yT@LtOI$G(v=<XMemgsjM!zZBc1X-rXdnOMZ-MSq=dy
zoX0C=d0FOe2#C*5Ibb#YsD?R*+3QBhV3*QoDN#;6(-tZ}WZx9)_xtLS#o{_|?!G?t
z)upXd`I2SqQMQjQp?=*iz6ZsgC8oUcy?Aq9{db)WVhi~8UnpJnt3ky4@u8~F<{j@3
z893a28+}Lo@V(wYS~<(Pd?w6eThno7R$bA)FSd71t`T)HRsNcmdi`Uss!>YLo9_n&
ubnh;|cYk$@?ydH<J7qlMKCR?<$SrxZr|65q-wI$PFnGH9xvX<aXaWFcDS{yY

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4.tsv b/Testing/PluginTests/result/excel/(4)Sheet4.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..e3ff3e098634cec21d0981bd015095a0eb9b9091
GIT binary patch
literal 70
zcmezW&zB*eA&)_U!Hpr6AqhyE0<i%QS|O1N4517m49*PNKru_OxB`O_kTzm4Vc=!p
GVgLZH0SR3I

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd9e062162f0e802be6cb4d09e1f785ce6505003
GIT binary patch
literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt b/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(5)Sheet5(1-1).png b/Testing/PluginTests/result/excel/(5)Sheet5(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..67ce0ad6331e30492ad7dcfc212257572274b6cb
GIT binary patch
literal 704
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1eDFpb0xc>kD|M20%4<A1K`0?ZZ{rfLpzI^G@r9+1f1qTQ3+qdt?ks}Kh
zESNQG*6Y`=zkU0bnwn~CY<%t7HA6$gii!$tZSBR27n_)v7#JA%`T5<sbLYW>2ce;%
zK)XCWJ@@Y2tEQ$lapJ@c8#bh;r=L1?%G})i<jIpaZ{Ezz%nS$!aB^~5zkYpwe!h;5
zPD@M6{Q2`892|UoeG3Z<ckI|<Wo4C?mR4R~K5g1GcX#)sq@?H1pRZcA%G%mGE-tRJ
zvU2j|$#?JGU9)D*n>TOf%$alR)-59=qv_M9tEi~#-o3lIxw*Q!`rf^J8X6iaSFW_Q
zw2X;~Nls3lGG)rUcke7LETW^Mi;9Zs>gvM6!c0v~fByXW{{8#gw{Jgs^yt~MXIHOY
z{rmSX&?C_b3Lq+>B*-rq7*@0d48^%moPl<67I;J!GcfQS24TkI`72U@f_pt(978Pp
z-%c{*JFLLtTFb!pJ|+3nfi!)cduQhSj$fuyDz!xI!qQil)Lnl%p1ORTp?;rJtnHZ<
z|K44E!l)3qO4TII&Wv9+>k;PxE(Iaip!gkbnTq}DSEoG?<WfJd`M&O{kFg<7a#DOf
zRo={J)~b5(&{<^1+Y_@omMiNk2i~&@xF!6k!p(fq3#FQ~TyI{LRJ%o=-gJFJ?v3D!
zD<+CZ&1zo$JwrjL^4}Uk!}pm-s!WfRn!gBidd+VBayf$y!}f;~k^Mj7W&u6I;OXk;
Jvd$@?2>>;zcCG*b

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5.tsv b/Testing/PluginTests/result/excel/(5)Sheet5.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..cd493ac6239ef5d75017b84ed17bceefc0ca4112
GIT binary patch
literal 12
TcmezW&yYcn!H9vEfr|kE8@K|d

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd9e062162f0e802be6cb4d09e1f785ce6505003
GIT binary patch
literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt b/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(6)Sheet6(1-1).png b/Testing/PluginTests/result/excel/(6)Sheet6(1-1).png
new file mode 100644
index 0000000000000000000000000000000000000000..4673fc73bbe8ba8ebc6648d5505357720bb4873a
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn~YUVB!t%332`Z|NraPulMZP^YZ1(ef#!3e*F08(WAF--#&Ki*ww37Pn<Y$
z=FFK}w{D#}b!y?lg|lYO`t|GA-o1PO{P`m<FTZWuHZ?W1HEY%g2?=f9yt%Wp)6voK
z{Q2{_xw)ySsmaO7_V)Hyu3S-7Rh>9-qKk`*rlzK!pI?7}e_C4Fgb5Q49Xh0|tGjF0
zE@NZkEnBuoOG~Gxr>|eX-q+W+q@<*vpdc(PtgfyO=<>F<w&394<;#~ZTeeI>LSpOI
zt%{0@2M->+bm@|zq2bAsC(X^xSFT*y*x1<A)Rd5rP*_;#;NZ~E&~V_ufwgPb*4Ea}
zo;`cTiWO6)Ou2F6#<OS7Qc_ZUe0)4TJw-%By1KenuU_r!?3|sQot2ffZr!@clPBlp
z<t<pSAR{Bg-{0TX*0!akrM$fS$&)9qUcJi6$zf+_=jP^~KY#wJRjaJ5tnS~x9~~W?
znVDH#U7eViSYKa%@7}$dnwn3aKK=gv`^b?a-@bh-D=RyG{J6EX^_)3#3=9mkwY3EV
z1f-;-<mBWwY}j!6^y%HZcNY~Eg@l9@7Z-p2{Q1Fy2aJr2p`oFAdV0*v%uALmX>D!Q
z*VkXVbZKN{WL#XFtE=nRuU|iY{HUOyU}<TouC6|5(j;$h?|Jj)UA%bF!ongdD(dFV
zn@LGYUS3|Nrl$M%?|=XP{i8>Zo<Dzn=gysn4<EjG@#5*zr+4q(J$LTh_wV0<;auza
z@C=YzUlQaO3``h92r$%dVQvIEowL9rvY3H^?=T269?xHq0?Y)?o-U3d7XEK18BRK^
zz~g!~IKb$N)|G(Wk4;{c@LJ7n?(=>puCm#B_Kv%`pLCx{MC<?B^m6h4i!y@Mj@q@)
zw<x_YJ{4`EbXP-EYVL`3zN>V%9cfm{ogB3O$Xr?XsUF5<@vNsDzG@`xIMuTx%GNKu
zm;Hy)qaE%ckIw&k`PX%IAkzt(UsVlH8X^LXw>(wXaPLn2{cr8dm=<r<$Eq9R8KsOS
zF+7ZHT`}{36!(_7VYS)0VLJt8uDR&q>ZX0MFUeE1b@Q8<b40l&oI2a#5$w{SvHeBH
zmnJhq&Onp2T{5z=*$vEp!#2nFUEqz1>izggCq21eX}#mYo_YFr-~F0-i`URhV_l6k
zH#f_k=MoqAFYFELx45Pt_}MnNM{dni3El8dmz+Akv40DDS>t9>Zh7|SkH%h3>DOzf
oUOHgNS-803*SBZ!oiDgQU(MYA!0d4!FpL>IUHx3vIVCg!0DWSCu>b%7

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6.tsv b/Testing/PluginTests/result/excel/(6)Sheet6.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..d3c9bf9d193171e0ddddee20706d32c845310ac2
GIT binary patch
literal 38
mcmezW&y}GF2=jqhm%)g^kimq(jKKoPG6rG`AfK0kiva+xUItMB

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd9e062162f0e802be6cb4d09e1f785ce6505003
GIT binary patch
literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt b/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/Sheet1.bas b/Testing/PluginTests/result/excel/Sheet1.bas
new file mode 100644
index 00000000000..678f6efd8ae
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet1.bas
@@ -0,0 +1,12 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet1"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
+Sub test()
+    MsgBox "�e�X�g"
+End Sub
diff --git a/Testing/PluginTests/result/excel/Sheet2.bas b/Testing/PluginTests/result/excel/Sheet2.bas
new file mode 100644
index 00000000000..9368fcbc336
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet2.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet2"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet3.bas b/Testing/PluginTests/result/excel/Sheet3.bas
new file mode 100644
index 00000000000..bf55a0db47c
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet3.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet3"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet4.bas b/Testing/PluginTests/result/excel/Sheet4.bas
new file mode 100644
index 00000000000..3b5658440a1
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet4.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet4"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet5.bas b/Testing/PluginTests/result/excel/Sheet5.bas
new file mode 100644
index 00000000000..5d56cc32a47
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet5.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet5"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet6.bas b/Testing/PluginTests/result/excel/Sheet6.bas
new file mode 100644
index 00000000000..2e001954d69
--- /dev/null
+++ b/Testing/PluginTests/result/excel/Sheet6.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "Sheet6"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/ThisWorkbook.bas b/Testing/PluginTests/result/excel/ThisWorkbook.bas
new file mode 100644
index 00000000000..71a359849aa
--- /dev/null
+++ b/Testing/PluginTests/result/excel/ThisWorkbook.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "ThisWorkbook"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/powerpnt.ppt.txt b/Testing/PluginTests/result/powerpnt.ppt.txt
new file mode 100644
index 0000000000000000000000000000000000000000..589f640cac1d055665e5b5eb5d74a075046a1c5d
GIT binary patch
literal 298
zcmezWFPb5kA%`K8A%!88!H^-AftP`cVZXr=gA)d?4HSSPRtyRZB|y1iAPJHSj}DDf
zU@!uUhd{+qRe)5XnySa($B+*-C4eE3Aswg>ViUq{1qM%sT&SD^LjcfCi44g=bs0dN
vIbhcn0bK%d56A|DiMUlmTnSQ*Y>yv9DbS`QpxGc3aoJ=H_Msuz&ma>3>ohVv

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/powerpnt/CannotGetMacros.bas b/Testing/PluginTests/result/powerpnt/CannotGetMacros.bas
new file mode 100644
index 0000000000000000000000000000000000000000..68c9e3d768bbaafdd0efb8f95bdad9cb7293d1c6
GIT binary patch
literal 514
zcmZXRQEJ0L3`FNU&^zn_N)OR|n-&_{@6?G?2iF_C4kedw^F~WBB?xx4l4dm0{{61C
z)re)yN;+sCcSE$*M6~Eh4_cA4ZHOdt1D5rJ|Dhgq18xd*0`HoZ^IIosCvpjYVSMC$
zhS~8(Z=5gcupX3SmBC%+;C19HGRDl9dmdm&;Vt<^cY=2h-<keBhzqqHnx^2dY&C0r
zBNd+Ogbkr%8(lJ)|MOSm1|CmPQElihp{Htphoey88Iqp4ORy%rg3LOGHlsT{_p(mU
mUYIoV8nol}8L^rj@g1|K+m3Eq^nTp&p3j@Q|D`&U|MdzI-&(Bz

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/powerpnt/Slide1.png b/Testing/PluginTests/result/powerpnt/Slide1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cdbb29e07a7ae8b6729d2a9a86ad3880ed61121
GIT binary patch
literal 2895
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

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/powerpnt/Slide1.txt b/Testing/PluginTests/result/powerpnt/Slide1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f9ee31a6dd2405336ed84eade07e847d332a9d80
GIT binary patch
literal 64
ycmezWZ@<A3gA)d?4HOs*8LSu-7)lsY8H#}<F9R1tcywr-0)r7)JOnC^ssaE%tquMF

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt b/Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c168f5213cb9abfbe70692a6dae67dbb56fa9981
GIT binary patch
literal 168
zcmezWFPI^RA(J76A(cUa!IL4EA(0^+%nksGCo&`h*%=J^KsHE45m1dGgB6hEW#D4)
k1B#abMT>!aT&j)Ws*&ySV<-jMlms;qmtJGAUPG{508myOcmMzZ

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/word.doc.txt b/Testing/PluginTests/result/word.doc.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d857a6b9d330e5058a64565ad8bff944206a1d7a
GIT binary patch
literal 154
zcmezWFPg!LAs+~{8FCpC8H#{(F+(f^F9R1CM>B*lq%u@6lrShTI0IGX0a>YF5}^vD
zHku)rAp@wt04R%)0f~cjr2s{J!E`A@4v?(}G&O@E6R6S!D4NVr3bY$yD#B&}ZRi=P

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/word/(0)Bookmarks.txt b/Testing/PluginTests/result/word/(0)Bookmarks.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/word/(0)Bookmarks.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/word/CannotGetMacros.bas b/Testing/PluginTests/result/word/CannotGetMacros.bas
new file mode 100644
index 0000000000000000000000000000000000000000..68c9e3d768bbaafdd0efb8f95bdad9cb7293d1c6
GIT binary patch
literal 514
zcmZXRQEJ0L3`FNU&^zn_N)OR|n-&_{@6?G?2iF_C4kedw^F~WBB?xx4l4dm0{{61C
z)re)yN;+sCcSE$*M6~Eh4_cA4ZHOdt1D5rJ|Dhgq18xd*0`HoZ^IIosCvpjYVSMC$
zhS~8(Z=5gcupX3SmBC%+;C19HGRDl9dmdm&;Vt<^cY=2h-<keBhzqqHnx^2dY&C0r
zBNd+Ogbkr%8(lJ)|MOSm1|CmPQElihp{Htphoey88Iqp4ORy%rg3LOGHlsT{_p(mU
mUYIoV8nol}8L^rj@g1|K+m3Eq^nTp&p3j@Q|D`&U|MdzI-&(Bz

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/word/Document.htm b/Testing/PluginTests/result/word/Document.htm
new file mode 100644
index 00000000000..f37fadaf577
--- /dev/null
+++ b/Testing/PluginTests/result/word/Document.htm
@@ -0,0 +1,46 @@
+<html>
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=shift_jis">
+<meta name=Generator content="Microsoft Word 15 (filtered)">
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+	{font-family:"Cambria Math";
+	panose-1:2 4 5 3 5 4 6 3 2 4;}
+@font-face
+	{font-family:������;
+	panose-1:2 2 4 0 0 0 0 0 0 0;}
+@font-face
+	{font-family:"\@������";}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{margin:0mm;
+	text-align:justify;
+	text-justify:inter-ideograph;
+	font-size:10.5pt;
+	font-family:"������",serif;}
+ /* Page Definitions */
+ @page WordSection1
+	{size:595.3pt 841.9pt;
+	margin:99.25pt 30.0mm 30.0mm 30.0mm;
+	layout-grid:18.0pt;}
+div.WordSection1
+	{page:WordSection1;}
+-->
+</style>
+
+</head>
+
+<body lang=JA style='word-wrap:break-word;text-justify-trim:punctuation'>
+
+<div class=WordSection1 style='layout-grid:18.0pt'>
+
+<p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
+
+</div>
+
+</body>
+
+</html>
diff --git a/Testing/PluginTests/result/word/Document.txt b/Testing/PluginTests/result/word/Document.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7315ccb59ea7ab1fade1a0d1aeefd9310ab233de
GIT binary patch
literal 4
LcmezWkCy=e2NVJe

literal 0
HcmV?d00001

diff --git a/Testing/PluginTests/result/word/Shapes.txt b/Testing/PluginTests/result/word/Shapes.txt
new file mode 100644
index 00000000000..46b134b197f
--- /dev/null
+++ b/Testing/PluginTests/result/word/Shapes.txt
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/word/ThisDocument.bas b/Testing/PluginTests/result/word/ThisDocument.bas
new file mode 100644
index 00000000000..d365bf6b19c
--- /dev/null
+++ b/Testing/PluginTests/result/word/ThisDocument.bas
@@ -0,0 +1,9 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+END
+Attribute VB_Name = "ThisDocument"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = True
diff --git a/Testing/SingleInstanceTest.cmd b/Testing/SingleInstanceTest.cmd
new file mode 100644
index 00000000000..af5e812778a
--- /dev/null
+++ b/Testing/SingleInstanceTest.cmd
@@ -0,0 +1,12 @@
+setlocal enabledelayedexpansion
+if not defined exepath (
+  set exepath=%~dp0\..\Build\x64\Release\WinMergeU.exe
+)
+for /L %%i in (0,1,5) do ( 
+  set cnt=%%i
+  set /a lrev=cnt
+  set /a rrev=cnt+1
+  echo %exepath% -s:2 -u %%1 %%2> %~dp0\tmp.cmd
+  git difftool --extcmd %~dp0\tmp.cmd HEAD~!lrev!..HEAD~!rrev! ../Src/MainFrm.cpp
+)
+rem del %~dp0\tmp.cmd
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000000..0452199c1fb
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,54 @@
+project_id : 544816
+base_path : .
+base_url : https://api.crowdin.com
+preserve_hierarchy: true
+files:
+  - source: /Docs/Users/ReadMe.txt
+    translation: /Translations/Docs/Readme/ReadMe-%language%.txt
+    languages_mapping: &anchor
+      language:
+        ar: Arabic
+        eu: Basque
+        pt-BR: Brazilian
+        bg: Bulgarian
+        ca: Catalan
+        zh-CN: ChineseSimplified
+        zh-TW: ChineseTraditional
+        co: Corsican
+        hr: Croatian
+        cs: Czech
+        da: Danish
+        nl: Dutch
+        fi: Finnish
+        fr: French
+        gl: Galician
+        de: German
+        el: Greek
+        hu: Hungarian
+        it: Italian
+        ja: Japanese
+        ko: Korean
+        it: Lithuanian
+        nb: Norwegian
+        fa: Persian
+        pl: Polish
+        pt: Portuguese
+        ro: Romanian
+        ru: Russian
+        sr: Serbian
+        si: Sinhala
+        sk: Slovak
+        sl: Slovenian
+        es: Spanish
+        sv: Swedish
+        tr: Turkish
+        uk: Ukrainian
+  - source: /Translations/WinMerge/English.pot
+    translation: /Translations/WinMerge/%language%.po
+    languages_mapping: *anchor
+  - source: /Translations/InnoSetup/English.isl
+    translation: /Translations/InnoSetup/%language%.isl
+    languages_mapping: *anchor
+  - source: /Translations/ShellExtension/English.pot
+    translation: /Translations/ShellExtension/%language%.po
+    languages_mapping: *anchor

From 65ce7cd4fa0540a88ab8d23b015543dcbce4382a Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 6 Feb 2024 08:22:33 +0900
Subject: [PATCH 25/58] Update TranslationsStatus

---
 Translations/TranslationsStatus.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index c06e429b911..dc29ab222da 100644
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,6 +1,6 @@
 # Translations Status
 
-Status from **2024-01-29**:
+Status from **2024-02-06**:
 
 ## WinMerge
 
@@ -34,7 +34,7 @@ Status from **2024-01-29**:
 | Polish               |  1325 |       1313 |     0 |           12 |     99 % |  2023-11-28 |
 | Portuguese           |  1325 |       1325 |     0 |            0 |    100 % |  2024-01-17 |
 | Romanian             |  1325 |       1311 |     0 |           14 |     98 % |  2023-11-07 |
-| Russian              |  1325 |       1284 |     0 |           41 |     96 % |  2023-04-27 |
+| Russian              |  1325 |       1323 |     0 |            2 |     99 % |  2023-04-27 |
 | Serbian              |  1325 |        632 |     0 |          693 |     47 % |             |
 | Sinhala              |  1325 |        563 |    58 |          704 |     46 % |  2010-12-12 |
 | Slovak               |  1325 |       1189 |     0 |          136 |     89 % |  2022-02-17 |

From 83f4e3ee00f9a8fbfbfbf227996f7a2a597e1a41 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 6 Feb 2024 09:09:33 +0900
Subject: [PATCH 26/58] WIP

---
 Testing/PluginTests/PluginTests.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index ffb2bfaacd8..73905e54cb6 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -62,10 +62,8 @@ function printPluginInfo(p) {
   WScript.Echo("PluginEvent      : " + p.PluginEvent);
   WScript.Echo("PluginFileFilters: " + p.PluginFileFilters);
   WScript.Echo("PluginIsAutomatic: " + p.PluginIsAutomatic);
-  try {
-    WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension);
-  } catch (e) {
-  }
+  try { WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension); } catch (e) {}
+  try { WScript.Echo("PluginExtendedProperties: " + p.PluginExtendedProperties); } catch (e) {}
 }
 
 function CompareMSExcelFilesTest() {
@@ -74,7 +72,7 @@ function CompareMSExcelFilesTest() {
   var changed = false;
   var subcode = 0;
   p.PluginOnEvent(0, MergeApp);
-  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.txt", changed, subcode);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.tsv", changed, subcode);
   p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
   p.PluginOnEvent(1, MergeApp);
 }

From ab09036299785d3bd1bbf7af3f34d12418f24f76 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 6 Feb 2024 21:21:00 +0900
Subject: [PATCH 27/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct         |   2 +-
 Plugins/dlls/CompareMSWordFiles.sct          |   7 ++-
 Testing/Data/Office/word.doc                 | Bin 11264 -> 41984 bytes
 Testing/PluginTests/result/word.doc.txt      | Bin 154 -> 836 bytes
 Testing/PluginTests/result/word/Document.htm |  57 ++++++++++++++++++-
 Testing/PluginTests/result/word/Document.txt | Bin 4 -> 442 bytes
 Testing/PluginTests/result/word/Shapes.txt   | Bin 2 -> 118 bytes
 7 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 5ea80586e48..452e9dc976e 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -182,7 +182,7 @@ function ungroupShapes(sht) {
       cnt = sht.Shapes.Count;
       for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
         try {
-          if (shp.Type == pbGroup) {
+          if (shp.Type === pbGroup) {
             shp.Ungroup();
           }
         } catch (e) {}
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index a1843825eba..e547b16e7cc 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -52,6 +52,7 @@ var MsgCannotGetMacros = "${Cannot get Macros.\r\n" +
   "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
   "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
 var wdFormatFilteredHTML = 10;
+var pbGroup = 6;
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");
 var wsh = new ActiveXObject("WScript.Shell");
@@ -89,14 +90,14 @@ function writeBookmarks(fo, items) {
   } catch (e) {}
 }
 
-function ungroupShapes(sht) {
+function ungroupShapes(doc) {
   try {
     var cnt;
     do {
-      cnt = sht.Shapes.Count;
+      cnt = doc.Shapes.Count;
       for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
         try {
-          if (shp.Type == pbGroup) {
+          if (shp.Type === pbGroup) {
             shp.Ungroup();
           }
         } catch (e) {}
diff --git a/Testing/Data/Office/word.doc b/Testing/Data/Office/word.doc
index 07ff23c4a3587c99f3867a611c35570b5b996107..519a3f6dfc4cf8ffa8a16dedd5cdd7cc413ba164 100644
GIT binary patch
literal 41984
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

literal 11264
zcmeHN&2L*p5TEz_?AR$y9k&FiqGCdTN=T-qDhendw{b&g8v-P#2a42uHc4?D99I<*
zheUi;93V&>5us8lAt9tdr5@nW`~!$wxfuy=Ahl61IW&*oZ~eA@dBly=CQ_~LDEnr1
zW_M<GcK2;|o|k@aEMEF)@1GKYS0p5>ZcHLRz6H8b*W)4y(B!SUu1hvp0@6SYMc|*y
zi*ih24yG<~jgwfKRuOP4lm;0X9~eJcJX%z;HIJCnB>Nr`Nq%mr!nJTGaNS+E#g%B?
z;9W(W_EZx4X$se?@6p|XC%wLR!f;+bL_1>LuEQ3&iu%`H|GULe=)s@V^HC*kMY|QW
zzX{v_BKjk!r%->G3Id?Vul);%H}s!+3Ez9;)cQ0I>eY3Pb-y5{ydHXkdV+PvXFbsK
zpt0^(32T3}KKgS8inU+bhL#8QX!&Nb)~D@Xgk80cWPE7(>aUjeU*m7RxafYHwYNR(
zcW#ebqqSBd;JxQ-#a-j)mPWwR=lrcLRcn;hKm>3e;oo<&|7&2Xw#`MWSsq_ldM>$8
zeEErmXk81+le6E2TTz}`*fy(1v5A0*z<m*cgzUm?&60P3^@R+#(DV)07GUImUYDHY
zB`f{%9_no4NVY5HoJ21R^^@Slq)Ud;Vo1hhLe5H34uTtpJko0Ip1&@8=G!Ixv^*k*
zqca`Ho8?4Tv-BLd<xP}xU4J>!2~E`2xvsY7l{R~=HY-7GFGOejirSF3qMo*O^&C=q
zLTmNdA?kso4DE6xz3g6+cCeZxgRzZZbmtL)0><_R=se0<^_-MZ@H!Et2}pxrfq^5I
z7ekdB)8}o74Daj(x=n{k11PWaQ7+~~Fh|{p@F48wWC~?O`O~3hXi`$rEFJQaoJOk;
z;8O<tL3o{o|MYDNk_&2vE~p+uh*Ao3##U}xrs-=57FXW3$~Dc!>@&qjpfD{G<%6!i
z+B6H6ZAU_3Cv1nD&*-fW<~+I&=IPFqB(boD;Z9QCf&*M$6KHcdK5N+$4qLWW7qP>o
z2$V95TH7><UJNiR1L(;`d8kEM-w|<af}?`VW**R6!Vv^+43^lZ1<}6|z4)le5_}z1
zO}^=^|8x$8ZMnG1P^vldQT+d0&1nsqEq6E6CL)l>B8$soSeSz6)<9`Fx-L`Je%NS3
zZ6x>WGPH?+iGYcKiGYcKiGYcKiGYc~eIEf{Uii;3?=HND^8U%+eDLPQ-*v=*`89V3
z3NNwzUf6)bFZq<;Lg80;(z<{&P$LoG<vXXc2**^8Adic+$dAA5yk1>tlCY(R%5@Zp
zm9AQgpaD$h$YRFr=NIuaUw&~ddHFYMH+X69)_hR<a3LSSm3$c7>TLRbYY<!6=lZ1|
zepw|tinjc*66L2b`aG_h!CXnTzU+m44uyNCTKhDw?OVv$F#RzpJ&3|M1e=RN0=rko
zzmk1rFYurxj-S4B-|GEO+Q5So0SmJq!V8`w4(?s##-w{}FrS;sjTDlna`~ZTCO3FK
zJ3LWPXF_)`d0=rd3+a@Wr`qJ^i$A{)_6D$uUk*mp3ADB$*JbgOx#g9f(fAKvMdjIN
zuKaNTygn4}HOlv+0H(?3*~FYLWf>H{h32uS`L1aMGYx#;?-}*}*$0~ET%rG5KhOgW
zVWd)-A!Y)W@BY_t3XG_CA~^-5OPSZM4EqD`pUN%E63)%X<?20C{@r@d%I-ozE!+PO
DbctmZ

diff --git a/Testing/PluginTests/result/word.doc.txt b/Testing/PluginTests/result/word.doc.txt
index d857a6b9d330e5058a64565ad8bff944206a1d7a..bedb7bc6e92255ee7390ebadc990673234da17cf 100644
GIT binary patch
literal 836
zcma)5yH3ME5S%&^|8PnL5{ev38YCWNM3G1-A_~W`4Z?ZIb|8EdqNYYdd<5SD%<TDs
zffVTE+uPUd?%etFV}esGxo$B>jFPg#7531vZ-Nn0Y*54Dj8O}oQrkn+7}v~`|Av_k
zW6A{vj4F|HKOxR<TZoMr>2QgaVLA+1Va>dRy2Fe}8JCb$Gcn|x9_7s_=jO||_Sz;X
z=*f60DShP`wR?8g+giT+bHw$1B#fG~7qOuFQ|dLR^JoPtsuRr^>SwH6&|2Y;)|KT|
z)WwomP_KWdP`nt>>@mMPo-58B6U!ODo^L;cZbj^>lQz#OwF(dBS#n<+C%(g)KF?5)
z%9Tak_IM*&9Zbl$JmNpx=WFyBJx6bm!+Z1+J@M?&$1yAX=cYaGE{vlF<LB$}@xB+m
zFL69Dxo&zLu|x55PHVy`b?4%@{YH0ZwsHDR{E!G!<4hCR*vEk};b_wu(3;yHv7y#w
Qgpcc5)J4OpM+yJP7i`y+YXATM

delta 32
ncmX@YHj8nBlPE6(F9R1tG(#{$216o40YfT7F+=R+MkZ$fa8Cy2

diff --git a/Testing/PluginTests/result/word/Document.htm b/Testing/PluginTests/result/word/Document.htm
index f37fadaf577..7a50bfb6478 100644
--- a/Testing/PluginTests/result/word/Document.htm
+++ b/Testing/PluginTests/result/word/Document.htm
@@ -12,8 +12,13 @@
 @font-face
 	{font-family:������;
 	panose-1:2 2 4 0 0 0 0 0 0 0;}
+@font-face
+	{font-family:"�l�r �o�S�V�b�N";
+	panose-1:2 11 6 0 7 2 5 8 2 4;}
 @font-face
 	{font-family:"\@������";}
+@font-face
+	{font-family:"\@�l�r �o�S�V�b�N";}
  /* Style Definitions */
  p.MsoNormal, li.MsoNormal, div.MsoNormal
 	{margin:0mm;
@@ -21,6 +26,8 @@
 	text-justify:inter-ideograph;
 	font-size:10.5pt;
 	font-family:"������",serif;}
+.MsoChpDefault
+	{font-family:"������",serif;}
  /* Page Definitions */
  @page WordSection1
 	{size:595.3pt 841.9pt;
@@ -33,11 +40,57 @@
 
 </head>
 
-<body lang=JA style='word-wrap:break-word;text-justify-trim:punctuation'>
+<body lang=JA link=blue vlink="#954F72" style='word-wrap:break-word;text-justify-trim:
+punctuation'>
 
 <div class=WordSection1 style='layout-grid:18.0pt'>
 
-<p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
+<p class=MsoNormal align=left style='text-align:left'><b><span lang=EN-US
+style='font-size:18.0pt;font-family:"�l�r �o�S�V�b�N"'>What is WinMerge?</span></b></p>
+
+<p class=MsoNormal align=left style='text-align:left'><span lang=EN-US
+style='font-size:12.0pt;font-family:"�l�r �o�S�V�b�N"'>WinMerge is an <a
+href="https://winmerge.org/source-code/?lang=en">Open Source</a> differencing
+and merging tool for Windows. WinMerge can compare both folders and files,
+presenting differences in a visual text format that is easy to understand and
+handle.</span></p>
+
+<p class=MsoNormal>
+
+<table cellpadding=0 cellspacing=0 align=left>
+ <tr>
+  <td width=1 height=8></td>
+  <td width=290></td>
+  <td width=18></td>
+  <td width=54></td>
+ </tr>
+ <tr>
+  <td height=69></td>
+  <td width=291 height=69 bgcolor=white style='border:.5pt solid black;
+  vertical-align:top;background:white'><span style='position:absolute;
+  left:0pt;z-index:251658752'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td>
+    <div style='padding:4.1pt 7.7pt 4.1pt 7.7pt'>
+    <p class=MsoNormal align=left style='text-align:left'><b><span lang=EN-US
+    style='font-size:18.0pt;font-family:"�l�r �o�S�V�b�N"'>What is WinMerge?</span></b></p>
+    <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
+    </div>
+    </td>
+   </tr>
+  </table>
+  </span>&nbsp;</td>
+  <td></td>
+  <td rowspan=2 align=left valign=top><img width=54 height=131
+  src="Document.files/image001.png" alt="�e�L�X�g �{�b�N�X: WinMerge"></td>
+ </tr>
+ <tr>
+  <td height=62></td>
+ </tr>
+</table>
+
+<span lang=EN-US>&nbsp;</span></p>
 
 </div>
 
diff --git a/Testing/PluginTests/result/word/Document.txt b/Testing/PluginTests/result/word/Document.txt
index 7315ccb59ea7ab1fade1a0d1aeefd9310ab233de..82e05a853e5df60e80e8cd8f8a18c67927d2dacc 100644
GIT binary patch
literal 442
zcmZXROAf*?3`FMw+#v@*T!9lH7A#nYmKLOzA`*U=2c8|ZAfc*pJmb&UdB3(gC@L%H
zsKmL&p0v_l7qy&A&Hk`4HWC@M)|oiFZ8YdgUWFf2Q>o#zO2$`SxrMR38rwV9PIxAN
zPzTdsFW91{#=E0#F(F@lfx1OUMO2TL=>39r_?hWSwT_Oa#AY1(H+1emljfjj&r7Z~
zPn!Oxuz1^mO&s}e+!J$0SDwj#_&&=FJ-BVxl>F{_kC*gxX5hT~PKv?|S2i?S%QeK*
IE_jidKH(ElKL7v#

literal 4
LcmezWkCy=e2NVJe

diff --git a/Testing/PluginTests/result/word/Shapes.txt b/Testing/PluginTests/result/word/Shapes.txt
index 46b134b197f35e75e0784bedbf94a8dd124693b1..9bff1b8de9836be427eab1bf4a29a0a59d1f2868 100644
GIT binary patch
literal 118
zcmezW@0h__gPjH^3=|md7#ucO4`eGa7&2HfC@_RGWH2N$lmJ<o48>r6CPN;BFGDIr
b5koqVv}fQ2LoNnvW*9-uK-B}%!NmXomj4_J

literal 2
JcmezW4*&xG0sa60


From ad6fbd51af45d7bebefed55a6c1276a572329c89 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 8 Feb 2024 09:09:29 +0900
Subject: [PATCH 28/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct        |   4 +-
 Plugins/dlls/CompareMSPowerPointFiles.sct   |   4 +-
 Plugins/dlls/CompareMSVisioFiles.sct        |   4 +-
 Plugins/dlls/CompareMSWordFiles.sct         |   4 +-
 Src/MergeAppLib.h                           |   4 +-
 Testing/PluginTests/PluginTests.js          | 123 +++++++++++++++++++-
 Testing/PluginTests/result/powerpnt.ppt.txt | Bin 298 -> 1730 bytes
 Testing/PluginTests/result/word.doc.txt     | Bin 836 -> 2254 bytes
 8 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 452e9dc976e..8a1570b7c71 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -79,7 +79,9 @@ function regWrite(Key, Value, TypeNm) {
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
-      fo.WriteLine(o.Name + ": " + o.Value);
+      try {
+        fo.WriteLine(o.Name + ": " + o.Value);
+      } catch (e) {}
     }
   } catch (e) {}
 }
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index adb57ce7195..a3e81bd2fe6 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -75,7 +75,9 @@ function regWrite(Key, Value, TypeNm) {
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
-      fo.WriteLine(o.Name + ": " + o.Value);
+      try {
+        fo.WriteLine(o.Name + ": " + o.Value);
+      } catch (e) {}
     }
   } catch (e) {}
 }
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 12d2a6b85a1..4d64188c77d 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -76,7 +76,9 @@ function regWrite(Key, Value, TypeNm) {
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
-      fo.WriteLine(o.Name + ": " + o.Value);
+      try {
+        fo.WriteLine(o.Name + ": " + o.Value);
+      } catch (e) {}
     }
   } catch (e) {}
 }
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index e547b16e7cc..052a1681891 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -77,7 +77,9 @@ function regWrite(Key, Value, TypeNm) {
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
-      fo.WriteLine(o.Name + ": " + o.Value);
+      try {
+        fo.WriteLine(o.Name + ": " + o.Value);
+      } catch (e) {}
     }
   } catch (e) {}
 }
diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h
index e51f49aa90b..c89c05a6ac5 100644
--- a/Src/MergeAppLib.h
+++ b/Src/MergeAppLib.h
@@ -7,8 +7,8 @@
 /* at Tue Jan 19 12:14:07 2038
  */
 /* Compiler settings for MergeAppLib.idl:
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0628 
-    protocol : dce , ms_ext, c_ext, robust
+    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 
+    protocol : all , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 
     VC __declspec() decoration level: 
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 73905e54cb6..c456db31cb6 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -13,17 +13,60 @@ try {
   FileSys.CreateFolder(ScriptFolder + "\\result\\powerpnt");
 } catch (e) { }
 
+var PluginSettings = {
+  "Plugins": {
+    "CompareMSExcelFiles.sct": {
+      "UnpackToFolder": 1,
+      "UpdateLinks": 3,
+      "CompareDocumentProperties": 1,
+      "CompareNames": 1,
+      "CompareCellValues": 1,
+      "CompareWorksheetsAsImage": 1,
+      "CompareWorksheetsAsHTML": 1,
+      "ImageWidth": 1000,
+      "ImageHeight": 3000,
+      "CompareFormulas": 1,
+      "CompareTextsInShapes": 1,
+      "CompareHeadersAndFooters": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSPowerPointFiles.sct": {
+      "UnpackToFolder": 1,
+      "CompareDocumentProperties": 1,
+      "CompareSlideAsImage": 1,
+      "CompareTextsInShapes": 1,
+      "CompareTextsInNotesPage": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSVisioFiles.sct": {
+      "UnpackToFolder": 1,
+      "ComparePageAsImage": 1,
+      "CompareTextsInShapes": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSWordFiles.sct": {
+      "UnpackToFolder": 1,
+      "CompareDocumentProperties": 1,
+      "CompareBookmarks": 1,
+      "CompareTextContents": 1,
+      "CompareDocumentsAsHTML": 1,
+      "CompareTextsInShapes": 1,
+      "CompareVBAMacros": 1
+    }
+  }
+};
+
 var MergeApp = {
   "GetOption": function (key, defvalue) {
-    try {
-      return WShell.RegRead("HKCU\\Software\\Thingamahoochie\\WinMerge\\" + key);
-    } catch (e) {
-      return defvalue;
+    var ary1 = key.split("/");
+    var ary2 = ary1[0].split("\\");
+    if (ary2.length > 1) {
+      return PluginSettings[ary2[0]][ary2[1]][ary1[1]];
     }
+    return PluginSettings[ary2[0]][ary1[1]];
   },
   "SaveOption": function (key, value) {
      var t = typeof value === "string" ? "REG_SZ" : "REG_DWORD";
-     WShell.RegWrite("HKCU\\Software\\Thingamahoochie\\WinMerge\\" + key, value, t);
   },
   "Translate": function (text) {
     return text;
@@ -64,6 +107,7 @@ function printPluginInfo(p) {
   WScript.Echo("PluginIsAutomatic: " + p.PluginIsAutomatic);
   try { WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension); } catch (e) {}
   try { WScript.Echo("PluginExtendedProperties: " + p.PluginExtendedProperties); } catch (e) {}
+  WScript.Echo("");
 }
 
 function CompareMSExcelFilesTest() {
@@ -102,6 +146,7 @@ function CompareMSPowerPointFilesTest() {
 function EditorAddinTest() {
   var asciiChars = "";
   var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\editor addin.sct");
+  printPluginInfo(p);
 
   for (var i = 0; i < 128; i++) {
     asciiChars += String.fromCharCode(i);
@@ -298,7 +343,75 @@ function EditorAddinTest() {
   p.PluginOnEvent(1, MergeApp);
 }
 
+function InsertDateTimeTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\insert datetime.sct");
+  printPluginInfo(p);
+
+  WScript.Echo(p.InsertDate("date="));
+  WScript.Echo(p.InsertTime("time="));
+  WScript.Echo();
+
+}
+
+function IgnoreLeadingLineNumbersTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\IgnoreLeadingLineNumbers.sct");
+  printPluginInfo(p);
+
+  //
+  text = "";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers1");
+  assertEquals("", text);
+  assertEquals(0, size);
+  assertEquals(false, changed);
+
+  //
+  text = "n1 aaa\r\nN2 bbb\r\n";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers2");
+  assertEquals(" aaa\r\n bbb\r\n", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "1 aaa\nbbb\n";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers3");
+  assertEquals(" aaa\nbbb\n", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "aaa\r2 bbb\r";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers4");
+  assertEquals("aaa\r bbb\r", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+}
+
 EditorAddinTest();
+InsertDateTimeTest();
+IgnoreLeadingLineNumbersTest();
 CompareMSExcelFilesTest();
 CompareMSWordFilesTest();
 CompareMSPowerPointFilesTest();
diff --git a/Testing/PluginTests/result/powerpnt.ppt.txt b/Testing/PluginTests/result/powerpnt.ppt.txt
index 589f640cac1d055665e5b5eb5d74a075046a1c5d..db463067351349d4b78ac7847bab0b7361f472d0 100644
GIT binary patch
literal 1730
zcma)+OKuZU5JhW@#2$K%gxYo_ej{XrKoAlUM+_{G{7D>xf9h@ru@W}GKA6H<7_bB2
z+^TkLCw>lt?)EF+y7jxS{{HFOGn?DMmNvCBn^|R<9b18I!MWf(=3Cl(yK8r>!>O_f
zmdD^^Il;4UAF&MhN7f}QL(b=5XMBf_dy2iX3wVn?s8`^>*k?x#iJInXgPC6Cybsxd
zb4oQ6>ybfZzB|X)AWAS9-|cKw>05j+sj1|dQ(4BNuJy4;O^v$Jg-09H5k*|1d!Daq
zI>b8gE|+kfd(0!g>e&E3&0tO+#H?THWaaE_EN5H1LqA1bnuanv@@Zt&v;$5}%jsmp
z-%Wdn<&;Ub?H-m#Jb8_2f>EXGK9q1@dOoT{3Q_jAM>&A$wkRFys^Fi1luD#5)j8t4
z87=pm-fZ+b^PXkbbkeH(6H^|6DbP|{LC+mA_3jDvJO7sd%%3d#U)6&{>@%Jbx$RSI
z=y2iaebIL1-zPsQGSu6$2TY>Dv=o0AUQr6qN$&->DLm62CEXqSZ46}0cNh1}r?JW<
z-SZ3Q)BTptPOkB%{ie)say3^?yNCb4{TFo|;r)WH#O_h<Gy4Rt54t2~dYYPp?#OC~
zRW-~1d+6p%JIgwo^p225mtduhH2=-Ls+&~69vdO;srh#|dfTYC?{^gXBmb3Ws6^hO
zo!ATSx~Cs>(`D}vC-&GT;wI~TRHi#9^l@EJ?D_RvGkeLsk6N{rv_-X{w8<x~tb&M<
aPv~~Vm_|pILT|>|R%I$u%PR~Wi{T%;`XBND

delta 12
TcmX@ayNZeF|G&+%STz^{BdrAX

diff --git a/Testing/PluginTests/result/word.doc.txt b/Testing/PluginTests/result/word.doc.txt
index bedb7bc6e92255ee7390ebadc990673234da17cf..4f78ef6a5d77c5ca2f155d781296720e0f47d309 100644
GIT binary patch
literal 2254
zcma)8OKuZE5Un*5cWAK+0<4LNfv`cr5FvpbgpGn^Wid1UB*gYuGvj>j!xph-jf6M^
zci;xVdsWl%C+#S*+C5WUUG?hK$Nu-XC$A)vROT{~flQ?oC+{VPY=-w7?<d#`Ig-0_
zN4j_`Wemx4=uy(a%|t#!lH$Zm_aH6h7*=wXl@iM-7H_<T?xmdTSs#}DohBrcD-<T5
z15qFPL-?Iy?^h@W(3=5A3@?VIt@b96jHL#>3?~!Seg|2BH-~){)tBs1+sRSy&nM#g
z083}^Q($HA=CH_00=Y%eP<wmuOy4JnnEn^qv7%=@Ej=ZR1=di#A7E!3DeO5pggmd}
zY2s<HVymxj7Fic4cw-;m3HB#gb&0^+V`<<!!pF%+<fbVP@Vr||s8g4nH4X|`K2v){
z&YTnPW*-fBxt)(LB4VD$u*XcXQkb<7-j{tDi|r+DopR*BY7A{w8!>Gw@{rzY?T`iL
zFQl2G24k=rYjrY@-uAPKnGXE1`g6s5sh*9qCT_91Mw%%*3D@JkYOwaK1HxJ@oKLYB
zq197Z&-#E|OwlL4J3`SVI444jX$Oq$ijOO#&zfZynf_+h=$o94^m_&l?M7XBegm&I
z8_eD*a+N^4fMuc$M-{>o%8rvQ%m&uZF>DoD6YQ8m?yL1WqI{}2$P?$4pIT*wYcq!R
z8=MNv*}RG`jGXg>RXkTlZi?~xBxR?u=4?i6M#lQ>$xB3(VNSA=a_oNU+G!WIE`Zjd
z&zB?jT8CQeJm(DKgkiQ@ihwou0<5jeye=bja-ezTQwJW{6E>^Z%bZ<|g>0v4nSITB
zee9egIXGJMJ0syF7-G+{n`h4DbD*nTNf!7V>>7>~TAc4>fs-%6yVV1&jp5N)UHIo*
z<*!m951~KPd#p#+hsSh13hI*qMjT_=^k<%loRwvKTMX9Ulyjymc;@6TP<uSd@a?OJ
zd1rkYLw@I7N{F_GjPS$UchoBT%IEWE^fme({feCYj($Yn@XVRW8oEuU&2Gp>y|S@d
z9j0$sSYPD0rTe_X+66*Z)_RrOKZBcYF5B6z{z=&X24k5#ZK1zu!&RRaJdLy?E+DxF
S4Kh>WiCV8KR?P|}T>k;_O?;gI

delta 12
TcmX>nc!Z7V|G&*WtWL}TC65I%


From 85cfdc4d60bf604c68201dd0ffe8184bf406f82f Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 8 Feb 2024 21:19:36 +0900
Subject: [PATCH 29/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      | 28 +++++++++++------
 Plugins/dlls/CompareMSPowerPointFiles.sct | 37 +++++++++++++++--------
 Plugins/dlls/CompareMSVisioFiles.sct      | 21 ++++++++-----
 Plugins/dlls/CompareMSWordFiles.sct       | 22 +++++++++-----
 4 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 8a1570b7c71..8cb2a02cdf9 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -78,8 +78,9 @@ function regWrite(Key, Value, TypeNm) {
 
 function writeObjectProperties(fo, items) {
   try {
-    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
+        var o = it.item();
         fo.WriteLine(o.Name + ": " + o.Value);
       } catch (e) {}
     }
@@ -166,7 +167,8 @@ function writeFormulas(fo, sht) {
 function getUsedRangeIncludingShapes(sht) {
   var col_max = 0;
   var row_max = 0;
-  for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+  for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
+    var shp = it.item();
     rng = shp.BottomRightCell;
     if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1 }
     if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1 }
@@ -182,8 +184,9 @@ function ungroupShapes(sht) {
     var cnt;
     do {
       cnt = sht.Shapes.Count;
-      for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
         try {
+          var shp = it.item();
           if (shp.Type === pbGroup) {
             shp.Ungroup();
           }
@@ -195,8 +198,9 @@ function ungroupShapes(sht) {
 
 function writeTextsInShapes(fo, sht) {
   try {
-    for (var it = new Enumerator(sht.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+    for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
       try {
+        var shp = it.item();
         fo.WriteLine(shp.Name + ": " + shp.TextFrame.Characters().Text);
       } catch (e) {}
     }
@@ -432,7 +436,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     }
   }
-  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, true);
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, -1);
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     fo.WriteLine("[Document Properties]");
     writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
@@ -445,7 +449,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     fo.WriteLine("");
   }
  
-  for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+  for (var it = new Enumerator(wbk.Worksheets); !it.atEnd(); it.moveNext()) {
+    var sht = it.item();
     if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
       fo.WriteLine("[" + sht.Name + "]");
       writeCellValues(fo, sht);
@@ -473,7 +478,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     if (!isAccessibleVBAProject(wbk)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
     } else {
-      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         fo.WriteLine("[CodeModule." + cmp.Name + "]");
         if (cmp.CodeModule.CountOfLines > 0) {
           fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
@@ -526,7 +532,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     }
   }
-  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, true);
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, -1);
 
   digit = String(wbk.Worksheets.Count).length;
   if (digit <= 0) { digit = 1; }
@@ -545,7 +551,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   }
  
   var No = 1;
-  for (var it = new Enumerator(wbk.Worksheets), sht = it.item(); !it.atEnd(); it.moveNext(), sht = it.item()) {
+  for (var it = new Enumerator(wbk.Worksheets); !it.atEnd(); it.moveNext()) {
+    var sht = it.item();
     No = zf + No;
     No = No.substr(No.length - digit, digit);
     if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
@@ -588,7 +595,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     } else {
-      for (var it = new Enumerator(wbk.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
       }
     }
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index a3e81bd2fe6..9cffae4d202 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -56,9 +56,9 @@ var fso = new ActiveXObject("Scripting.FileSystemObject");
 var wsh = new ActiveXObject("WScript.Shell");
 var mergeApp;
 
-function isAccessibleVBAProject(wbk) {
+function isAccessibleVBAProject(prs) {
   try {
-    return (wbk.VBProject.VBComponents.Count >= 0);
+    return (prs.VBProject.VBComponents.Count >= 0);
   } catch (e) {
     return false;
   }
@@ -74,10 +74,12 @@ function regWrite(Key, Value, TypeNm) {
 
 function writeObjectProperties(fo, items) {
   try {
-    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
+        var o = it.item();
         fo.WriteLine(o.Name + ": " + o.Value);
       } catch (e) {}
+      o = null;
     }
   } catch (e) {}
 }
@@ -95,7 +97,8 @@ function writeShape(fo, shp) {
         }
       }
     } else if (shpType === 6) { //msoGroup = 6
-      for (var it = new Enumerator(shp.GroupItems), shp2 = it.item(); !it.atEnd(); it.moveNext(), shp2 = it.item()) {
+      for (var it = new Enumerator(shp.GroupItems); !it.atEnd(); it.moveNext()) {
+        var shp2 = it.item();
         writeShape(fo, shp2);
       }
     } else if (shp.HasTextFrame) {
@@ -108,7 +111,8 @@ function writeShape(fo, shp) {
 
 function writeTextsInShapes(fo, shps) {
   try {
-    for (var it = new Enumerator(shps), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+    for (var it = new Enumerator(shps); !it.atEnd(); it.moveNext()) {
+      var shp = it.item();
       writeShape(fo, shp);
     }
   } catch (e) {}
@@ -167,7 +171,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     } 
   }
-  var prs = pp.Presentations.Open(fileSrc2);
+
+  var prs = pp.Presentations.Open(fileSrc2, -1);
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     fo.WriteLine("[Document Properties]");
@@ -175,7 +180,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     fo.WriteLine("");
   }
  
-  for (var it = new Enumerator(prs.Slides), sld = it.item(); !it.atEnd(); it.moveNext(), sld = it.item()) {
+  for (var it = new Enumerator(prs.Slides); !it.atEnd(); it.moveNext()) {
+      var sld = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       fo.WriteLine("[" + sld.Name + "]");
       writeTextsInShapes(fo, sld.Shapes);
@@ -186,23 +192,25 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       writeTextsInShapes(fo, sld.NotesPage.Shapes);
       fo.WriteLine("");
     }
+    sld = null;
   }
  
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(prs)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
     } else {
-      for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(prs.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         fo.WriteLine("[CodeModule." + cmp.Name + "]");
         if (cmp.CodeModule.CountOfLines > 0) {
           fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
         }
         fo.WriteLine("");
+        cmp = null;
       }
     }
   }
 
-  sld = null;
   prs.Close();
   prs = null;
   pp.Quit();
@@ -242,7 +250,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     } 
   }
-  var prs = pp.Presentations.Open(fileSrc2);
+  var prs = pp.Presentations.Open(fileSrc2, -1);
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
@@ -250,7 +258,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     fo.Close();
   }
  
-  for (var it = new Enumerator(prs.Slides), sld = it.item(); !it.atEnd(); it.moveNext(), sld = it.item()) {
+  for (var it = new Enumerator(prs.Slides); !it.atEnd(); it.moveNext()) {
+    var sld = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + ".txt"), true, true);
       writeTextsInShapes(fo, sld.Shapes);
@@ -266,6 +275,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     if (regRead(REGKEY_PATH + "CompareSlideAsImage", true)) {
       saveSlideAsImage(sld, fso.BuildPath(folderDst, sld.Name + ".png"));
     }
+    sld = null;
   }
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(prs)) {
@@ -273,13 +283,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     } else {
-      for (var it = new Enumerator(prs.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(prs.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = nul;
       }
     }
   }
 
-  sld = null;
   prs.Close();
   prs = null;
   pp.Quit();
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 4d64188c77d..e808eed9e18 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -75,8 +75,9 @@ function regWrite(Key, Value, TypeNm) {
 
 function writeObjectProperties(fo, items) {
   try {
-    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
+        var o = it.item();
         fo.WriteLine(o.Name + ": " + o.Value);
       } catch (e) {}
     }
@@ -88,8 +89,9 @@ function ungroupShapes(pge) {
     var cnt;
     do {
       cnt = pge.Shapes.Count;
-      for (var it = new Enumerator(pge.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      for (var it = new Enumerator(pge.Shapes); !it.atEnd(); it.moveNext()) {
         try {
+          var shp = it.item();
           shp.Ungroup();
         } catch (e) {}
       }
@@ -99,8 +101,9 @@ function ungroupShapes(pge) {
 
 function writeTextsInShapes(fo, pge) {
   try {
-    for (var it = new Enumerator(pge.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+    for (var it = new Enumerator(pge.Shapes); !it.atEnd(); it.moveNext()) {
       try {
+        var shp = it.item();
         fo.WriteLine(shp.Name + ": " + shp.Text);
       } catch (e) {}
     }
@@ -162,7 +165,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   }
   var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
 
-  for (var it = new Enumerator(doc.Pages), pge = it.item(); !it.atEnd(); it.moveNext(), pge = it.item()) {
+  for (var it = new Enumerator(doc.Pages); !it.atEnd(); it.moveNext()) {
+    var pge = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       fo.WriteLine("[" + pge.Name + "]");
       ungroupShapes(pge);
@@ -175,7 +179,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     if (!isAccessibleVBAProject(doc)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
     } else {
-      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         fo.WriteLine("[CodeModule." + cmp.Name + "]");
         if (cmp.CodeModule.CountOfLines > 0) {
           fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
@@ -227,7 +232,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   }
   var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
 
-  for (var it = new Enumerator(doc.Pages), pge = it.item(); !it.atEnd(); it.moveNext(), pge = it.item()) {
+  for (var it = new Enumerator(doc.Pages); !it.atEnd(); it.moveNext()) {
+    var pge = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, pge.Name + ".txt"), true, true);
       ungroupShapes(pge);
@@ -245,7 +251,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     } else {
-      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
       }
     }
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index 052a1681891..b9843e609c3 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -76,7 +76,8 @@ function regWrite(Key, Value, TypeNm) {
 
 function writeObjectProperties(fo, items) {
   try {
-    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      var o = it.item();
       try {
         fo.WriteLine(o.Name + ": " + o.Value);
       } catch (e) {}
@@ -86,7 +87,8 @@ function writeObjectProperties(fo, items) {
 
 function writeBookmarks(fo, items) {
   try {
-    for (var it = new Enumerator(items), o = it.item(); !it.atEnd(); it.moveNext(), o = it.item()) {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      var o = it.item();
       fo.WriteLine(o.Name + ": " + o.Start);
     }
   } catch (e) {}
@@ -97,8 +99,9 @@ function ungroupShapes(doc) {
     var cnt;
     do {
       cnt = doc.Shapes.Count;
-      for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+      for (var it = new Enumerator(doc.Shapes); !it.atEnd(); it.moveNext()) {
         try {
+          var shp = it.item();
           if (shp.Type === pbGroup) {
             shp.Ungroup();
           }
@@ -110,8 +113,9 @@ function ungroupShapes(doc) {
 
 function writeTextsInShapes(fo, doc) {
   try {
-    for (var it = new Enumerator(doc.Shapes), shp = it.item(); !it.atEnd(); it.moveNext(), shp = it.item()) {
+    for (var it = new Enumerator(doc.Shapes); !it.atEnd(); it.moveNext()) {
       try {
+        var shp = it.item();
         fo.WriteLine(shp.Name + ": " + shp.TextFrame.TextRange.Text);
       } catch (e) {}
     }
@@ -166,7 +170,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     } 
   }
-  var doc = wd.Documents.Open(fileSrc2, true, true);
+  var doc = wd.Documents.Open(fileSrc2, -1, -1);
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     fo.WriteLine("[Document Properties]");
@@ -197,7 +201,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     if (!isAccessibleVBAProject(doc)) {
       fo.WriteLine(translate(MsgCannotGetMacros));
     } else {
-      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         fo.WriteLine("[CodeModule." + cmp.Name + "]");
         if (cmp.CodeModule.CountOfLines > 0) {
           fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
@@ -247,7 +252,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
     } 
   }
-  var doc = wd.Documents.Open(fileSrc2);
+  var doc = wd.Documents.Open(fileSrc2, -1, -1);
 
   if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
@@ -283,7 +288,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
     } else {
-      for (var it = new Enumerator(doc.VBProject.VBComponents), cmp = it.item(); !it.atEnd(); it.moveNext(), cmp = it.item()) {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
       }
     }

From 9a685b8e140d989fae88a8346478f683611bb5af Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 8 Feb 2024 21:39:15 +0900
Subject: [PATCH 30/58] WIP

---
 Plugins/dlls/CompareMSPowerPointFiles.sct | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index 9cffae4d202..2e409aba70d 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -78,8 +78,8 @@ function writeObjectProperties(fo, items) {
       try {
         var o = it.item();
         fo.WriteLine(o.Name + ": " + o.Value);
+        o = null;
       } catch (e) {}
-      o = null;
     }
   } catch (e) {}
 }
@@ -109,11 +109,12 @@ function writeShape(fo, shp) {
   } catch (e) {}
 }
 
-function writeTextsInShapes(fo, shps) {
+function writeTextsInShapes(fo, p) {
   try {
-    for (var it = new Enumerator(shps); !it.atEnd(); it.moveNext()) {
+    for (var it = new Enumerator(p.Shapes); !it.atEnd(); it.moveNext()) {
       var shp = it.item();
       writeShape(fo, shp);
+      shp = null;
     }
   } catch (e) {}
 }
@@ -184,12 +185,12 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       var sld = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       fo.WriteLine("[" + sld.Name + "]");
-      writeTextsInShapes(fo, sld.Shapes);
+      writeTextsInShapes(fo, sld);
       fo.WriteLine("");
     }
     if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
       fo.WriteLine("[" + sld.Name + ".NotesPage]");
-      writeTextsInShapes(fo, sld.NotesPage.Shapes);
+      writeTextsInShapes(fo, sld.NotesPage);
       fo.WriteLine("");
     }
     sld = null;
@@ -262,13 +263,13 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     var sld = it.item();
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + ".txt"), true, true);
-      writeTextsInShapes(fo, sld.Shapes);
+      writeTextsInShapes(fo, sld);
       fo.Close();
     }
  
     if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + "_NotesPage.txt"), true, true);
-      writeTextsInShapes(fo, sld.NotesPage.Shapes);
+      writeTextsInShapes(fo, sld.NotesPage);
       fo.Close();
     }
  

From 34c0dc93ed6e38c9a22cd56f40be7d2e928c96cf Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 9 Feb 2024 08:04:38 +0900
Subject: [PATCH 31/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      | 4 ++++
 Plugins/dlls/CompareMSPowerPointFiles.sct | 4 ++++
 Plugins/dlls/CompareMSVisioFiles.sct      | 4 ++++
 Plugins/dlls/CompareMSWordFiles.sct       | 4 ++++
 Testing/PluginTests/PluginTests.js        | 6 ++++++
 5 files changed, 22 insertions(+)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 8cb2a02cdf9..a51c95d886a 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -500,6 +500,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
   
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
@@ -613,6 +615,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
   
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index 2e409aba70d..b1d4f72f410 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -222,6 +222,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
 
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
@@ -301,6 +303,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
 
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index e808eed9e18..bc22a375cb7 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -201,6 +201,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
 
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
@@ -268,6 +270,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
 
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index b9843e609c3..b2af4147d0a 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -224,6 +224,8 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
   
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
@@ -304,6 +306,8 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   pbChanged = true;
   pSubcode = 0;
 
+  CollectGarbage();
+
   var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index c456db31cb6..9cb72d2e29b 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -117,7 +117,9 @@ function CompareMSExcelFilesTest() {
   var subcode = 0;
   p.PluginOnEvent(0, MergeApp);
   p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.tsv", changed, subcode);
+  CollectGarbage();
   p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
+  CollectGarbage();
   p.PluginOnEvent(1, MergeApp);
 }
 
@@ -128,7 +130,9 @@ function CompareMSWordFilesTest() {
   var subcode = 0;
   p.PluginOnEvent(0, MergeApp);
   p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word.doc.txt", changed, subcode);
+  CollectGarbage();
   p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word\\", changed, subcode);
+  CollectGarbage();
   p.PluginOnEvent(1, MergeApp);
 }
 
@@ -139,7 +143,9 @@ function CompareMSPowerPointFilesTest() {
   var subcode = 0;
   p.PluginOnEvent(0, MergeApp);
   p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt.ppt.txt", changed, subcode);
+  CollectGarbage();
   p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt\\", changed, subcode);
+  CollectGarbage();
   p.PluginOnEvent(1, MergeApp);
 }
 

From 32f86c72805d1a6b06655c5cf51222cd838f0b55 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 9 Feb 2024 08:09:44 +0900
Subject: [PATCH 32/58] WIP

---
 Testing/PluginTests/result/excel.xls.txt      | Bin 2740 -> 0 bytes
 Testing/PluginTests/result/excel/(0)Names.txt |   1 -
 .../result/excel/(1)Sheet1(1-1).png           | Bin 31086 -> 0 bytes
 .../PluginTests/result/excel/(1)Sheet1.tsv    | Bin 130 -> 0 bytes
 .../excel/(1)Sheet1_HeadersAndFooters.txt     | Bin 242 -> 0 bytes
 .../result/excel/(1)Sheet1_Shapes.txt         | Bin 180 -> 0 bytes
 .../result/excel/(2)Sheet2(1-1).png           | Bin 282 -> 0 bytes
 .../PluginTests/result/excel/(2)Sheet2.tsv    | Bin 8 -> 0 bytes
 .../excel/(2)Sheet2_HeadersAndFooters.txt     | Bin 182 -> 0 bytes
 .../result/excel/(2)Sheet2_Shapes.txt         |   1 -
 .../result/excel/(3)Sheet3(1-1).png           | Bin 430 -> 0 bytes
 .../PluginTests/result/excel/(3)Sheet3.tsv    | Bin 8 -> 0 bytes
 .../excel/(3)Sheet3_HeadersAndFooters.txt     | Bin 182 -> 0 bytes
 .../result/excel/(3)Sheet3_Shapes.txt         |   1 -
 .../result/excel/(4)Sheet4(1-1).png           | Bin 1151 -> 0 bytes
 .../PluginTests/result/excel/(4)Sheet4.tsv    | Bin 70 -> 0 bytes
 .../excel/(4)Sheet4_HeadersAndFooters.txt     | Bin 182 -> 0 bytes
 .../result/excel/(4)Sheet4_Shapes.txt         |   1 -
 .../result/excel/(5)Sheet5(1-1).png           | Bin 704 -> 0 bytes
 .../PluginTests/result/excel/(5)Sheet5.tsv    | Bin 12 -> 0 bytes
 .../excel/(5)Sheet5_HeadersAndFooters.txt     | Bin 182 -> 0 bytes
 .../result/excel/(5)Sheet5_Shapes.txt         |   1 -
 .../result/excel/(6)Sheet6(1-1).png           | Bin 1154 -> 0 bytes
 .../PluginTests/result/excel/(6)Sheet6.tsv    | Bin 38 -> 0 bytes
 .../excel/(6)Sheet6_HeadersAndFooters.txt     | Bin 182 -> 0 bytes
 .../result/excel/(6)Sheet6_Shapes.txt         |   1 -
 Testing/PluginTests/result/excel/Sheet1.bas   |  12 ---
 Testing/PluginTests/result/excel/Sheet2.bas   |   9 --
 Testing/PluginTests/result/excel/Sheet3.bas   |   9 --
 Testing/PluginTests/result/excel/Sheet4.bas   |   9 --
 Testing/PluginTests/result/excel/Sheet5.bas   |   9 --
 Testing/PluginTests/result/excel/Sheet6.bas   |   9 --
 .../PluginTests/result/excel/ThisWorkbook.bas |   9 --
 Testing/PluginTests/result/powerpnt.ppt.txt   | Bin 1730 -> 0 bytes
 .../result/powerpnt/CannotGetMacros.bas       | Bin 514 -> 0 bytes
 .../PluginTests/result/powerpnt/Slide1.png    | Bin 2895 -> 0 bytes
 .../PluginTests/result/powerpnt/Slide1.txt    | Bin 64 -> 0 bytes
 .../result/powerpnt/Slide1_NotesPage.txt      | Bin 168 -> 0 bytes
 Testing/PluginTests/result/word.doc.txt       | Bin 2254 -> 0 bytes
 .../PluginTests/result/word/(0)Bookmarks.txt  |   1 -
 .../result/word/CannotGetMacros.bas           | Bin 514 -> 0 bytes
 Testing/PluginTests/result/word/Document.htm  |  99 ------------------
 Testing/PluginTests/result/word/Document.txt  | Bin 442 -> 0 bytes
 Testing/PluginTests/result/word/Shapes.txt    | Bin 118 -> 0 bytes
 .../PluginTests/result/word/ThisDocument.bas  |   9 --
 45 files changed, 181 deletions(-)
 delete mode 100644 Testing/PluginTests/result/excel.xls.txt
 delete mode 100644 Testing/PluginTests/result/excel/(0)Names.txt
 delete mode 100644 Testing/PluginTests/result/excel/(1)Sheet1(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(1)Sheet1.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/(2)Sheet2(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(2)Sheet2.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/(3)Sheet3(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(3)Sheet3.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/(4)Sheet4(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(4)Sheet4.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/(5)Sheet5(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(5)Sheet5.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/(6)Sheet6(1-1).png
 delete mode 100644 Testing/PluginTests/result/excel/(6)Sheet6.tsv
 delete mode 100644 Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt
 delete mode 100644 Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
 delete mode 100644 Testing/PluginTests/result/excel/Sheet1.bas
 delete mode 100644 Testing/PluginTests/result/excel/Sheet2.bas
 delete mode 100644 Testing/PluginTests/result/excel/Sheet3.bas
 delete mode 100644 Testing/PluginTests/result/excel/Sheet4.bas
 delete mode 100644 Testing/PluginTests/result/excel/Sheet5.bas
 delete mode 100644 Testing/PluginTests/result/excel/Sheet6.bas
 delete mode 100644 Testing/PluginTests/result/excel/ThisWorkbook.bas
 delete mode 100644 Testing/PluginTests/result/powerpnt.ppt.txt
 delete mode 100644 Testing/PluginTests/result/powerpnt/CannotGetMacros.bas
 delete mode 100644 Testing/PluginTests/result/powerpnt/Slide1.png
 delete mode 100644 Testing/PluginTests/result/powerpnt/Slide1.txt
 delete mode 100644 Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt
 delete mode 100644 Testing/PluginTests/result/word.doc.txt
 delete mode 100644 Testing/PluginTests/result/word/(0)Bookmarks.txt
 delete mode 100644 Testing/PluginTests/result/word/CannotGetMacros.bas
 delete mode 100644 Testing/PluginTests/result/word/Document.htm
 delete mode 100644 Testing/PluginTests/result/word/Document.txt
 delete mode 100644 Testing/PluginTests/result/word/Shapes.txt
 delete mode 100644 Testing/PluginTests/result/word/ThisDocument.bas

diff --git a/Testing/PluginTests/result/excel.xls.txt b/Testing/PluginTests/result/excel.xls.txt
deleted file mode 100644
index 5e7f86224a53100e741dc9d49eeb7aa39a679e07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2740
zcmd^B%T59@6g^u^{D%n(qA?N}9zk}9pbIfXG%kpXL0$$01DN=0{($kT)N|Volv3lw
zrDoEZ_V(P<+tc1@KR>#-K!isOu)r;Lv7<^C9gJxkV2Ql3N9f@WDL!fSES1mFw8R?G
zTQEE5vu{X?@QFvt)ZTKhx%XV$j%e?(2y0&<2CSv%nZii5`>L(Ig=;getco(ilZr$~
zf5rL>qdvxr-+<9q`IgyeTwd|IsL(-$L<cy<oGj1e_j?t#ym}t5Ge#7VY018#@(^XU
z#jkf3+DBBJb6skfQlBPcnUO`?^lZ=B8q#LtWxjd@?Jr~0iJKZ<7n>ooU@mb_)yE#T
zHlrPpAwULgg^kCxW0G-)R*derE_R!B9f6C@;6#lpoc10F&EC}Ov)$|4AwHC?$#3*_
z=W6qbF4DiAov-&hMO|iBnN4P2uOMvA3P!V<SJ48JXeKCo7Jpr{qS36y{XOM+Hkl2Q
z>m`;PpQ`l^aE&Ww+yQMz${rx(H)Qt9TDa>`Or*G={*&URRc2?YoKLq>BHaY_pL8o5
z-5NYO<n)^3kox7h_sXcSR$!@^^UU3e<wS}K>hCLBr*?9FO2+qj2Y6sT%e)@*lw9CO
zDLdgmK+fce(Om24_uRfub;v6JkoX?8hkdor1KQ+iah%cW9+QT?JLx-BL){4EULzdq
e?D%Qy_`FOOX?#*7L&yKfWav1*lcD2XE$A;}c%dx-

diff --git a/Testing/PluginTests/result/excel/(0)Names.txt b/Testing/PluginTests/result/excel/(0)Names.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(0)Names.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(1)Sheet1(1-1).png b/Testing/PluginTests/result/excel/(1)Sheet1(1-1).png
deleted file mode 100644
index c279f471f1d1c70240ea7113da62ac999634ce0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31086
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

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1.tsv b/Testing/PluginTests/result/excel/(1)Sheet1.tsv
deleted file mode 100644
index 2be88251fe7734bb778513fd38fb98b9fb39e46c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmezWFOeaMA(?>_2$jIFgdvron4tv91BoUwaDmluF{A+H(tskoKoO7*PAKb`!A^q{
h1~7giP&^5UL8hjFRipx0oIstN4C!Eg3YZVk4FJbL4}bsw

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(1)Sheet1_HeadersAndFooters.txt
deleted file mode 100644
index aabbcdaf14eaa515f27c0521e0deb8a30734a51f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41%?bHJ}(0ogENqy2UG`=M^~%H;Kl$_6U30o
zkPg&|X<7i#>~x@B1qL;S0I*t^y>1NoKnO7xWN#W0AKhMbwV0+NT!5}tjll(MF94Jv
BD3kyI

diff --git a/Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt b/Testing/PluginTests/result/excel/(1)Sheet1_Shapes.txt
deleted file mode 100644
index a71a5af2aa7e7b4bdab084e51c8c656bfb281091..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmezWFN7hLp@N}=!HFRsNGmWHGFSo0V1^8aM1}&OoFM}*0~Z6jDkC&iMnKgH4DJj?
jKvPPA`mpOV#?Y07MVANA)<mF5B|te7u#OD42*@n}IQJc8

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2(1-1).png b/Testing/PluginTests/result/excel/(2)Sheet2(1-1).png
deleted file mode 100644
index 5091fbe51dbaac906bc76aca5c0057bd38f2074c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`Jpz0}T>t<7zjyE6_wV1YTepszoBP6r3)7}e14`bxbEl!9p}4qMSXlV#
z)vMat+UL%l`~Ca3hK9!Z^XJvn)Kpbf|NZ-S<Hn6|-@XCWFZ#445=cpu1o;I6&BO*6
z&I;?j0;=IG@Q5sCVBk9p!i>lBSEK+1%{^TlLoEE0C0L!=4U8NmMVQ>m_%ynW4jl7S
zZMN9CB1M3?+2AVAqh=!w*2QdsY*&ohUo|u`GAK7OD)?ls?f@FW;OXk;vd$@?2>{SP
BaGU@D

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2.tsv b/Testing/PluginTests/result/excel/(2)Sheet2.tsv
deleted file mode 100644
index ca9053508c38ce794241a50d536ce683f2f662f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmezW&yazafr|kE5MTmE

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(2)Sheet2_HeadersAndFooters.txt
deleted file mode 100644
index fd9e062162f0e802be6cb4d09e1f785ce6505003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

diff --git a/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt b/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(2)Sheet2_Shapes.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(3)Sheet3(1-1).png b/Testing/PluginTests/result/excel/(3)Sheet3(1-1).png
deleted file mode 100644
index 86595a359f5d8729ab91ab1db751503cbf405014..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`rv><gxc>kD|L@<w>(;IN@ZrPc$&<sv!q%=``|sbs%a<>!si|GMbV*iL
z_V@4KPo6wcQc^l}=#ad;{Oi}RtE#GI&Yb!5>C?u>#@^muX=&+~FJHcY|2`xn1Zc3g
zx3{04pN)+TGc$8_b@ko5ce%K@7A;ydd-m*Evu4ekH?Os|_1?XE3JMBWuU<WT`0$@U
ze?EWy91#)m{rmT`XU_snFy&QU0i=vdg8YJkE+h>w@CM9y57f<B;1OBOz`%DHgc*<L
zuSfw3CVRR#hFJI~OR#=n&k302q@a1mOLnrzRFSC*d`>l}%x9FJ;wd=cN^-DBP<xRE
z<0OUpz=Qdd)?6|&D!Meq+B0yLZ^R7Wxkc)ZNj?)FJ(xDdkRdo{O@iJ}2caB3fdelR
c86_kbDlAwvySL7{4z!NJ)78&qol`;+0MabYU;qFB

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3.tsv b/Testing/PluginTests/result/excel/(3)Sheet3.tsv
deleted file mode 100644
index 3323f354391b7d5238900363722196567eebfc7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmezW&yj(bfr|kE5WoUf

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(3)Sheet3_HeadersAndFooters.txt
deleted file mode 100644
index fd9e062162f0e802be6cb4d09e1f785ce6505003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

diff --git a/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt b/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(3)Sheet3_Shapes.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(4)Sheet4(1-1).png b/Testing/PluginTests/result/excel/(4)Sheet4(1-1).png
deleted file mode 100644
index fa9064d5df2da6fa16e9708803ae810f815c22f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1151
zcmeAS@N?(olHy`uVBq!ia0vp^K0qwQ!3-piojoxRNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^B>_bI?9#P$FG|F2)a-oJnU)vH&}pFjWi@84OoW^LKB<-vmoRaI4GWo1vF
zK3%b5#gQXN5)u+-&YXGp@Zk?1K5XB<{nxKw|Ni~kv17;DwQIkA{rdg;_lAZBKR>^y
zsHjbwHZ5GZP)kc|_UzeQTwL+-@hK@O2M!#ltgO6z`Ep4~$@AyWSFT(c78cgm*Z1PZ
z3l<g@p!4qEzyI>(%ciEL^78Uy$Bro}Dc!tzbHaoPlO|0H4h}we@L*O}*6P)(_w3md
z6BDy_>sBu>ugJ*A6DLlzwzd`*7vH&aM_E~U*|KG6X=x%NBD}o33JMBKmMl?MS6{GT
zL1AH`o10rfL4miocVlCtrKP2jk<t3~>oqksw{6?T&(DAH;zd(a(`V0~B_<}$n>Q~m
zE^hkt>4JiSJ9qB%@bH*Ab*hz>)$QB2+uGVnOG_U;dQ@LuudS_p?b@|DbLN~ocW&v@
zr57$-m^*jwx^?SfV`C#CA}(FJR9jn{ot@p%(xRcE@#M*qprD{tt5&I~sC0C6czSwf
zW@b*FJUKc#+TGp#<HwIYJUkB{KJ@qZKY8+`y}kX688b{wOul^ivU~ULDO0A1i;I8$
z{Q1U>8vy|UU0q$~=H{K9o$2Z6p`oF<xw%eGPDx2gl9H0Pwzj>!z54q4-@bkO@#Dv#
zLx<kJeS77~l~boq-MxGF`t|F;aNZX=qYX$cD+%%o2FCv22Mli6Yc+r_<}C1tEM{Qf
zI}E~%$MaXD026VFr;B5Vh5y^2jlC?2JWH6h6gRv$sL08h!@Q2+BBP<DQ18DR761Lp
z<!e41WVOH4bavKF$?C)Q|9G-19^80zaJ}GT-;JGN-3`SjdLoiyrv0!};?vDYuV*`J
z^moTof#8`-D}JV^&S`b9EAUCkKCye_vMp<0HM+KN-+bh2dn9vVVgWOI%5*+HfwH*V
zCdJiLk6qWEsS>N#t*Eo5`$yT@LtOI$G(v=<XMemgsjM!zZBc1X-rXdnOMZ-MSq=dy
zoX0C=d0FOe2#C*5Ibb#YsD?R*+3QBhV3*QoDN#;6(-tZ}WZx9)_xtLS#o{_|?!G?t
z)upXd`I2SqQMQjQp?=*iz6ZsgC8oUcy?Aq9{db)WVhi~8UnpJnt3ky4@u8~F<{j@3
z893a28+}Lo@V(wYS~<(Pd?w6eThno7R$bA)FSd71t`T)HRsNcmdi`Uss!>YLo9_n&
ubnh;|cYk$@?ydH<J7qlMKCR?<$SrxZr|65q-wI$PFnGH9xvX<aXaWFcDS{yY

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4.tsv b/Testing/PluginTests/result/excel/(4)Sheet4.tsv
deleted file mode 100644
index e3ff3e098634cec21d0981bd015095a0eb9b9091..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70
zcmezW&zB*eA&)_U!Hpr6AqhyE0<i%QS|O1N4517m49*PNKru_OxB`O_kTzm4Vc=!p
GVgLZH0SR3I

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(4)Sheet4_HeadersAndFooters.txt
deleted file mode 100644
index fd9e062162f0e802be6cb4d09e1f785ce6505003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

diff --git a/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt b/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(4)Sheet4_Shapes.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(5)Sheet5(1-1).png b/Testing/PluginTests/result/excel/(5)Sheet5(1-1).png
deleted file mode 100644
index 67ce0ad6331e30492ad7dcfc212257572274b6cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1eDFpb0xc>kD|M20%4<A1K`0?ZZ{rfLpzI^G@r9+1f1qTQ3+qdt?ks}Kh
zESNQG*6Y`=zkU0bnwn~CY<%t7HA6$gii!$tZSBR27n_)v7#JA%`T5<sbLYW>2ce;%
zK)XCWJ@@Y2tEQ$lapJ@c8#bh;r=L1?%G})i<jIpaZ{Ezz%nS$!aB^~5zkYpwe!h;5
zPD@M6{Q2`892|UoeG3Z<ckI|<Wo4C?mR4R~K5g1GcX#)sq@?H1pRZcA%G%mGE-tRJ
zvU2j|$#?JGU9)D*n>TOf%$alR)-59=qv_M9tEi~#-o3lIxw*Q!`rf^J8X6iaSFW_Q
zw2X;~Nls3lGG)rUcke7LETW^Mi;9Zs>gvM6!c0v~fByXW{{8#gw{Jgs^yt~MXIHOY
z{rmSX&?C_b3Lq+>B*-rq7*@0d48^%moPl<67I;J!GcfQS24TkI`72U@f_pt(978Pp
z-%c{*JFLLtTFb!pJ|+3nfi!)cduQhSj$fuyDz!xI!qQil)Lnl%p1ORTp?;rJtnHZ<
z|K44E!l)3qO4TII&Wv9+>k;PxE(Iaip!gkbnTq}DSEoG?<WfJd`M&O{kFg<7a#DOf
zRo={J)~b5(&{<^1+Y_@omMiNk2i~&@xF!6k!p(fq3#FQ~TyI{LRJ%o=-gJFJ?v3D!
zD<+CZ&1zo$JwrjL^4}Uk!}pm-s!WfRn!gBidd+VBayf$y!}f;~k^Mj7W&u6I;OXk;
Jvd$@?2>>;zcCG*b

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5.tsv b/Testing/PluginTests/result/excel/(5)Sheet5.tsv
deleted file mode 100644
index cd493ac6239ef5d75017b84ed17bceefc0ca4112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12
TcmezW&yYcn!H9vEfr|kE8@K|d

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(5)Sheet5_HeadersAndFooters.txt
deleted file mode 100644
index fd9e062162f0e802be6cb4d09e1f785ce6505003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

diff --git a/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt b/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(5)Sheet5_Shapes.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/(6)Sheet6(1-1).png b/Testing/PluginTests/result/excel/(6)Sheet6(1-1).png
deleted file mode 100644
index 4673fc73bbe8ba8ebc6648d5505357720bb4873a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO_!3-qNt7SX^QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn~YUVB!t%332`Z|NraPulMZP^YZ1(ef#!3e*F08(WAF--#&Ki*ww37Pn<Y$
z=FFK}w{D#}b!y?lg|lYO`t|GA-o1PO{P`m<FTZWuHZ?W1HEY%g2?=f9yt%Wp)6voK
z{Q2{_xw)ySsmaO7_V)Hyu3S-7Rh>9-qKk`*rlzK!pI?7}e_C4Fgb5Q49Xh0|tGjF0
zE@NZkEnBuoOG~Gxr>|eX-q+W+q@<*vpdc(PtgfyO=<>F<w&394<;#~ZTeeI>LSpOI
zt%{0@2M->+bm@|zq2bAsC(X^xSFT*y*x1<A)Rd5rP*_;#;NZ~E&~V_ufwgPb*4Ea}
zo;`cTiWO6)Ou2F6#<OS7Qc_ZUe0)4TJw-%By1KenuU_r!?3|sQot2ffZr!@clPBlp
z<t<pSAR{Bg-{0TX*0!akrM$fS$&)9qUcJi6$zf+_=jP^~KY#wJRjaJ5tnS~x9~~W?
znVDH#U7eViSYKa%@7}$dnwn3aKK=gv`^b?a-@bh-D=RyG{J6EX^_)3#3=9mkwY3EV
z1f-;-<mBWwY}j!6^y%HZcNY~Eg@l9@7Z-p2{Q1Fy2aJr2p`oFAdV0*v%uALmX>D!Q
z*VkXVbZKN{WL#XFtE=nRuU|iY{HUOyU}<TouC6|5(j;$h?|Jj)UA%bF!ongdD(dFV
zn@LGYUS3|Nrl$M%?|=XP{i8>Zo<Dzn=gysn4<EjG@#5*zr+4q(J$LTh_wV0<;auza
z@C=YzUlQaO3``h92r$%dVQvIEowL9rvY3H^?=T269?xHq0?Y)?o-U3d7XEK18BRK^
zz~g!~IKb$N)|G(Wk4;{c@LJ7n?(=>puCm#B_Kv%`pLCx{MC<?B^m6h4i!y@Mj@q@)
zw<x_YJ{4`EbXP-EYVL`3zN>V%9cfm{ogB3O$Xr?XsUF5<@vNsDzG@`xIMuTx%GNKu
zm;Hy)qaE%ckIw&k`PX%IAkzt(UsVlH8X^LXw>(wXaPLn2{cr8dm=<r<$Eq9R8KsOS
zF+7ZHT`}{36!(_7VYS)0VLJt8uDR&q>ZX0MFUeE1b@Q8<b40l&oI2a#5$w{SvHeBH
zmnJhq&Onp2T{5z=*$vEp!#2nFUEqz1>izggCq21eX}#mYo_YFr-~F0-i`URhV_l6k
zH#f_k=MoqAFYFELx45Pt_}MnNM{dni3El8dmz+Akv40DDS>t9>Zh7|SkH%h3>DOzf
oUOHgNS-803*SBZ!oiDgQU(MYA!0d4!FpL>IUHx3vIVCg!0DWSCu>b%7

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6.tsv b/Testing/PluginTests/result/excel/(6)Sheet6.tsv
deleted file mode 100644
index d3c9bf9d193171e0ddddee20706d32c845310ac2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38
mcmezW&y}GF2=jqhm%)g^kimq(jKKoPG6rG`AfK0kiva+xUItMB

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt b/Testing/PluginTests/result/excel/(6)Sheet6_HeadersAndFooters.txt
deleted file mode 100644
index fd9e062162f0e802be6cb4d09e1f785ce6505003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmezW&xawEA&sGg!2?JqGNb^>A_gl41qNOQE(T{HFApdO62m4R#E{95&X9paH_T)=
ThI}A|n1an@Z1M<`vB?4e!UrCp

diff --git a/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt b/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/excel/(6)Sheet6_Shapes.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/excel/Sheet1.bas b/Testing/PluginTests/result/excel/Sheet1.bas
deleted file mode 100644
index 678f6efd8ae..00000000000
--- a/Testing/PluginTests/result/excel/Sheet1.bas
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet1"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
-Sub test()
-    MsgBox "�e�X�g"
-End Sub
diff --git a/Testing/PluginTests/result/excel/Sheet2.bas b/Testing/PluginTests/result/excel/Sheet2.bas
deleted file mode 100644
index 9368fcbc336..00000000000
--- a/Testing/PluginTests/result/excel/Sheet2.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet2"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet3.bas b/Testing/PluginTests/result/excel/Sheet3.bas
deleted file mode 100644
index bf55a0db47c..00000000000
--- a/Testing/PluginTests/result/excel/Sheet3.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet3"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet4.bas b/Testing/PluginTests/result/excel/Sheet4.bas
deleted file mode 100644
index 3b5658440a1..00000000000
--- a/Testing/PluginTests/result/excel/Sheet4.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet4"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet5.bas b/Testing/PluginTests/result/excel/Sheet5.bas
deleted file mode 100644
index 5d56cc32a47..00000000000
--- a/Testing/PluginTests/result/excel/Sheet5.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet5"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/Sheet6.bas b/Testing/PluginTests/result/excel/Sheet6.bas
deleted file mode 100644
index 2e001954d69..00000000000
--- a/Testing/PluginTests/result/excel/Sheet6.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "Sheet6"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/excel/ThisWorkbook.bas b/Testing/PluginTests/result/excel/ThisWorkbook.bas
deleted file mode 100644
index 71a359849aa..00000000000
--- a/Testing/PluginTests/result/excel/ThisWorkbook.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "ThisWorkbook"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True
diff --git a/Testing/PluginTests/result/powerpnt.ppt.txt b/Testing/PluginTests/result/powerpnt.ppt.txt
deleted file mode 100644
index db463067351349d4b78ac7847bab0b7361f472d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1730
zcma)+OKuZU5JhW@#2$K%gxYo_ej{XrKoAlUM+_{G{7D>xf9h@ru@W}GKA6H<7_bB2
z+^TkLCw>lt?)EF+y7jxS{{HFOGn?DMmNvCBn^|R<9b18I!MWf(=3Cl(yK8r>!>O_f
zmdD^^Il;4UAF&MhN7f}QL(b=5XMBf_dy2iX3wVn?s8`^>*k?x#iJInXgPC6Cybsxd
zb4oQ6>ybfZzB|X)AWAS9-|cKw>05j+sj1|dQ(4BNuJy4;O^v$Jg-09H5k*|1d!Daq
zI>b8gE|+kfd(0!g>e&E3&0tO+#H?THWaaE_EN5H1LqA1bnuanv@@Zt&v;$5}%jsmp
z-%Wdn<&;Ub?H-m#Jb8_2f>EXGK9q1@dOoT{3Q_jAM>&A$wkRFys^Fi1luD#5)j8t4
z87=pm-fZ+b^PXkbbkeH(6H^|6DbP|{LC+mA_3jDvJO7sd%%3d#U)6&{>@%Jbx$RSI
z=y2iaebIL1-zPsQGSu6$2TY>Dv=o0AUQr6qN$&->DLm62CEXqSZ46}0cNh1}r?JW<
z-SZ3Q)BTptPOkB%{ie)say3^?yNCb4{TFo|;r)WH#O_h<Gy4Rt54t2~dYYPp?#OC~
zRW-~1d+6p%JIgwo^p225mtduhH2=-Ls+&~69vdO;srh#|dfTYC?{^gXBmb3Ws6^hO
zo!ATSx~Cs>(`D}vC-&GT;wI~TRHi#9^l@EJ?D_RvGkeLsk6N{rv_-X{w8<x~tb&M<
aPv~~Vm_|pILT|>|R%I$u%PR~Wi{T%;`XBND

diff --git a/Testing/PluginTests/result/powerpnt/CannotGetMacros.bas b/Testing/PluginTests/result/powerpnt/CannotGetMacros.bas
deleted file mode 100644
index 68c9e3d768bbaafdd0efb8f95bdad9cb7293d1c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmZXRQEJ0L3`FNU&^zn_N)OR|n-&_{@6?G?2iF_C4kedw^F~WBB?xx4l4dm0{{61C
z)re)yN;+sCcSE$*M6~Eh4_cA4ZHOdt1D5rJ|Dhgq18xd*0`HoZ^IIosCvpjYVSMC$
zhS~8(Z=5gcupX3SmBC%+;C19HGRDl9dmdm&;Vt<^cY=2h-<keBhzqqHnx^2dY&C0r
zBNd+Ogbkr%8(lJ)|MOSm1|CmPQElihp{Htphoey88Iqp4ORy%rg3LOGHlsT{_p(mU
mUYIoV8nol}8L^rj@g1|K+m3Eq^nTp&p3j@Q|D`&U|MdzI-&(Bz

diff --git a/Testing/PluginTests/result/powerpnt/Slide1.png b/Testing/PluginTests/result/powerpnt/Slide1.png
deleted file mode 100644
index 9cdbb29e07a7ae8b6729d2a9a86ad3880ed61121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2895
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

diff --git a/Testing/PluginTests/result/powerpnt/Slide1.txt b/Testing/PluginTests/result/powerpnt/Slide1.txt
deleted file mode 100644
index f9ee31a6dd2405336ed84eade07e847d332a9d80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64
ycmezWZ@<A3gA)d?4HOs*8LSu-7)lsY8H#}<F9R1tcywr-0)r7)JOnC^ssaE%tquMF

diff --git a/Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt b/Testing/PluginTests/result/powerpnt/Slide1_NotesPage.txt
deleted file mode 100644
index c168f5213cb9abfbe70692a6dae67dbb56fa9981..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmezWFPI^RA(J76A(cUa!IL4EA(0^+%nksGCo&`h*%=J^KsHE45m1dGgB6hEW#D4)
k1B#abMT>!aT&j)Ws*&ySV<-jMlms;qmtJGAUPG{508myOcmMzZ

diff --git a/Testing/PluginTests/result/word.doc.txt b/Testing/PluginTests/result/word.doc.txt
deleted file mode 100644
index 4f78ef6a5d77c5ca2f155d781296720e0f47d309..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2254
zcma)8OKuZE5Un*5cWAK+0<4LNfv`cr5FvpbgpGn^Wid1UB*gYuGvj>j!xph-jf6M^
zci;xVdsWl%C+#S*+C5WUUG?hK$Nu-XC$A)vROT{~flQ?oC+{VPY=-w7?<d#`Ig-0_
zN4j_`Wemx4=uy(a%|t#!lH$Zm_aH6h7*=wXl@iM-7H_<T?xmdTSs#}DohBrcD-<T5
z15qFPL-?Iy?^h@W(3=5A3@?VIt@b96jHL#>3?~!Seg|2BH-~){)tBs1+sRSy&nM#g
z083}^Q($HA=CH_00=Y%eP<wmuOy4JnnEn^qv7%=@Ej=ZR1=di#A7E!3DeO5pggmd}
zY2s<HVymxj7Fic4cw-;m3HB#gb&0^+V`<<!!pF%+<fbVP@Vr||s8g4nH4X|`K2v){
z&YTnPW*-fBxt)(LB4VD$u*XcXQkb<7-j{tDi|r+DopR*BY7A{w8!>Gw@{rzY?T`iL
zFQl2G24k=rYjrY@-uAPKnGXE1`g6s5sh*9qCT_91Mw%%*3D@JkYOwaK1HxJ@oKLYB
zq197Z&-#E|OwlL4J3`SVI444jX$Oq$ijOO#&zfZynf_+h=$o94^m_&l?M7XBegm&I
z8_eD*a+N^4fMuc$M-{>o%8rvQ%m&uZF>DoD6YQ8m?yL1WqI{}2$P?$4pIT*wYcq!R
z8=MNv*}RG`jGXg>RXkTlZi?~xBxR?u=4?i6M#lQ>$xB3(VNSA=a_oNU+G!WIE`Zjd
z&zB?jT8CQeJm(DKgkiQ@ihwou0<5jeye=bja-ezTQwJW{6E>^Z%bZ<|g>0v4nSITB
zee9egIXGJMJ0syF7-G+{n`h4DbD*nTNf!7V>>7>~TAc4>fs-%6yVV1&jp5N)UHIo*
z<*!m951~KPd#p#+hsSh13hI*qMjT_=^k<%loRwvKTMX9Ulyjymc;@6TP<uSd@a?OJ
zd1rkYLw@I7N{F_GjPS$UchoBT%IEWE^fme({feCYj($Yn@XVRW8oEuU&2Gp>y|S@d
z9j0$sSYPD0rTe_X+66*Z)_RrOKZBcYF5B6z{z=&X24k5#ZK1zu!&RRaJdLy?E+DxF
S4Kh>WiCV8KR?P|}T>k;_O?;gI

diff --git a/Testing/PluginTests/result/word/(0)Bookmarks.txt b/Testing/PluginTests/result/word/(0)Bookmarks.txt
deleted file mode 100644
index 46b134b197f..00000000000
--- a/Testing/PluginTests/result/word/(0)Bookmarks.txt
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/Testing/PluginTests/result/word/CannotGetMacros.bas b/Testing/PluginTests/result/word/CannotGetMacros.bas
deleted file mode 100644
index 68c9e3d768bbaafdd0efb8f95bdad9cb7293d1c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 514
zcmZXRQEJ0L3`FNU&^zn_N)OR|n-&_{@6?G?2iF_C4kedw^F~WBB?xx4l4dm0{{61C
z)re)yN;+sCcSE$*M6~Eh4_cA4ZHOdt1D5rJ|Dhgq18xd*0`HoZ^IIosCvpjYVSMC$
zhS~8(Z=5gcupX3SmBC%+;C19HGRDl9dmdm&;Vt<^cY=2h-<keBhzqqHnx^2dY&C0r
zBNd+Ogbkr%8(lJ)|MOSm1|CmPQElihp{Htphoey88Iqp4ORy%rg3LOGHlsT{_p(mU
mUYIoV8nol}8L^rj@g1|K+m3Eq^nTp&p3j@Q|D`&U|MdzI-&(Bz

diff --git a/Testing/PluginTests/result/word/Document.htm b/Testing/PluginTests/result/word/Document.htm
deleted file mode 100644
index 7a50bfb6478..00000000000
--- a/Testing/PluginTests/result/word/Document.htm
+++ /dev/null
@@ -1,99 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=shift_jis">
-<meta name=Generator content="Microsoft Word 15 (filtered)">
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:"Cambria Math";
-	panose-1:2 4 5 3 5 4 6 3 2 4;}
-@font-face
-	{font-family:������;
-	panose-1:2 2 4 0 0 0 0 0 0 0;}
-@font-face
-	{font-family:"�l�r �o�S�V�b�N";
-	panose-1:2 11 6 0 7 2 5 8 2 4;}
-@font-face
-	{font-family:"\@������";}
-@font-face
-	{font-family:"\@�l�r �o�S�V�b�N";}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{margin:0mm;
-	text-align:justify;
-	text-justify:inter-ideograph;
-	font-size:10.5pt;
-	font-family:"������",serif;}
-.MsoChpDefault
-	{font-family:"������",serif;}
- /* Page Definitions */
- @page WordSection1
-	{size:595.3pt 841.9pt;
-	margin:99.25pt 30.0mm 30.0mm 30.0mm;
-	layout-grid:18.0pt;}
-div.WordSection1
-	{page:WordSection1;}
--->
-</style>
-
-</head>
-
-<body lang=JA link=blue vlink="#954F72" style='word-wrap:break-word;text-justify-trim:
-punctuation'>
-
-<div class=WordSection1 style='layout-grid:18.0pt'>
-
-<p class=MsoNormal align=left style='text-align:left'><b><span lang=EN-US
-style='font-size:18.0pt;font-family:"�l�r �o�S�V�b�N"'>What is WinMerge?</span></b></p>
-
-<p class=MsoNormal align=left style='text-align:left'><span lang=EN-US
-style='font-size:12.0pt;font-family:"�l�r �o�S�V�b�N"'>WinMerge is an <a
-href="https://winmerge.org/source-code/?lang=en">Open Source</a> differencing
-and merging tool for Windows. WinMerge can compare both folders and files,
-presenting differences in a visual text format that is easy to understand and
-handle.</span></p>
-
-<p class=MsoNormal>
-
-<table cellpadding=0 cellspacing=0 align=left>
- <tr>
-  <td width=1 height=8></td>
-  <td width=290></td>
-  <td width=18></td>
-  <td width=54></td>
- </tr>
- <tr>
-  <td height=69></td>
-  <td width=291 height=69 bgcolor=white style='border:.5pt solid black;
-  vertical-align:top;background:white'><span style='position:absolute;
-  left:0pt;z-index:251658752'>
-  <table cellpadding=0 cellspacing=0 width="100%">
-   <tr>
-    <td>
-    <div style='padding:4.1pt 7.7pt 4.1pt 7.7pt'>
-    <p class=MsoNormal align=left style='text-align:left'><b><span lang=EN-US
-    style='font-size:18.0pt;font-family:"�l�r �o�S�V�b�N"'>What is WinMerge?</span></b></p>
-    <p class=MsoNormal><span lang=EN-US>&nbsp;</span></p>
-    </div>
-    </td>
-   </tr>
-  </table>
-  </span>&nbsp;</td>
-  <td></td>
-  <td rowspan=2 align=left valign=top><img width=54 height=131
-  src="Document.files/image001.png" alt="�e�L�X�g �{�b�N�X: WinMerge"></td>
- </tr>
- <tr>
-  <td height=62></td>
- </tr>
-</table>
-
-<span lang=EN-US>&nbsp;</span></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/Testing/PluginTests/result/word/Document.txt b/Testing/PluginTests/result/word/Document.txt
deleted file mode 100644
index 82e05a853e5df60e80e8cd8f8a18c67927d2dacc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmZXROAf*?3`FMw+#v@*T!9lH7A#nYmKLOzA`*U=2c8|ZAfc*pJmb&UdB3(gC@L%H
zsKmL&p0v_l7qy&A&Hk`4HWC@M)|oiFZ8YdgUWFf2Q>o#zO2$`SxrMR38rwV9PIxAN
zPzTdsFW91{#=E0#F(F@lfx1OUMO2TL=>39r_?hWSwT_Oa#AY1(H+1emljfjj&r7Z~
zPn!Oxuz1^mO&s}e+!J$0SDwj#_&&=FJ-BVxl>F{_kC*gxX5hT~PKv?|S2i?S%QeK*
IE_jidKH(ElKL7v#

diff --git a/Testing/PluginTests/result/word/Shapes.txt b/Testing/PluginTests/result/word/Shapes.txt
deleted file mode 100644
index 9bff1b8de9836be427eab1bf4a29a0a59d1f2868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 118
zcmezW@0h__gPjH^3=|md7#ucO4`eGa7&2HfC@_RGWH2N$lmJ<o48>r6CPN;BFGDIr
b5koqVv}fQ2LoNnvW*9-uK-B}%!NmXomj4_J

diff --git a/Testing/PluginTests/result/word/ThisDocument.bas b/Testing/PluginTests/result/word/ThisDocument.bas
deleted file mode 100644
index d365bf6b19c..00000000000
--- a/Testing/PluginTests/result/word/ThisDocument.bas
+++ /dev/null
@@ -1,9 +0,0 @@
-VERSION 1.0 CLASS
-BEGIN
-  MultiUse = -1  'True
-END
-Attribute VB_Name = "ThisDocument"
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = False
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = True

From 5be85de9cc1d57f074a015d4b04261b91c8bdafb Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 9 Feb 2024 08:28:46 +0900
Subject: [PATCH 33/58] WIP

---
 Plugins/dlls/PrediffLineFilter.sct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index 0f393432b12..03532c7bc1f 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -25,7 +25,7 @@
 /*
     This is a plugin for WinMerge.
     It does almost the same thing as Substitution filters.
-    Copyright (C) 2018-2023 Takashi Sawanaka
+    Copyright (C) 2018-2024 Takashi Sawanaka
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

From 08468725294dff676d9539ba74a803c94a0d7934 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 9 Feb 2024 19:50:45 +0900
Subject: [PATCH 34/58] WIP

---
 Testing/PluginTests/PluginTests.js | 124 +++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 9cb72d2e29b..70f21662b7c 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -52,6 +52,34 @@ var PluginSettings = {
       "CompareDocumentsAsHTML": 1,
       "CompareTextsInShapes": 1,
       "CompareVBAMacros": 1
+    },
+    "PrediffLineFilter.sct": {
+      "Count": 5,
+      "Enabled1": 1,
+      "IgnoreCase1": 0,
+      "UseRegExp1": 0,
+      "Pattern1": "abc",
+      "ReplaceText1": "def",
+      "Enabled2": 1,
+      "IgnoreCase2": 1,
+      "UseRegExp2": 0,
+      "Pattern2": "Ghi",
+      "ReplaceText2": "Jkl",
+      "Enabled3": 1,
+      "IgnoreCase3": 0,
+      "UseRegExp3": 1,
+      "Pattern3": "\\d+\\.\\d+",
+      "ReplaceText3": "x.x",
+      "Enabled4": 1,
+      "IgnoreCase4": 1,
+      "UseRegExp4": 1,
+      "Pattern4": "Mno.*Z",
+      "ReplaceText4": "XxxX",
+      "Enabled5": 0,
+      "IgnoreCase5": 0,
+      "UseRegExp5": 0,
+      "Pattern5": "disabled",
+      "ReplaceText5": ""
     }
   }
 };
@@ -415,10 +443,106 @@ function IgnoreLeadingLineNumbersTest() {
 
 }
 
+function PrediffLineFilterTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\PrediffLineFilter.sct");
+  printPluginInfo(p);
+
+  p.PluginOnEvent(0, MergeApp);
+
+  //
+  setTestName("PrediffLineFilter");
+  text = "";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("", text);
+  assertEquals(0, size);
+  assertEquals(false, changed);
+
+  //
+  text = "abc def abc";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("def def def", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "gHI def Ghi";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("Jkl def Jkl", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "1.2 def 3.4";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("x.x def x.x", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "mnopqrstuvwxyz";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("XxxX", text);
+  assertEquals(4, size);
+  assertEquals(true, changed);
+
+  //
+  text = "disabled";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("disabled", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "abc def abc\r\n";
+  text += "gHI def GHI\r\n";
+  text += "1.2 def 3.4\r\n";
+  text += "mnopqrstuvwxyz\r\n";
+  text += "disabled";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  var expected =
+    "def def def\r\n" +
+    "Jkl def Jkl\r\n" +
+    "x.x def x.x\r\n" +
+    "XxxX\r\n" +
+    "disabled";
+  assertEquals(expected, text);
+  assertEquals(expected.length, size);
+  assertEquals(true, changed);
+
+  p.PluginOnEvent(1, MergeApp);
+}
+
 EditorAddinTest();
 InsertDateTimeTest();
 IgnoreLeadingLineNumbersTest();
+PrediffLineFilterTest();
+/*
 CompareMSExcelFilesTest();
 CompareMSWordFilesTest();
 CompareMSPowerPointFilesTest();
+*/
 

From a046206133528adfef75dd8f1aba33e901dcb236 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sat, 10 Feb 2024 11:50:40 +0900
Subject: [PATCH 35/58] WIP

---
 Testing/Data/Patch/file1.txt  |  6 ++++++
 Testing/Data/Patch/file2.txt  |  6 ++++++
 Testing/Data/Patch/patch.diff | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 Testing/Data/Patch/file1.txt
 create mode 100644 Testing/Data/Patch/file2.txt
 create mode 100644 Testing/Data/Patch/patch.diff

diff --git a/Testing/Data/Patch/file1.txt b/Testing/Data/Patch/file1.txt
new file mode 100644
index 00000000000..06f0917976f
--- /dev/null
+++ b/Testing/Data/Patch/file1.txt
@@ -0,0 +1,6 @@
+b
+c
+d
+e
+f
+file1
diff --git a/Testing/Data/Patch/file2.txt b/Testing/Data/Patch/file2.txt
new file mode 100644
index 00000000000..8bf7561ebe8
--- /dev/null
+++ b/Testing/Data/Patch/file2.txt
@@ -0,0 +1,6 @@
+a
+b
+c
+e
+f
+file2
diff --git a/Testing/Data/Patch/patch.diff b/Testing/Data/Patch/patch.diff
new file mode 100644
index 00000000000..ae3d30a6a96
--- /dev/null
+++ b/Testing/Data/Patch/patch.diff
@@ -0,0 +1,11 @@
+--- C:/dev/winmerge/Testing/Data/Patch/file1.txt	Sat Feb 10 11:48:34 2024
++++ C:/dev/winmerge/Testing/Data/Patch/file2.txt	Sat Feb 10 11:48:34 2024
+@@ -1,6 +1,6 @@
++a
+ b
+ c
+-d
+ e
+ f
+-file1
++file2

From aaf868649aeaf9f099173da0985531c6e67cc460 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 11 Feb 2024 05:09:51 +0900
Subject: [PATCH 36/58] WIP

---
 Plugins/dlls/ApplyPatch.sct                   | 34 ++++++++++---------
 Testing/Data/Patch/dir1/file1.txt             |  7 ++++
 Testing/Data/Patch/dir1/file2.txt             |  7 ++++
 Testing/Data/Patch/dir1/subdir/sfile1.txt     |  7 ++++
 Testing/Data/Patch/dir1/subdir/sfile2.txt     |  7 ++++
 .../Patch/dir1/subdir/subsubdir/ssfile1.txt   |  7 ++++
 .../Patch/dir1/subdir/subsubdir/ssfile2.txt   |  7 ++++
 Testing/Data/Patch/dir2/file1.txt             |  7 ++++
 Testing/Data/Patch/dir2/file2.txt             |  7 ++++
 Testing/Data/Patch/dir2/subdir/sfile1.txt     |  7 ++++
 Testing/Data/Patch/dir2/subdir/sfile2.txt     |  7 ++++
 .../Patch/dir2/subdir/subsubdir/ssfile1.txt   |  7 ++++
 .../Patch/dir2/subdir/subsubdir/ssfile2.txt   |  7 ++++
 Testing/Data/Patch/patch2.diff                | 16 +++++++++
 Testing/Data/Patch/patch3.diff                | 16 +++++++++
 15 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 Testing/Data/Patch/dir1/file1.txt
 create mode 100644 Testing/Data/Patch/dir1/file2.txt
 create mode 100644 Testing/Data/Patch/dir1/subdir/sfile1.txt
 create mode 100644 Testing/Data/Patch/dir1/subdir/sfile2.txt
 create mode 100644 Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt
 create mode 100644 Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt
 create mode 100644 Testing/Data/Patch/dir2/file1.txt
 create mode 100644 Testing/Data/Patch/dir2/file2.txt
 create mode 100644 Testing/Data/Patch/dir2/subdir/sfile1.txt
 create mode 100644 Testing/Data/Patch/dir2/subdir/sfile2.txt
 create mode 100644 Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt
 create mode 100644 Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt
 create mode 100644 Testing/Data/Patch/patch2.diff
 create mode 100644 Testing/Data/Patch/patch3.diff

diff --git a/Plugins/dlls/ApplyPatch.sct b/Plugins/dlls/ApplyPatch.sct
index 41a0ac881e6..1fd6ef0599c 100644
--- a/Plugins/dlls/ApplyPatch.sct
+++ b/Plugins/dlls/ApplyPatch.sct
@@ -47,7 +47,7 @@
 */
 
 
-var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
+var REGKEY_PATH = "Plugins\\ApplyPatch.sct/";
 var PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin";
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -109,16 +109,16 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     return result.Items();
   }
 
-  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead(REGKEY_PATH + "Files\\Left/Item_0", "");
+  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead("Files\\Left/Item_0", "");
   if (isPatchFile(filePatched)) {
-    filePatched = regRead(REGKEY_PATH + "Files\\Right/Item_0", "");
+    filePatched = regRead("Files\\Right/Item_0", "");
   }
 
   var msg = fmt(translate("${Enter the name of the file to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
   while (true) {
     filePatched = mergeApp.InputBox(msg, PLUGIN_NAME, filePatched);
     if (filePatched === "") {
-        return false;
+      return false;
     }
     if (fso.FileExists(filePatched)) { break; }
     mergeApp.MsgBox(fmt(translate("${File '%1' does not exist}"), [ filePatched ]), 48/*vbExclamation*/);
@@ -164,9 +164,9 @@ function IsFolder(file) {
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
 
-  var dirPatched = regRead(REGKEY_PATH + "Files\\Left/Item_0", "");
+  var dirPatched = regRead("Files\\Left/Item_0", "");
   if (!fso.FolderExists(dirPatched)) {
-    dirPatched = regRead(REGKEY_PATH + "Files\\Right/Item_0", "");
+    dirPatched = regRead("Files\\Right/Item_0", "");
   }
 
   var msg = fmt(translate("${Enter the name of the folder to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
@@ -202,11 +202,12 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
 
   copyOriginalFiles(dirPatched, folderDst, files, stripCount);
 
-  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & cd /d " + folderDst + " + " + cmdLine + " & pause\"");
+  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & cd /d " + folderDst + " & " + cmdLine + " & pause\"");
 
   pbChanged = true;
   pSubcode = 0;
 
+  var result = new ActiveXObject("Scripting.Dictionary");
   result.Add(0, true);
   result.Add(1, pbChanged);
   result.Add(2, pSubcode);
@@ -250,7 +251,7 @@ function run(sh, cmd) {
 function getPatchExeFolder() {
   var winMergeExePath = "C:\\Program Files\\WinMerge\\WinMergeU.exe";
   try {
-    winMergeExePath = wsh.RegRead(REGKEY_PATH + "\\Executable");
+    winMergeExePath = wsh.RegRead("Executable");
   } catch (e) {}
   return fso.BuildPath(fso.GetParentFolderName(winMergeExePath), "Commands\\msys2\\usr\\bin");
 }
@@ -290,16 +291,16 @@ function isNullDevice(path) {
 function stripDir(fileName, stripCount) {
   if (stripCount === -1) {
     return fso.GetFileName(fileName);
-  } else if ( stripCount === 0) {
+  } else if (stripCount === 0) {
     return fileName;
   }
   var pos = 0;
   for (var i = 0; i < stripCount; i++) {
     var posNext1 = fileName.indexOf("/", pos);
     var posNext2 = fileName.indexOf("\\", pos);
-    if (posNext1 > 0 && (posNext1 < posNext2 || posNext2 === 0)) {
+    if (posNext1 >= 0 && (posNext1 < posNext2 || posNext2 === -1)) {
       pos = posNext1 + 1;
-    } else if (posNext2 > 0 && (posNext2 < posNext1 || posNext1 === 0)) {
+    } else if (posNext2 >= 0 && (posNext2 < posNext1 || posNext1 === -1)) {
       pos = posNext2 + 1;
     } else {
       pos = -1;
@@ -365,10 +366,10 @@ function createFolderEx(dirName) {
 }
 
 function copyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount) {
-  for (var i = 0; i < fileNamesInPath.length; i++) {
-    if (!isNullDevice(fileNamesInPatch(i)(0))) {
-      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount);
-      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount);
+  for (var i = 0; i < fileNamesInPatch.length; i++) {
+    if (!isNullDevice(fileNamesInPatch[i][0])) {
+      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch[i][0], stripCount);
+      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch[i][0], stripCount);
       if (fso.FileExists(fileNameSrc)) {
         if (!fso.FolderExists(fso.GetParentFolderName(fileNameDest))) {
           createFolderEx(fso.GetParentFolderName(fileNameDest));
@@ -394,7 +395,8 @@ function getFileNamesInPatch(fileName) {
   var re = new RegExp("^(---|\\+\\+\\+|\\*\\*\\*) ([^\\t\\r\\n]+)");
   var text = readAllText(fileName);
   var i = 0;
-  var lines = text.split(text, "\r\n");
+  var eol = text.match(/\r\n|\n|\r/);
+  var lines = text.split(eol);
   while (i < lines.length) {
     var line = lines[i];
     var ml = re.exec(line);
diff --git a/Testing/Data/Patch/dir1/file1.txt b/Testing/Data/Patch/dir1/file1.txt
new file mode 100644
index 00000000000..5286e53fa53
--- /dev/null
+++ b/Testing/Data/Patch/dir1/file1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+file1
+dir1
diff --git a/Testing/Data/Patch/dir1/file2.txt b/Testing/Data/Patch/dir1/file2.txt
new file mode 100644
index 00000000000..a76267def57
--- /dev/null
+++ b/Testing/Data/Patch/dir1/file2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+file2
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/sfile1.txt b/Testing/Data/Patch/dir1/subdir/sfile1.txt
new file mode 100644
index 00000000000..400b261e498
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/sfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+sfile1
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/sfile2.txt b/Testing/Data/Patch/dir1/subdir/sfile2.txt
new file mode 100644
index 00000000000..1e842421a26
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/sfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+sfile2
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt
new file mode 100644
index 00000000000..1002482c257
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+ssfile1
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt
new file mode 100644
index 00000000000..087a4420f40
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+ssfile2
+dir1
diff --git a/Testing/Data/Patch/dir2/file1.txt b/Testing/Data/Patch/dir2/file1.txt
new file mode 100644
index 00000000000..5243dffe7fa
--- /dev/null
+++ b/Testing/Data/Patch/dir2/file1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+file1
+dir2
diff --git a/Testing/Data/Patch/dir2/file2.txt b/Testing/Data/Patch/dir2/file2.txt
new file mode 100644
index 00000000000..24e4ab165b7
--- /dev/null
+++ b/Testing/Data/Patch/dir2/file2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+file2
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/sfile1.txt b/Testing/Data/Patch/dir2/subdir/sfile1.txt
new file mode 100644
index 00000000000..111b0d8deb1
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/sfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+sfile1
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/sfile2.txt b/Testing/Data/Patch/dir2/subdir/sfile2.txt
new file mode 100644
index 00000000000..1b7d8a64495
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/sfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+sfile2
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt
new file mode 100644
index 00000000000..f0bac615d42
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+ssfile1
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt
new file mode 100644
index 00000000000..29070556855
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+ssfile2
+dir2
diff --git a/Testing/Data/Patch/patch2.diff b/Testing/Data/Patch/patch2.diff
new file mode 100644
index 00000000000..2c080dadf0a
--- /dev/null
+++ b/Testing/Data/Patch/patch2.diff
@@ -0,0 +1,16 @@
+--- file1.txt	Sat Feb 10 15:29:00 2024
++++ file1.txt	Sat Feb 10 15:29:00 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ file1
+-dir1
++dir2
+--- file2.txt	Sat Feb 10 15:48:11 2024
++++ file2.txt	Sat Feb 10 15:48:11 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ file2
+-dir1
++dir2
diff --git a/Testing/Data/Patch/patch3.diff b/Testing/Data/Patch/patch3.diff
new file mode 100644
index 00000000000..30a98dd566f
--- /dev/null
+++ b/Testing/Data/Patch/patch3.diff
@@ -0,0 +1,16 @@
+--- subdir/subsubdir/ssfile1.txt	Sat Feb 10 17:05:19 2024
++++ subdir/subsubdir/ssfile1.txt	Sat Feb 10 17:05:19 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ ssfile1
+-dir1
++dir2
+--- subdir/subsubdir/ssfile2.txt	Sat Feb 10 17:05:31 2024
++++ subdir/subsubdir/ssfile2.txt	Sat Feb 10 17:05:31 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ ssfile2
+-dir1
++dir2

From 721c9f8867db56a7229b3beeef0e20ba058701cf Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 11 Feb 2024 08:47:35 +0900
Subject: [PATCH 37/58] WIP

---
 .gitignore                         |   1 +
 Testing/PluginTests/PluginTests.js | 124 +++++++++++++++++++----------
 2 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62a7602b1c7..6f27bcc0e31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ Testing/Data/Symlink/Dir2/ss12_same_s11.txt
 Src/MergeAppLib_i.c
 Src/MergeAppLib_p.c
 Src/dlldata.c
+/Testing/PluginTests/result
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 70f21662b7c..04c18cf1dc7 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -11,9 +11,20 @@ try {
   FileSys.CreateFolder(ScriptFolder + "\\result\\excel");
   FileSys.CreateFolder(ScriptFolder + "\\result\\word");
   FileSys.CreateFolder(ScriptFolder + "\\result\\powerpnt");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result1");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result2");
 } catch (e) { }
 
 var PluginSettings = {
+  "Files": {
+    "Left": {
+      "Item_0": ""
+    },
+    "Right": {
+      "Item_0": ""
+    }
+  },
   "Plugins": {
     "CompareMSExcelFiles.sct": {
       "UnpackToFolder": 1,
@@ -94,13 +105,24 @@ var MergeApp = {
     return PluginSettings[ary2[0]][ary1[1]];
   },
   "SaveOption": function (key, value) {
-     var t = typeof value === "string" ? "REG_SZ" : "REG_DWORD";
+    var t = typeof value === "string" ? "REG_SZ" : "REG_DWORD";
   },
   "Translate": function (text) {
     return text;
   },
   "Log": function (level, text) {
     WScript.Echo(text);
+  },
+  "MsgBox": function (prompt, buttons, title) {
+    WScript.Echo("title: " + title);
+    WScript.Echo("prompt: " + prompt);
+    WScript.Echo("buttons: " + buttons);
+  },
+  "InputBox": function (prompt, title, defaultValue) {
+    WScript.Echo("title: " + title);
+    WScript.Echo("prompt: " + prompt);
+    WScript.Echo("default: " + defaultValue);
+    return defaultValue;
   }
 };
 function setTestName(testname) {
@@ -138,45 +160,6 @@ function printPluginInfo(p) {
   WScript.Echo("");
 }
 
-function CompareMSExcelFilesTest() {
-  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
-  printPluginInfo(p);
-  var changed = false;
-  var subcode = 0;
-  p.PluginOnEvent(0, MergeApp);
-  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.tsv", changed, subcode);
-  CollectGarbage();
-  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
-  CollectGarbage();
-  p.PluginOnEvent(1, MergeApp);
-}
-
-function CompareMSWordFilesTest() {
-  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSWordFiles.sct");
-  printPluginInfo(p);
-  var changed = false;
-  var subcode = 0;
-  p.PluginOnEvent(0, MergeApp);
-  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word.doc.txt", changed, subcode);
-  CollectGarbage();
-  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word\\", changed, subcode);
-  CollectGarbage();
-  p.PluginOnEvent(1, MergeApp);
-}
-
-function CompareMSPowerPointFilesTest() {
-  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSPowerPointFiles.sct");
-  printPluginInfo(p);
-  var changed = false;
-  var subcode = 0;
-  p.PluginOnEvent(0, MergeApp);
-  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt.ppt.txt", changed, subcode);
-  CollectGarbage();
-  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt\\", changed, subcode);
-  CollectGarbage();
-  p.PluginOnEvent(1, MergeApp);
-}
-
 function EditorAddinTest() {
   var asciiChars = "";
   var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\editor addin.sct");
@@ -536,10 +519,71 @@ function PrediffLineFilterTest() {
   p.PluginOnEvent(1, MergeApp);
 }
 
+function ApplyPatchTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\ApplyPatch.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\file1.txt";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch.diff";
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Patch\\patch.diff", ScriptFolder + "\\result\\patch\\result1.txt", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch.diff";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\file1.txt";
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Patch\\patch.diff", ScriptFolder + "\\result\\patch\\result2.txt", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result1\\", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\subdir\\";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result2\\", changed, subcode);
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSExcelFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.tsv", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSWordFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSWordFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word.doc.txt", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSPowerPointFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSPowerPointFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt.ppt.txt", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
 EditorAddinTest();
 InsertDateTimeTest();
 IgnoreLeadingLineNumbersTest();
 PrediffLineFilterTest();
+ApplyPatchTest();
 /*
 CompareMSExcelFilesTest();
 CompareMSWordFilesTest();

From 6b555bd5a1d29ecd7667ba2bbb0ebaf378d9f05b Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 12 Feb 2024 09:50:41 +0900
Subject: [PATCH 38/58] WIP

---
 ALL.vs2017.sln                                |  10 +-
 ALL.vs2019.sln                                |  10 +-
 ALL.vs2022.sln                                |  10 +-
 BuildBin.vs2017.cmd                           |   2 +-
 BuildBin.vs2019.cmd                           |   2 +-
 BuildBin.vs2022.cmd                           |   2 +-
 ExpandEnvironmenStrings.js                    |  10 +
 ExpandEnvironmenStrings.vbs                   |  10 -
 Src/MergeLang.vcxproj                         |   8 +-
 Testing/PluginTests/PluginTests.js            |   8 +-
 ...enuResources.vbs => CheckMenuResources.js} |   0
 ...dResources.vbs => CheckUnusedResources.js} |   0
 ...sterPotFile.vbs => CreateMasterPotFile.js} |   0
 Translations/WinMerge/CreateMasterPotFile.js  | 341 +++++++++++++++
 Translations/WinMerge/CreateMasterPotFile.vbs | 393 ------------------
 ...otFile.vbs => UpdatePoFilesFromPotFile.js} |   0
 WinMerge.vs2017.sln                           |   4 +-
 WinMerge.vs2019.sln                           |   4 +-
 WinMerge.vs2022.sln                           |   4 +-
 19 files changed, 385 insertions(+), 433 deletions(-)
 create mode 100644 ExpandEnvironmenStrings.js
 delete mode 100644 ExpandEnvironmenStrings.vbs
 rename Tools/Scripts/{CheckMenuResources.vbs => CheckMenuResources.js} (100%)
 rename Tools/Scripts/{CheckUnusedResources.vbs => CheckUnusedResources.js} (100%)
 rename Translations/ShellExtension/{CreateMasterPotFile.vbs => CreateMasterPotFile.js} (100%)
 create mode 100644 Translations/WinMerge/CreateMasterPotFile.js
 delete mode 100644 Translations/WinMerge/CreateMasterPotFile.vbs
 rename Translations/WinMerge/{UpdatePoFilesFromPotFile.vbs => UpdatePoFilesFromPotFile.js} (100%)

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index bd923095016..41cc5e5eea9 100644
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index 6aa82fd7133..fafbae08bb6 100644
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.s
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
index ef5dacbcc22..20e421620ae 100644
--- a/ALL.vs2022.sln
+++ b/ALL.vs2022.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
diff --git a/BuildBin.vs2017.cmd b/BuildBin.vs2017.cmd
index 2b0aa68c444..eee26f99503 100644
--- a/BuildBin.vs2017.cmd
+++ b/BuildBin.vs2017.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [15.0^,16.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/BuildBin.vs2019.cmd b/BuildBin.vs2019.cmd
index 95e99777169..cef25beada9 100644
--- a/BuildBin.vs2019.cmd
+++ b/BuildBin.vs2019.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [16.0^,17.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/BuildBin.vs2022.cmd b/BuildBin.vs2022.cmd
index 06b5ff8bdb7..3414b309793 100644
--- a/BuildBin.vs2022.cmd
+++ b/BuildBin.vs2022.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [17.0^,18.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/ExpandEnvironmenStrings.js b/ExpandEnvironmenStrings.js
new file mode 100644
index 00000000000..a25d5ddd7fb
--- /dev/null
+++ b/ExpandEnvironmenStrings.js
@@ -0,0 +1,10 @@
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var sh = new ActiveXObject("WScript.Shell");
+var otf = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1);
+
+while (!otf.AtEndOfStream) {
+	WScript.Echo(sh.ExpandEnvironmentStrings(otf.ReadLine()));
+}
+
+otf.Close();
+
diff --git a/ExpandEnvironmenStrings.vbs b/ExpandEnvironmenStrings.vbs
deleted file mode 100644
index 91a722fdb1f..00000000000
--- a/ExpandEnvironmenStrings.vbs
+++ /dev/null
@@ -1,10 +0,0 @@
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim sh: Set sh = CreateObject("WScript.Shell")
-Dim otf: Set otf = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1)
-
-Do Until otf.AtEndOfStream = True
-	WScript.Echo sh.ExpandEnvironmentStrings(otf.ReadLine)
-Loop
-
-otf.Close
-
diff --git a/Src/MergeLang.vcxproj b/Src/MergeLang.vcxproj
index abd07fe5d9a..3754d67bed4 100644
--- a/Src/MergeLang.vcxproj
+++ b/Src/MergeLang.vcxproj
@@ -183,7 +183,7 @@ date /t &gt; MergeLang.lastbuild
 attrib -a English.pot
 del English.pot.prev English.pot.flt English.pot.prev.flt 2&gt; NUL
 move English.pot English.pot.prev 2&gt; NUL
-cscript CreateMasterPotFile.vbs
+cscript CreateMasterPotFile.js
 attrib -a English.pot
 findstr /v POT-Creation-Date English.pot &gt; English.pot.flt
 findstr /v POT-Creation-Date English.pot.prev &gt; English.pot.prev.flt
@@ -219,7 +219,7 @@ popd
     <None Include="..\Translations\ShellExtension\ChineseSimplified.po" />
     <None Include="..\Translations\ShellExtension\ChineseTraditional.po" />
     <None Include="..\Translations\ShellExtension\Corsican.po" />
-    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.vbs" />
+    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.js" />
     <None Include="..\Translations\ShellExtension\Croatian.po" />
     <None Include="..\Translations\ShellExtension\Czech.po" />
     <None Include="..\Translations\ShellExtension\Danish.po" />
@@ -259,7 +259,7 @@ popd
     <None Include="..\Translations\WinMerge\ChineseSimplified.po" />
     <None Include="..\Translations\WinMerge\ChineseTraditional.po" />
     <None Include="..\Translations\WinMerge\Corsican.po" />
-    <None Include="..\Translations\WinMerge\CreateMasterPotFile.vbs" />
+    <None Include="..\Translations\WinMerge\CreateMasterPotFile.js" />
     <None Include="..\Translations\WinMerge\Croatian.po" />
     <None Include="..\Translations\WinMerge\Czech.po" />
     <None Include="..\Translations\WinMerge\Danish.po" />
@@ -301,7 +301,7 @@ date /t &gt; MergeLang.lastbuild
 attrib -a English.pot
 del English.pot.prev English.pot.flt English.pot.prev.flt 2&gt; NUL
 move English.pot English.pot.prev 2&gt; NUL
-cscript CreateMasterPotFile.vbs
+cscript CreateMasterPotFile.js
 attrib -a English.pot
 findstr /v POT-Creation-Date English.pot &gt; English.pot.flt
 findstr /v POT-Creation-Date English.pot.prev &gt; English.pot.prev.flt
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 04c18cf1dc7..8e1d1474971 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -14,6 +14,7 @@ try {
   FileSys.CreateFolder(ScriptFolder + "\\result\\patch");
   FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result1");
   FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result2");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result3");
 } catch (e) { }
 
 var PluginSettings = {
@@ -532,11 +533,14 @@ function ApplyPatchTest() {
   PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\file1.txt";
   p.UnpackFile(ScriptFolder + "\\..\\Data\\Patch\\patch.diff", ScriptFolder + "\\result\\patch\\result2.txt", changed, subcode);
   PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch2.diff";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch2.diff", ScriptFolder + "\\result\\patch\\result1\\", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\";
   PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
-  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result1\\", changed, subcode);
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result2\\", changed, subcode);
   PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
   PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\subdir\\";
-  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result2\\", changed, subcode);
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result3\\", changed, subcode);
   p.PluginOnEvent(1, MergeApp);
 }
 
diff --git a/Tools/Scripts/CheckMenuResources.vbs b/Tools/Scripts/CheckMenuResources.js
similarity index 100%
rename from Tools/Scripts/CheckMenuResources.vbs
rename to Tools/Scripts/CheckMenuResources.js
diff --git a/Tools/Scripts/CheckUnusedResources.vbs b/Tools/Scripts/CheckUnusedResources.js
similarity index 100%
rename from Tools/Scripts/CheckUnusedResources.vbs
rename to Tools/Scripts/CheckUnusedResources.js
diff --git a/Translations/ShellExtension/CreateMasterPotFile.vbs b/Translations/ShellExtension/CreateMasterPotFile.js
similarity index 100%
rename from Translations/ShellExtension/CreateMasterPotFile.vbs
rename to Translations/ShellExtension/CreateMasterPotFile.js
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
new file mode 100644
index 00000000000..c926b17ad56
--- /dev/null
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -0,0 +1,341 @@
+////
+// This script creates the master POT file (English.pot).
+//
+// Copyright (C) 2007-2009 by Tim Gerundt
+// Released under the "GNU General Public License
+
+var ForReading = 1;
+
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
+
+var PATH_ENGLISH_POT = "English.pot";
+var PATH_MERGE_RC = "../../Src/Merge.rc";
+var PATH_PLUGIN_STRINGS_RC = "../../Plugins/Strings.rc";
+
+var oFSO = new ActiveX("Scripting.FileSystemObject");
+
+var bRunFromCmd = false;
+if (oFSO.GetFileName(Wscript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
+var bInsertLineNumbers = false;
+if (WScript.Arguments.Named.Exists("InsertLineNumbers")) {
+  bInsertLineNumbers = CBool(WScript.Arguments.Named("InsertLineNumbers"));
+}
+
+Main();
+
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Creating POT file from Merge.rc...", 3);
+  
+  var bNecessary = true;
+  if (oFSO.FileExists(PATH_ENGLISH_POT)) { //if the POT file exists...
+    bNecessary = GetArchiveBit(PATH_MERGE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
+  }
+  
+  if (bNecessary) { //If update necessary...
+    var oStrings = MergeDictionaries(
+      GetStringsFromRcFile(PATH_MERGE_RC),
+      GetStringsFromRcFile(PATH_PLUGIN_STRINGS_RC));
+    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings);
+    SetArchiveBit(PATH_MERGE_RC, false);
+    SetArchiveBit(PATH_PLUGIN_STRINGS_RC, false);
+    SetArchiveBit(PATH_ENGLISH_POT, false);
+    for (var it = new Enumerator(oFSO.GetFolder(".").Files); !it.atEnd(); it.moveNext()) { //For all files in the current folder...
+      var oFile = it.item();
+      if (oFSO.GetExtensionName(oFile.Name).toLowerCase() === "po") { //If a PO file...
+        SetArchiveBit(oFile.Path, true);
+      }
+    }
+    
+    var EndTime = new Date().getTime();
+    var Seconds = (EndTime - StartTime) / 1000.0;
+    
+    InfoBox("POT file created, after " + Seconds + " second(s).", 10);
+  } else { //If update NOT necessary...
+    InfoBox("POT file already up-to-date.", 10);
+  }
+}
+
+////
+// ...
+function MergeDictionaries(dict1, dict2) {
+  var mergedDict = {};
+  for (var key in dict1) {
+    mergedDict[key] = dict1[key];
+  }
+
+  for (var key in dict2) {
+    if (!(key in mergedDict)) {
+      mergedDict[key] = dict2[key];
+    }
+  }
+  return mergedDict;
+}
+
+////
+// ...
+function GetStringsFromRcFile(sRcFilePath) {
+  var fContinuation = false;
+  var oBlacklist = GetStringBlacklist("StringBlacklist.txt");
+  var oStrings = {};
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
+    var sRcFileName = oFSO.GetFileName(sRcFilePath);
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
+      
+      var sReference = sRcFileName + ":" + iLine;
+      var sString = "";
+      var sComment = "";
+      var sContext = "";
+      
+      if (fContinuation) {
+        // Nothing to do
+      } else if (sLine.indexOf(" MENU") >= 0 && sLine.indexOf("IDR_") >= 0) { //MENU...
+        iBlockType = MENU_BLOCK
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        switch (iBlockType) {
+          case NO_BLOCK:
+            var oMatch0 = /LANGUAGE (LANG_\w*, SUBLANG_\w*)/.exec(sLine);
+            if (oMatch0) { //LANGUAGE...
+              sString = oMatch0[1];
+              sComment = "LANGUAGE, SUBLANGUAGE";
+            }
+            break;
+
+          case MENU_BLOCK:
+          case DIALOGEX_BLOCK:
+          case STRINGTABLE_BLOCK:
+            if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+              //--------------------------------------------------------------------------------
+              // Replace 1st string literal only - 2nd string literal specifies control class!
+              //--------------------------------------------------------------------------------
+              var oMatch1 = /NC_\s*\("([^"]*)"\s*,\s*"([^"]*)"\s*\)/.exec(sLine);
+              var oMatch2 = /"((?:""|[^"])*)"/.exec(sLine);
+              var sTemp;
+              if (oMatch1) { //String...
+                sContext = oMatch1[1].replace(/^\s+|\s+$/g, "");
+                sTemp = oMatch1[2];
+              } else if (oMatch2) { //String...
+                sTemp = oMatch2[1];
+              } else {
+                sTemp = "";
+              }
+              if (sTemp !== "" && !(sTemp in oBlacklist)) { //If NOT blacklisted...
+                sString = sTemp.replace(/\"\"/g, "\\\"");
+                var oMatch3 = /\/\/#\. (.*?)$/.exec(sLine);
+                var oMatch4 = /\/\/msgctxt (.*?)$/.exec(sLine);
+                if (oMatch3) { //If found a comment for the translators...
+                  sComment = oMatch3[1].replace(/^\s+|\s+$/g, "");
+                } else if (oMatch4) { //If found a context for the translation...
+                  sContext = oMatch4[1].replace(/^\s+|\s+$/g, "");
+                  sComment = sContext;
+                }
+              }
+            }
+            break;
+
+          case VERSIONINFO_BLOCK:
+            var oMatch5 = /BLOCK "([0-9A-F]+)"/.exec(sLine);
+            var oMatch6 = /VALUE "Comments", "(.*?)\\?0?"/.exec(sLine);
+            var oMatch7 = /VALUE "Translation", (.*?)$/.exec(sLine);
+            if (oMatch5) { //StringFileInfo.Block...
+              sString = oMatch5[1];
+              sComment = "StringFileInfo.Block";
+            } else if (oMatch6) { //StringFileInfo.Comments...
+              sString = oMatch6[1];
+              sComment = "You should use a string like \"Translated by \" followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!";
+            } else if (oMatch7) { //VarFileInfo.Translation...
+              sString = oMatch7[1];
+              sComment = "VarFileInfo.Translation";
+            }
+            break;
+        }
+      }
+      
+      if (sString !== "") {
+        var sKey = sContext + sString;
+        var oString = { "Comment": "", "References": "", "Context": "", "Id": "", "Str": "" };
+        if (sKey in oStrings) { //If the key is already used...
+          oString = oStrings[sKey];
+        }
+        if (sComment !== "") {
+          oString.Comment = sComment;
+        }
+        if (bInsertLineNumbers) {
+          if (oString.References !== "") {
+            oString.References = oString.References + "\t" + sReference;
+          } else {
+            oString.References = sReference;
+          }
+        }
+        oString.Context = sContext;
+        oString.Id = sString;
+        oString.Str = "";
+        
+        if (sKey in oStrings) { //If the key is already used...
+          oStrings[sKey] = oString;
+        } else { //If the key is NOT already used...
+          oStrings[sContext + sString] = oString;
+        }
+      }
+      fContinuation = (sLine !== "") && ",|".indexOf(sLine.substring(sLine.length - 1)) >= 0;
+    }
+    oRcFile.Close();
+  }
+  return oStrings;
+}
+
+////
+// ...
+function GetStringBlacklist(sTxtFilePath) {
+  var oBlacklist = {};
+  if (oFSO.FileExists(sTxtFilePath)) { //If the blacklist file exists...
+    var oTxtFile = oFSO.OpenTextFile(sTxtFilePath, ForReading);
+    while (!oTxtFile.AtEndOfStream) { //For all lines...
+      var sLine = oTxtFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      if (sLine !== "") {
+        if (!(sLine in oBlacklist)) { //If the key is NOT already used...
+          oBlacklist[sLine] = true;
+        }
+      }
+    }
+    oTxtFile.Close();
+  }
+  return oBlacklist;
+}
+
+////
+// ...
+function CreateMasterPotFile(sPotPath, oStrings) {
+  var oPotFile = oFSO.CreateTextFile(sPotPath, true);
+  
+  oPotFile.Write("# This file is part from WinMerge <https://winmerge.org/>\n");
+  oPotFile.Write("# Released under the \"GNU General Public License\"\n");
+  oPotFile.Write("#\n");
+  oPotFile.Write("msgid \"\"\n");
+  oPotFile.Write("msgstr \"\"\n");
+  oPotFile.Write("\"Project-Id-Version: WinMerge\\n\"\n");
+  oPotFile.Write("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\\n\"\n");
+  oPotFile.Write("\"POT-Creation-Date: " + GetPotCreationDate() + "\\n\"\n");
+  oPotFile.Write("\"PO-Revision-Date: \\n\"\n");
+  oPotFile.Write("\"Last-Translator: \\n\"\n");
+  oPotFile.Write("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\\n\"\n");
+  oPotFile.Write("\"MIME-Version: 1.0\\n\"\n");
+  oPotFile.Write("\"Content-Type: text/plain; charset=UTF-8\\n\"\n");
+  oPotFile.Write("\"Content-Transfer-Encoding: 8bit\\n\"\n");
+  oPotFile.Write("\"X-Poedit-Language: English\\n\"\n");
+  oPotFile.Write("\"X-Poedit-SourceCharset: UTF-8\\n\"\n");
+  oPotFile.Write("\"X-Poedit-Basepath: ../../Src/\\n\"\n");
+  //oPotFile.Write("""X-Generator: CreateMasterPotFile.js\\n""\n"
+  oPotFile.Write("\n");
+  for (var sKey in oStrings) { //For all strings...
+    var oString = oStrings[sKey];
+    if (oString.Comment !== "") { //If comment exists...
+      oPotFile.Write("#. " + oString.Comment + "\n");
+    }
+    if (bInsertLineNumbers) {
+      var aReferences = oString.References.split("\t");
+      for (var i = 0; i < aReferences.length; i++) { //For all references...
+        oPotFile.Write("#: " + aReferences[i] + "\n");
+      }
+    }
+    if (oString.Id.indexOf("%") >= 0) { //If c-format...
+      oPotFile.Write("#, c-format\n");
+    }
+    if (oString.Context !== "") { //If context exists...
+      oPotFile.Write("msgctxt \"" + oString.Context + "\"\n");
+    }
+    oPotFile.Write("msgid \"" + oString.Id + "\"\n");
+    oPotFile.Write("msgstr \"\"\n");
+    oPotFile.Write("\n");
+  }
+  oPotFile.Close();
+}
+
+////
+// ...
+function GetPotCreationDate() {
+  var oNow = new Date();
+  var sYear = oNow.getFullYear();
+  var sMonth = oNow.getMonth();
+  if (sMonth < 10) { sMonth = "0" + sMonth; }
+  var sDay = oNow.getDay();
+  if (sDay < 10) { sDay = "0" + sDay; }
+  var sHour = oNow.getHours();
+  if (sHour < 10) { sHour = "0" + sHour; }
+  var sMinute = oNow.getMinutes();
+  if (sMinute < 10) { sMinute = "0" + sMinute; }
+  
+  return sYear + "-" + sMonth + "-" + sDay + " " + sHour + ":" + sMinute + "+0000";
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = Wscript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    Wscript.Echo(sText);
+  }
+}
+
+////
+// ...
+function GetArchiveBit(sFilePath) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      return true;
+    }
+  }
+  return false;
+}
+
+////
+// ...
+function SetArchiveBit(sFilePath, bValue) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      if (!bValue) {
+        oFile.Attributes -= 32;
+      }
+    } else { //If archive bit NOT set...
+      if (bValue) {
+        oFile.Attributes += 32;
+      }
+    }
+  }
+}
diff --git a/Translations/WinMerge/CreateMasterPotFile.vbs b/Translations/WinMerge/CreateMasterPotFile.vbs
deleted file mode 100644
index 7840e2a0be3..00000000000
--- a/Translations/WinMerge/CreateMasterPotFile.vbs
+++ /dev/null
@@ -1,393 +0,0 @@
-Option Explicit
-''
-' This script creates the master POT file (English.pot).
-'
-' Copyright (C) 2007-2009 by Tim Gerundt
-' Released under the "GNU General Public License"
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
-
-Const PATH_ENGLISH_POT = "English.pot"
-Const PATH_MERGE_RC = "../../Src/Merge.rc"
-Const PATH_PLUGIN_STRINGS_RC = "../../Plugins/Strings.rc"
-
-Dim oFSO, bRunFromCmd, bInsertLineNumbers
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
-bInsertLineNumbers = False
-If WScript.Arguments.Named.Exists("InsertLineNumbers") Then
-  bInsertLineNumbers = CBool(WScript.Arguments.Named("InsertLineNumbers"))
-End If
-
-Call Main
-
-''
-' ...
-Sub Main
-  Dim oStrings
-  Dim StartTime, EndTime, Seconds
-  Dim bNecessary, oFile
-  
-  StartTime = Time
-  
-  InfoBox "Creating POT file from Merge.rc...", 3
-  
-  bNecessary = True
-  If (oFSO.FileExists(PATH_ENGLISH_POT) = True) Then 'If the POT file exists...
-    bNecessary = GetArchiveBit(PATH_MERGE_RC) Or GetArchiveBit(PATH_ENGLISH_POT) 'RCs or POT file changed?
-  End If
-  
-  If (bNecessary = True) Then 'If update necessary...
-    Set oStrings = MergeDictionaries( _
-      GetStringsFromRcFile(PATH_MERGE_RC), _
-      GetStringsFromRcFile(PATH_PLUGIN_STRINGS_RC))
-    CreateMasterPotFile PATH_ENGLISH_POT, oStrings
-    SetArchiveBit PATH_MERGE_RC, False
-    SetArchiveBit PATH_PLUGIN_STRINGS_RC, False
-    SetArchiveBit PATH_ENGLISH_POT, False
-    For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
-      If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
-        SetArchiveBit oFile.Path, True
-      End If
-    Next
-    
-    EndTime = Time
-    Seconds = DateDiff("s", StartTime, EndTime)
-    
-    InfoBox "POT file created, after " & Seconds & " second(s).", 10
-  Else 'If update NOT necessary...
-    InfoBox "POT file already up-to-date.", 10
-  End If
-End Sub
-
-''
-' ...
-Class CString
-  Dim Comment, References, Context, Id, Str
-End Class
-
-
-''
-' ...
-Function MergeDictionaries(dict1, dict2)
-    Dim mergedDict
-    Set mergedDict = CreateObject("Scripting.Dictionary")
-    
-    Dim key
-    For Each key In dict1.Keys
-        mergedDict.Add key, dict1.Item(key)
-    Next
-    
-    For Each key In dict2.Keys
-        If Not mergedDict.Exists(key) Then
-            mergedDict.Add key, dict2.Item(key)
-        End If
-    Next
-    
-    Set MergeDictionaries = mergedDict
-End Function
-
-''
-' ...
-Function GetStringsFromRcFile(ByVal sRcFilePath)
-  Dim oBlacklist, oStrings, oString, oRcFile, sLine, iLine
-  Dim sRcFileName, iBlockType, sReference, sString, sComment, sContext, oMatch, sTemp, sKey
-  Dim fContinuation
-
-  Set oBlacklist = GetStringBlacklist("StringBlacklist.txt")
-  
-  Set oStrings = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    sRcFileName = oFSO.GetFileName(sRcFilePath)
-    iLine = 0
-    iBlockType = NO_BLOCK
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      iLine = iLine + 1
-      
-      sReference = sRcFileName & ":" & iLine
-      sString = ""
-      sComment = ""
-      sContext = ""
-      
-      If fContinuation Then
-        ' Nothing to do
-      ElseIf (InStr(sLine, " MENU") > 0) And (InStr(sLine, "IDR_") > 0) Then 'MENU...
-        iBlockType = MENU_BLOCK
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        Select Case iBlockType
-          Case NO_BLOCK:
-            If (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
-              sString = oMatch.SubMatches(0)
-              sComment = "LANGUAGE, SUBLANGUAGE"
-            End If
-            
-          Case MENU_BLOCK, DIALOGEX_BLOCK, STRINGTABLE_BLOCK:
-            If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-              '--------------------------------------------------------------------------------
-              ' Replace 1st string literal only - 2nd string literal specifies control class!
-              '--------------------------------------------------------------------------------
-              If FoundRegExpMatch(sLine, "NC_\s*\(""([^""]*)""\s*,\s*""([^""]*)""\s*\)", oMatch) Then 'String...
-                sContext = Trim(oMatch.SubMatches(0))
-                sTemp = oMatch.SubMatches(1)
-              ElseIf FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) Then 'String...
-                sTemp = oMatch.SubMatches(0)
-              Else
-                sTemp = ""
-              End If 
-              If (sTemp <> "") And (oBlacklist.Exists(sTemp) = False) Then 'If NOT blacklisted...
-                sString = Replace(sTemp, """""", "\""")
-                If (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch) = True) Then 'If found a comment for the translators...
-                  sComment = Trim(oMatch.SubMatches(0))
-                ElseIf (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch) = True) Then 'If found a context for the translation...
-                  sContext = Trim(oMatch.SubMatches(0))
-                  sComment = sContext
-                End If
-              End If
-            End If
-            
-          Case VERSIONINFO_BLOCK:
-            If (FoundRegExpMatch(sLine, "BLOCK ""([0-9A-F]+)""", oMatch) = True) Then 'StringFileInfo.Block...
-              sString = oMatch.SubMatches(0)
-              sComment = "StringFileInfo.Block"
-            ElseIf (FoundRegExpMatch(sLine, "VALUE ""Comments"", ""(.*?)\\?0?""", oMatch) = True) Then 'StringFileInfo.Comments...
-              sString = oMatch.SubMatches(0)
-              sComment = "You should use a string like ""Translated by "" followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!"
-            ElseIf (FoundRegExpMatch(sLine, "VALUE ""Translation"", (.*?)$", oMatch) = True) Then 'VarFileInfo.Translation...
-              sString = oMatch.SubMatches(0)
-              sComment = "VarFileInfo.Translation"
-            End If
-            
-        End Select
-      End If
-      
-      If (sString <> "") Then
-        sKey = sContext & sString
-        Set oString = New CString
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oString = oStrings(sKey)
-        End If
-        If (sComment <> "") Then
-          oString.Comment = sComment
-        End If
-        If bInsertLineNumbers Then
-          If (oString.References <> "") Then
-            oString.References = oString.References & vbTab & sReference
-          Else
-            oString.References = sReference
-          End If
-        End If
-        oString.Context = sContext
-        oString.Id = sString
-        oString.Str = ""
-        
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oStrings(sKey) = oString
-        Else 'If the key is NOT already used...
-          oStrings.Add sContext & sString, oString
-        End If
-      End If
-      fContinuation = sLine <> "" And InStr(",|", Right(sLine, 1)) <> 0
-    Loop
-    oRcFile.Close
-  End If
-  Set GetStringsFromRcFile = oStrings
-End Function
-
-''
-' ...
-Function GetStringBlacklist(ByVal sTxtFilePath)
-  Dim oBlacklist, oTxtFile, sLine
-  
-  Set oBlacklist = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sTxtFilePath) = True) Then 'If the blacklist file exists...
-    Set oTxtFile = oFSO.OpenTextFile(sTxtFilePath, ForReading)
-    Do Until oTxtFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTxtFile.ReadLine)
-      
-      If (sLine <> "") Then
-        If (oBlacklist.Exists(sLine) = False) Then 'If the key is NOT already used...
-          oBlacklist.Add sLine, True
-        End If
-      End If
-    Loop
-    oTxtFile.Close
-  End If
-  Set GetStringBlacklist = oBlacklist
-End Function
-
-''
-' ...
-Sub CreateMasterPotFile(ByVal sPotPath, ByVal oStrings)
-  Dim oPotFile, sKey, oString, aReferences, i
-  
-  Set oPotFile = oFSO.CreateTextFile(sPotPath, True)
-  
-  oPotFile.Write "# This file is part from WinMerge <https://winmerge.org/>" & vbLf
-  oPotFile.Write "# Released under the ""GNU General Public License""" & vbLf
-  oPotFile.Write "#" & vbLf
-  oPotFile.Write "msgid """"" & vbLf
-  oPotFile.Write "msgstr """"" & vbLf
-  oPotFile.Write """Project-Id-Version: WinMerge\n""" & vbLf
-  oPotFile.Write """Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n""" & vbLf
-  oPotFile.Write """POT-Creation-Date: " & GetPotCreationDate() & "\n""" & vbLf
-  oPotFile.Write """PO-Revision-Date: \n""" & vbLf
-  oPotFile.Write """Last-Translator: \n""" & vbLf
-  oPotFile.Write """Language-Team: English <winmerge-translate@lists.sourceforge.net>\n""" & vbLf
-  oPotFile.Write """MIME-Version: 1.0\n""" & vbLf
-  oPotFile.Write """Content-Type: text/plain; charset=UTF-8\n""" & vbLf
-  oPotFile.Write """Content-Transfer-Encoding: 8bit\n""" & vbLf
-  oPotFile.Write """X-Poedit-Language: English\n""" & vbLf
-  oPotFile.Write """X-Poedit-SourceCharset: UTF-8\n""" & vbLf
-  oPotFile.Write """X-Poedit-Basepath: ../../Src/\n""" & vbLf
-  'oPotFile.Write """X-Generator: CreateMasterPotFile.vbs\n""" & vbLf
-  oPotFile.Write vbLf
-  For Each sKey In oStrings.Keys 'For all strings...
-    Set oString = oStrings(sKey)
-    If (oString.Comment <> "") Then 'If comment exists...
-      oPotFile.Write "#. " & oString.Comment & vbLf
-    End If
-    If bInsertLineNumbers Then
-      aReferences = SplitByTab(oString.References)
-      For i = LBound(aReferences) To UBound(aReferences) 'For all references...
-        oPotFile.Write "#: " & aReferences(i) & vbLf
-      Next
-    End If
-    If (InStr(oString.Id, "%") > 0) Then 'If c-format...
-      oPotFile.Write "#, c-format" & vbLf
-    End If
-    If (oString.Context <> "") Then 'If context exists...
-      oPotFile.Write "msgctxt """ & oString.Context & """" & vbLf
-    End If
-    oPotFile.Write "msgid """ & oString.Id & """" & vbLf
-    oPotFile.Write "msgstr """"" & vbLf
-    oPotFile.Write vbLf
-  Next
-  oPotFile.Close
-End Sub
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
-  
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
-
-''
-' ...
-Function SplitByTab(ByVal sString)
-  SplitByTab = Array()
-  If (InStr(sString, vbTab) > 0) Then
-    SplitByTab = Split(sString, vbTab, -1)
-  Else
-    SplitByTab = Array(sString)
-  End If
-End Function
-
-''
-' ...
-Function GetPotCreationDate()
-  Dim oNow, sYear, sMonth, sDay, sHour, sMinute
-  
-  oNow = Now()
-  sYear = Year(oNow)
-  sMonth = Month(oNow)
-  If (sMonth < 10) Then sMonth = "0" & sMonth
-  sDay = Day(oNow)
-  If (sDay < 10) Then sDay = "0" & sDay
-  sHour = Hour(oNow)
-  If (sHour < 10) Then sHour = "0" & sHour
-  sMinute = Minute(oNow)
-  If (sMinute < 10) Then sMinute = "0" & sMinute
-  
-  GetPotCreationDate = sYear & "-" & sMonth & "-" & sDay & " " & sHour & ":" & sMinute & "+0000"
-End Function
-
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
-
-''
-' ...
-Function GetArchiveBit(ByVal sFilePath)
-  Dim oFile
-  
-  GetArchiveBit = False
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      GetArchiveBit = True
-    End If
-  End If
-End Function
-
-''
-' ...
-Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
-  Dim oFile
-  
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      If (bValue = False) Then
-        oFile.Attributes = oFile.Attributes - 32
-      End If
-    Else 'If archive bit NOT set...
-      If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes + 32
-      End If
-    End If
-  End If
-End Sub
diff --git a/Translations/WinMerge/UpdatePoFilesFromPotFile.vbs b/Translations/WinMerge/UpdatePoFilesFromPotFile.js
similarity index 100%
rename from Translations/WinMerge/UpdatePoFilesFromPotFile.vbs
rename to Translations/WinMerge/UpdatePoFilesFromPotFile.js
diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln
index bb6b3ca7134..56ceb72ddc4 100644
--- a/WinMerge.vs2017.sln
+++ b/WinMerge.vs2017.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"
diff --git a/WinMerge.vs2019.sln b/WinMerge.vs2019.sln
index f90ee061cb6..33e49f5e67a 100644
--- a/WinMerge.vs2019.sln
+++ b/WinMerge.vs2019.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"
diff --git a/WinMerge.vs2022.sln b/WinMerge.vs2022.sln
index 267b414bc92..408153712e7 100644
--- a/WinMerge.vs2022.sln
+++ b/WinMerge.vs2022.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"

From 811ed5b84e633bb09575dd22e233756f001a1da9 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 12 Feb 2024 11:09:42 +0900
Subject: [PATCH 39/58] WIP

---
 .../ShellExtension/CreateMasterPotFile.js     | 478 ++++++++----------
 Translations/WinMerge/CreateMasterPotFile.js  |  18 +-
 Translations/WinMerge/English.pot             |   2 +-
 3 files changed, 224 insertions(+), 274 deletions(-)

diff --git a/Translations/ShellExtension/CreateMasterPotFile.js b/Translations/ShellExtension/CreateMasterPotFile.js
index 6a46926756a..8c92dc12fe2 100644
--- a/Translations/ShellExtension/CreateMasterPotFile.js
+++ b/Translations/ShellExtension/CreateMasterPotFile.js
@@ -1,308 +1,258 @@
-Option Explicit
-''
-' This script creates the master POT file (English.pot) for the shell extension.
-'
-' Copyright (C) 2007-2009 by Tim Gerundt
-' Released under the "GNU General Public License"
+////
+// This script creates the master POT file (English.pot) for the shell extension.
+//
+// Copyright (C) 2007-2009 by Tim Gerundt
+// Released under the "GNU General Public License
 
-Const ForReading = 1
+var ForReading = 1;
 
-Const NO_BLOCK = 0
-Const STRINGTABLE_BLOCK = 1
+var NO_BLOCK = 0;
+var STRINGTABLE_BLOCK = 1;
 
-Const PATH_ENGLISH_POT = "English.pot"
-Const PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc"
+var PATH_ENGLISH_POT = "English.pot";
+var PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc";
 
-Dim oFSO, bRunFromCmd
+var bRunFromCmd;
 
-Set oFSO = CreateObject("Scripting.FileSystemObject")
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
 
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
 
-Call Main
+Main();
 
-''
-' ...
-Sub Main
-  Dim oStrings, sCodePage
-  Dim StartTime, EndTime, Seconds
-  Dim bNecessary, oFile
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
   
-  StartTime = Time
+  InfoBox("Creating POT file from ShellExtension.rc...", 3);
   
-  InfoBox "Creating POT file from ShellExtension.rc...", 3
+  var bNecessary = true;
+  if (oFSO.FileExists(PATH_ENGLISH_POT) && oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC)) { //if the POT and RC file exists...
+    bNecessary = GetArchiveBit(PATH_SHELLEXTTEMPLATE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
+  }
   
-  bNecessary = True
-  If (oFSO.FileExists(PATH_ENGLISH_POT) = True) And (oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC) = True) Then 'If the POT and RC file exists...
-    bNecessary = GetArchiveBit(PATH_SHELLEXTTEMPLATE_RC) Or GetArchiveBit(PATH_ENGLISH_POT) 'RCs or POT file changed?
-  End If
-  
-  If (bNecessary = True) Then 'If update necessary...
-    Set oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC, sCodePage)
-    CreateMasterPotFile PATH_ENGLISH_POT, oStrings, sCodePage
-    SetArchiveBit PATH_SHELLEXTTEMPLATE_RC, False
-    SetArchiveBit PATH_ENGLISH_POT, False
-    For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
-      If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
-        SetArchiveBit oFile.Path, True
-      End If
-    Next
+  if (bNecessary) { //if update necessary...
+    var oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC, sCodePage);
+    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings, sCodePage);
+    SetArchiveBit(PATH_SHELLEXTTEMPLATE_RC, false);
+    SetArchiveBit(PATH_ENGLISH_POT, false);
+    for (var it = new Enumerator(oFSO.GetFolder(".").Files); !it.atEnd(); it.moveNext()) { //For all files in the current folder...
+      var oFile = it.item();
+      if (oFSO.GetExtensionName(oFile.Name).toLowerCase() === "po") { //If a PO file...
+        SetArchiveBit(oFile.Path, true);
+      }
+    }
     
-    EndTime = Time
-    Seconds = DateDiff("s", StartTime, EndTime)
+    var EndTime = new Date().getTime();
+    var Seconds = (EndTime - StartTime) / 1000.0;
     
-    InfoBox "POT file created, after " & Seconds & " second(s).", 10
-  Else 'If update NOT necessary...
-    InfoBox "POT file already up-to-date.", 10
-  End If
-End Sub
-
-''
-' ...
-Class CString
-  Dim Comment, References, Context, Id, Str
-End Class
+    InfoBox("POT file created, after " + Seconds + " second(s).", 10);
+  } else { //if update NOT necessary...
+    InfoBox("POT file already up-to-date.", 10);
+  }
+}
 
-''
-' ...
-Function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
+////
+// ...
+function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
   Dim oStrings, oString, oRcFile, sLine, iLine
   Dim sRcFileName, iBlockType, sReference, sString, sComment, sContext, oMatch, sTemp, sKey
   
-  Set oStrings = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    sRcFileName = oFSO.GetFileName(sRcFilePath)
-    iLine = 0
-    iBlockType = NO_BLOCK
-    sCodePage = ""
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      iLine = iLine + 1
+  var oStrings = {};
+  if (oFSO.FileExists(sRcFilePath)) { //if the RC file exists...
+    var sRcFileName = oFSO.GetFileName(sRcFilePath);
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var sCodePage = "";
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
       
-      sReference = sRcFileName & ":" & iLine
-      sString = ""
-      sComment = ""
-      sContext = ""
+      var sReference = sRcFileName + ":" + iLine;
+      var sString = "";
+      var sComment = "";
+      var sContext = "";
       
-      If (sLine = "STRINGTABLE") Then 'STRINGTABLE...
+      if (sLine === "STRINGTABLE") { //STRINGTABLE...
         iBlockType = STRINGTABLE_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        Select Case iBlockType
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //if NOT empty line...
+        switch (iBlockType) {
           Case NO_BLOCK:
-            If (FoundRegExpMatch(sLine, "defined\((AFX_TARG_\w*)\)", oMatch) = True) Then 'AFX_TARG_*...
+            if (FoundRegExpMatch(sLine, "defined\((AFX_TARG_\w*)\)", oMatch)) { //AFX_TARG_*...
               sString = oMatch.SubMatches(0)
               sComment = "AFX_TARG_*"
-            ElseIf (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
+            } else if (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, function LANG_\w*)", oMatch)) { //LANGUAGE...
               sString = oMatch.SubMatches(0)
-              sComment = "LANGUAGE, SUBLANGUAGE"
-            ElseIf (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
+              sComment = "LANGUAGE, function LANGUAGE"
+            } else if (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch)) { //code_page...
               sString = oMatch.SubMatches(0)
               sComment = "Codepage"
               sCodePage = oMatch.SubMatches(0)
-            End If
+            }
             
           Case STRINGTABLE_BLOCK:
-            If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-              '--------------------------------------------------------------------------------
-              ' Replace 1st string literal only - 2nd string literal specifies control class!
-              '--------------------------------------------------------------------------------
-              If FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) Then 'String...
+            if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+              //--------------------------------------------------------------------------------
+              // Replace 1st string literal only - 2nd string literal specifies control class!
+              //--------------------------------------------------------------------------------
+              if FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) { //String...
                 sTemp = oMatch.SubMatches(0)
-                If (sTemp <> "") Then 'If NOT empty...
+                if (sTemp !== "") { //if NOT empty...
                   sString = Replace(sTemp, """""", "\""")
-                  If (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch) = True) Then 'If found a comment for the translators...
+                  if (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch)) { //if found a comment for the translators...
                     sComment = Trim(oMatch.SubMatches(0))
-                  ElseIf (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch) = True) Then 'If found a context for the translation...
+                  } else if (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch)) { //if found a context for the translation...
                     sContext = Trim(oMatch.SubMatches(0))
                     sComment = sContext
-                  End If
-                End If
-              End If
-            End If
+                  }
+                }
+              }
+            }
             
-        End Select
-      End If
+        }
+      }
       
-      If (sString <> "") Then
-        sKey = sContext & sString
-        Set oString = New CString
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oString = oStrings(sKey)
-        End If
-        If (sComment <> "") Then
-          oString.Comment = sComment
-        End If
-        If (oString.References <> "") Then
-          oString.References = oString.References & vbTab & sReference
-        Else
-          oString.References = sReference
-        End If
-        oString.Context = sContext
-        oString.Id = sString
-        oString.Str = ""
+      if (sString !== "") {
+        var sKey = sContext + sString;
+        var oString = { "Comment": "", "References": "", "Context": "", "Id": "", "Str": "" };
+        if (sKey in oStrings) { //If the key is already used...
+          oString = oStrings[sKey];
+        }
+        if (sComment !== "") {
+          oString.Comment = sComment;
+        }
+        if (oString.References !== "") {
+          oString.References = oString.References + "\t" + sReference
+        } else {
+          oString.References = sReference;
+        }
+        oString.Context = sContext;
+        oString.Id = sString;
+        oString.Str = "";
         
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oStrings(sKey) = oString
-        Else 'If the key is NOT already used...
-          oStrings.Add sContext & sString, oString
-        End If
-      End If
-    Loop
-    oRcFile.Close
-  End If
-  Set GetStringsFromRcFile = oStrings
-End Function
-
-''
-' ...
-Sub CreateMasterPotFile(ByVal sPotPath, ByVal oStrings, ByVal sCodePage)
-  Dim oPotFile, sKey, oString, aReferences, i
-  
-  Set oPotFile = oFSO.CreateTextFile(sPotPath, True)
-  
-  oPotFile.WriteLine "# This file is part from WinMerge <https://winmerge.org/>"
-  oPotFile.WriteLine "# Released under the ""GNU General Public License"""
-  oPotFile.WriteLine "#"
-  oPotFile.WriteLine "msgid """""
-  oPotFile.WriteLine "msgstr """""
-  oPotFile.WriteLine """Project-Id-Version: WinMerge Shell Extension\n"""
-  oPotFile.WriteLine """Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"""
-  oPotFile.WriteLine """POT-Creation-Date: " & GetPotCreationDate() & "\n"""
-  oPotFile.WriteLine """PO-Revision-Date: \n"""
-  oPotFile.WriteLine """Last-Translator: \n"""
-  oPotFile.WriteLine """Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"""
-  oPotFile.WriteLine """MIME-Version: 1.0\n"""
-  oPotFile.WriteLine """Content-Type: text/plain; charset=CP" & sCodePage & "\n"""
-  oPotFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
-  oPotFile.WriteLine """X-Poedit-Language: English\n"""
-  oPotFile.WriteLine """X-Poedit-SourceCharset: CP" & sCodePage & "\n"""
-  oPotFile.WriteLine """X-Poedit-Basepath: ../../ShellExtension/Languages/\n"""
-  'oPotFile.WriteLine """X-Generator: CreateMasterPotFile.vbs\n"""
-  oPotFile.WriteLine
-  For Each sKey In oStrings.Keys 'For all strings...
-    Set oString = oStrings(sKey)
-    If (oString.Comment <> "") Then 'If comment exists...
-      oPotFile.WriteLine "#. " & oString.Comment
-    End If
-    aReferences = SplitByTab(oString.References)
-    For i = LBound(aReferences) To UBound(aReferences) 'For all references...
-      oPotFile.WriteLine "#: " & aReferences(i)
-    Next
-    oPotFile.WriteLine "#, c-format"
-    If (oString.Context <> "") Then 'If context exists...
-      oPotFile.WriteLine "msgctxt """ & oString.Context & """"
-    End If
-    oPotFile.WriteLine "msgid """ & oString.Id & """"
-    oPotFile.WriteLine "msgstr """""
-    oPotFile.WriteLine
-  Next
-  oPotFile.Close
-End Sub
+        if (sKey in oStrings) { //If the key is already used...
+          oStrings[sKey] = oString;
+        } else { //if the key is NOT already used...
+          oStrings[sContext + sString] = oString;
+        }
+      }
+    }
+    oRcFile.Close();
+  }
+  return oStrings;
+}
 
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
+////
+// ...
+function CreateMasterPotFile(sPotPath, oStrings, sCodePage) {
+  var oPotFile = oFSO.CreateTextFile(sPotPath, true);
   
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
-
-''
-' ...
-Function SplitByTab(ByVal sString)
-  SplitByTab = Array()
-  If (InStr(sString, vbTab) > 0) Then
-    SplitByTab = Split(sString, vbTab, -1)
-  Else
-    SplitByTab = Array(sString)
-  End If
-End Function
+  oPotFile.WriteLine("# This file is part from WinMerge <https://winmerge.org/>");
+  oPotFile.WriteLine("# Released under the \"GNU General Public License\"");
+  oPotFile.WriteLine("#");
+  oPotFile.WriteLine("msgid \"\"");
+  oPotFile.WriteLine("msgstr \"\"");
+  oPotFile.WriteLine("\"Project-Id-Version: WinMerge Shell Extension\n\"");
+  oPotFile.WriteLine("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n\"");
+  oPotFile.WriteLine("\"POT-Creation-Date: " + GetPotCreationDate() + "\n\"");
+  oPotFile.WriteLine("\"PO-Revision-Date: \n\"");
+  oPotFile.WriteLine("\"Last-Translator: \n\"");
+  oPotFile.WriteLine("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n\"");
+  oPotFile.WriteLine("\"MIME-Version: 1.0\n\"");
+  oPotFile.WriteLine("\"Content-Type: text/plain; charset=CP" + sCodePage + "\n\"");
+  oPotFile.WriteLine("\"Content-Transfer-Encoding: 8bit\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Language: English\n\"");
+  oPotFile.WriteLine("\"X-Poedit-SourceCharset: CP" + sCodePage + "\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Basepath: ../../ShellExtension/Languages/\n\"");
+  //oPotFile.WriteLine("\"X-Generator: CreateMasterPotFile.js\n\"");
+  oPotFile.WriteLine("");
+  For (var sKey In oStrings) { //For all strings...
+    var oString = oStrings[sKey];
+    if (oString.Comment !== "") { //if comment exists...
+      oPotFile.WriteLine("#. " + oString.Comment);
+    }
+    var aReferences = oString.References.split("\t");
+    for (var i = 0; i < aReferences.length; i++) { //For all references...
+      oPotFile.WriteLine("#: " + aReferences[i]);
+    }
+    oPotFile.WriteLine("#, c-format");
+    if (oString.Context !== "") { //if context exists...
+      oPotFile.WriteLine("msgctxt \"" + oString.Context + "\"");
+    }
+    oPotFile.WriteLine("msgid \"" + oString.Id + "\"");
+    oPotFile.WriteLine("msgstr \"\"");
+    oPotFile.WriteLine("");
+  }
+  oPotFile.Close();
+}
 
-''
-' ...
-Function GetPotCreationDate()
-  Dim oNow, sYear, sMonth, sDay, sHour, sMinute
-  
-  oNow = Now()
-  sYear = Year(oNow)
-  sMonth = Month(oNow)
-  If (sMonth < 10) Then sMonth = "0" & sMonth
-  sDay = Day(oNow)
-  If (sDay < 10) Then sDay = "0" & sDay
-  sHour = Hour(oNow)
-  If (sHour < 10) Then sHour = "0" & sHour
-  sMinute = Minute(oNow)
-  If (sMinute < 10) Then sMinute = "0" & sMinute
+////
+// ...
+function GetPotCreationDate() {
+  var oNow = new Date();
+  var sYear = oNow.getFullYear();
+  var sMonth = oNow.getMonth() + 1;
+  if (sMonth < 10) { sMonth = "0" + sMonth; }
+  var sDay = oNow.getDate();
+  if (sDay < 10) { sDay = "0" + sDay; }
+  var sHour = oNow.getHours();
+  if (sHour < 10) { sHour = "0" + sHour; }
+  var sMinute = oNow.getMinutes();
+  if (sMinute < 10) { sMinute = "0" + sMinute; }
   
-  GetPotCreationDate = sYear & "-" & sMonth & "-" & sDay & " " & sHour & ":" & sMinute & "+0000"
-End Function
+  return sYear + "-" + sMonth + "-" + sDay + " " + sHour + ":" + sMinute + "+0000";
+}
 
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //if run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //if NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
 
-''
-' ...
-Function GetArchiveBit(ByVal sFilePath)
-  Dim oFile
-  
-  GetArchiveBit = False
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      GetArchiveBit = True
-    End If
-  End If
-End Function
+////
+// ...
+function GetArchiveBit(sFilePath) {
+  if (oFSO.FileExists(sFilePath)) { //if the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //if archive bit set...
+      return true;
+    }
+  }
+  return false;
+}
 
-''
-' ...
-Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
-  Dim oFile
-  
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      If (bValue = False) Then
-        oFile.Attributes = oFile.Attributes - 32
-      End If
-    Else 'If archive bit NOT set...
-      If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes + 32
-      End If
-    End If
-  End If
-End Sub
+////
+// ...
+function SetArchiveBit(sFilePath, bValue) {
+  if (oFSO.FileExists(sFilePath)) { //if the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //if archive bit set...
+      if (!bValue) {
+        oFile.Attributes -= 32;
+      }
+    } else { //if archive bit NOT set...
+      if (bValue) {
+        oFile.Attributes += 32;
+      }
+    }
+  }
+}
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
index c926b17ad56..002768c3163 100644
--- a/Translations/WinMerge/CreateMasterPotFile.js
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -1,4 +1,4 @@
-////
+////
 // This script creates the master POT file (English.pot).
 //
 // Copyright (C) 2007-2009 by Tim Gerundt
@@ -17,10 +17,10 @@ var PATH_ENGLISH_POT = "English.pot";
 var PATH_MERGE_RC = "../../Src/Merge.rc";
 var PATH_PLUGIN_STRINGS_RC = "../../Plugins/Strings.rc";
 
-var oFSO = new ActiveX("Scripting.FileSystemObject");
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
 
 var bRunFromCmd = false;
-if (oFSO.GetFileName(Wscript.FullName).toLowerCase() === "cscript.exe") {
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
   bRunFromCmd = true;
 }
 var bInsertLineNumbers = false;
@@ -257,7 +257,7 @@ function CreateMasterPotFile(sPotPath, oStrings) {
   oPotFile.Write("\"X-Poedit-Language: English\\n\"\n");
   oPotFile.Write("\"X-Poedit-SourceCharset: UTF-8\\n\"\n");
   oPotFile.Write("\"X-Poedit-Basepath: ../../Src/\\n\"\n");
-  //oPotFile.Write("""X-Generator: CreateMasterPotFile.js\\n""\n"
+  //oPotFile.Write("\"X-Generator: CreateMasterPotFile.js\\n""\n"
   oPotFile.Write("\n");
   for (var sKey in oStrings) { //For all strings...
     var oString = oStrings[sKey];
@@ -288,9 +288,9 @@ function CreateMasterPotFile(sPotPath, oStrings) {
 function GetPotCreationDate() {
   var oNow = new Date();
   var sYear = oNow.getFullYear();
-  var sMonth = oNow.getMonth();
+  var sMonth = oNow.getMonth() + 1;
   if (sMonth < 10) { sMonth = "0" + sMonth; }
-  var sDay = oNow.getDay();
+  var sDay = oNow.getDate();
   if (sDay < 10) { sDay = "0" + sDay; }
   var sHour = oNow.getHours();
   if (sHour < 10) { sHour = "0" + sHour; }
@@ -304,10 +304,10 @@ function GetPotCreationDate() {
 // ...
 function InfoBox(sText, iSecondsToWait) {
   if (!bRunFromCmd) { //If run from command line...
-    var oShell = Wscript.CreateObject("WScript.Shell");
-    return oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64);
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
   } else { //If NOT run from command line...
-    Wscript.Echo(sText);
+    WScript.Echo(sText);
   }
 }
 
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index e0b9aacd8db..cd8111133bc 100644
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-12-30 17:35+0000\n"
+"POT-Creation-Date: 2024-02-12 10:05+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"

From afb459959216d6ac18c1ddf00ccc59fa10e28290 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 12 Feb 2024 16:29:09 +0900
Subject: [PATCH 40/58] WIP

---
 Translations/ShellExtension/Arabic.po         |   6 -
 Translations/ShellExtension/Basque.po         |   6 -
 Translations/ShellExtension/Brazilian.po      |   6 -
 Translations/ShellExtension/Bulgarian.po      |   6 -
 Translations/ShellExtension/Catalan.po        |   6 -
 .../ShellExtension/ChineseSimplified.po       |   6 -
 .../ShellExtension/ChineseTraditional.po      |   6 -
 Translations/ShellExtension/Corsican.po       |   6 -
 .../ShellExtension/CreateMasterPotFile.js     | 118 +++++++++---------
 Translations/ShellExtension/Croatian.po       |   6 -
 Translations/ShellExtension/Czech.po          |   6 -
 Translations/ShellExtension/Danish.po         |   6 -
 Translations/ShellExtension/Dutch.po          |   6 -
 Translations/ShellExtension/English.pot       |  12 +-
 Translations/ShellExtension/Finnish.po        |   6 -
 Translations/ShellExtension/French.po         |   6 -
 Translations/ShellExtension/Galician.po       |   6 -
 Translations/ShellExtension/German.po         |   6 -
 Translations/ShellExtension/Greek.po          |   6 -
 Translations/ShellExtension/Hungarian.po      |   6 -
 Translations/ShellExtension/Italian.po        |   6 -
 Translations/ShellExtension/Japanese.po       |   6 -
 Translations/ShellExtension/Korean.po         |   6 -
 Translations/ShellExtension/Lithuanian.po     |   6 -
 Translations/ShellExtension/Norwegian.po      |   6 -
 Translations/ShellExtension/Persian.po        |   6 -
 Translations/ShellExtension/Polish.po         |   6 -
 Translations/ShellExtension/Portuguese.po     |   6 -
 Translations/ShellExtension/Romanian.po       |   6 -
 Translations/ShellExtension/Russian.po        |   6 -
 Translations/ShellExtension/Serbian.po        |   6 -
 Translations/ShellExtension/Sinhala.po        |   6 -
 Translations/ShellExtension/Slovak.po         |   6 -
 Translations/ShellExtension/Slovenian.po      |   6 -
 Translations/ShellExtension/Spanish.po        |   6 -
 Translations/ShellExtension/Swedish.po        |   6 -
 Translations/ShellExtension/Tamil.po          |   6 -
 Translations/ShellExtension/Turkish.po        |   6 -
 Translations/ShellExtension/Ukrainian.po      |   6 -
 39 files changed, 61 insertions(+), 291 deletions(-)

diff --git a/Translations/ShellExtension/Arabic.po b/Translations/ShellExtension/Arabic.po
index 2ee91550b69..90b77c27846 100644
--- a/Translations/ShellExtension/Arabic.po
+++ b/Translations/ShellExtension/Arabic.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ARA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Basque.po b/Translations/ShellExtension/Basque.po
index 4341b16c33c..633c8b25155 100644
--- a/Translations/ShellExtension/Basque.po
+++ b/Translations/ShellExtension/Basque.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_EUQ"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_BASQUE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Brazilian.po b/Translations/ShellExtension/Brazilian.po
index 88042308319..d5f5fd92219 100644
--- a/Translations/ShellExtension/Brazilian.po
+++ b/Translations/ShellExtension/Brazilian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_PTB"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Bulgarian.po b/Translations/ShellExtension/Bulgarian.po
index 5a20dcd50c8..caeb7e38c45 100644
--- a/Translations/ShellExtension/Bulgarian.po
+++ b/Translations/ShellExtension/Bulgarian.po
@@ -28,12 +28,6 @@ msgstr "AFX_TARG_BGR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_BULGARIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Catalan.po b/Translations/ShellExtension/Catalan.po
index ae2d48ba229..4ae617e5225 100644
--- a/Translations/ShellExtension/Catalan.po
+++ b/Translations/ShellExtension/Catalan.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_CAT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CATALAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/ChineseSimplified.po b/Translations/ShellExtension/ChineseSimplified.po
index ae0c42b8a9b..8085d960d80 100644
--- a/Translations/ShellExtension/ChineseSimplified.po
+++ b/Translations/ShellExtension/ChineseSimplified.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_CHS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/ChineseTraditional.po b/Translations/ShellExtension/ChineseTraditional.po
index c7c0fee1bc7..29b05272a1e 100644
--- a/Translations/ShellExtension/ChineseTraditional.po
+++ b/Translations/ShellExtension/ChineseTraditional.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_CHT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Corsican.po b/Translations/ShellExtension/Corsican.po
index 674b2ca6807..fceaaa25b30 100644
--- a/Translations/ShellExtension/Corsican.po
+++ b/Translations/ShellExtension/Corsican.po
@@ -36,12 +36,6 @@ msgstr "AFX_TARG_COS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CORSICAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/CreateMasterPotFile.js b/Translations/ShellExtension/CreateMasterPotFile.js
index 8c92dc12fe2..dd72012a097 100644
--- a/Translations/ShellExtension/CreateMasterPotFile.js
+++ b/Translations/ShellExtension/CreateMasterPotFile.js
@@ -31,13 +31,13 @@ function Main() {
   InfoBox("Creating POT file from ShellExtension.rc...", 3);
   
   var bNecessary = true;
-  if (oFSO.FileExists(PATH_ENGLISH_POT) && oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC)) { //if the POT and RC file exists...
+  if (oFSO.FileExists(PATH_ENGLISH_POT) && oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC)) { //If the POT and RC file exists...
     bNecessary = GetArchiveBit(PATH_SHELLEXTTEMPLATE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
   }
   
-  if (bNecessary) { //if update necessary...
-    var oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC, sCodePage);
-    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings, sCodePage);
+  if (bNecessary) { //If update necessary...
+    var oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC);
+    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings);
     SetArchiveBit(PATH_SHELLEXTTEMPLATE_RC, false);
     SetArchiveBit(PATH_ENGLISH_POT, false);
     for (var it = new Enumerator(oFSO.GetFolder(".").Files); !it.atEnd(); it.moveNext()) { //For all files in the current folder...
@@ -51,23 +51,19 @@ function Main() {
     var Seconds = (EndTime - StartTime) / 1000.0;
     
     InfoBox("POT file created, after " + Seconds + " second(s).", 10);
-  } else { //if update NOT necessary...
+  } else { //If update NOT necessary...
     InfoBox("POT file already up-to-date.", 10);
   }
 }
 
 ////
 // ...
-function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
-  Dim oStrings, oString, oRcFile, sLine, iLine
-  Dim sRcFileName, iBlockType, sReference, sString, sComment, sContext, oMatch, sTemp, sKey
-  
+function GetStringsFromRcFile(sRcFilePath) {
   var oStrings = {};
-  if (oFSO.FileExists(sRcFilePath)) { //if the RC file exists...
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
     var sRcFileName = oFSO.GetFileName(sRcFilePath);
     var iLine = 0;
     var iBlockType = NO_BLOCK;
-    var sCodePage = "";
     var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
     while (!oRcFile.AtEndOfStream) { //For all lines...
       var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
@@ -89,40 +85,42 @@ function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
       } else if (sLine.substring(0, 2) === "//") { //If comment line...
         sLine = "";
         //IGNORE FOR SPEEDUP!
-      } else if (sLine !== "") { //if NOT empty line...
+      } else if (sLine !== "") { //If NOT empty line...
         switch (iBlockType) {
-          Case NO_BLOCK:
-            if (FoundRegExpMatch(sLine, "defined\((AFX_TARG_\w*)\)", oMatch)) { //AFX_TARG_*...
-              sString = oMatch.SubMatches(0)
-              sComment = "AFX_TARG_*"
-            } else if (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, function LANG_\w*)", oMatch)) { //LANGUAGE...
-              sString = oMatch.SubMatches(0)
-              sComment = "LANGUAGE, function LANGUAGE"
-            } else if (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch)) { //code_page...
-              sString = oMatch.SubMatches(0)
-              sComment = "Codepage"
-              sCodePage = oMatch.SubMatches(0)
+          case NO_BLOCK:
+            var oMatch0 = /defined\((AFX_TARG_\w*)\)/.exec(sLine);
+            var oMatch1 = /LANGUAGE (LANG_\w*, SUBLANG_\w*)/.exec(sLine);
+            if (oMatch0) { //AFX_TARG_*...
+              sString = oMatch0[1];
+              sComment = "AFX_TARG_*";
+            } else if (oMatch1) { //LANGUAGE...
+              sString = oMatch1[1];
+              sComment = "LANGUAGE, SUBLANGUAGE";
             }
-            
-          Case STRINGTABLE_BLOCK:
+            break;
+
+          case STRINGTABLE_BLOCK:
             if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
               //--------------------------------------------------------------------------------
               // Replace 1st string literal only - 2nd string literal specifies control class!
               //--------------------------------------------------------------------------------
-              if FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) { //String...
-                sTemp = oMatch.SubMatches(0)
-                if (sTemp !== "") { //if NOT empty...
-                  sString = Replace(sTemp, """""", "\""")
-                  if (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch)) { //if found a comment for the translators...
-                    sComment = Trim(oMatch.SubMatches(0))
-                  } else if (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch)) { //if found a context for the translation...
-                    sContext = Trim(oMatch.SubMatches(0))
+              var oMatch2 = /"((?:""|[^"])*)"/.exec(sLine);
+              if (oMatch2) { //String...
+                var sTemp = oMatch2[1];
+                if (sTemp !== "") { //If NOT empty...
+                  sString = sTemp.replace(/\"\"/g, "\\\"");
+                  var oMatch3 = /\/\/#\. (.*?)$/.exec(sLine);
+                  var oMatch4 = /\/\/msgctxt (.*?)$/.exec(sLine);
+                  if (oMatch3) { //If found a comment for the translators...
+                    sComment = oMatch3[1].replace(/^\s+|\s+$/g, "");
+                  } else if (oMatch4) { //If found a context for the translation...
+                    sContext = oMatch4[1].replace(/^\s+|\s+$/g, "");
                     sComment = sContext
                   }
                 }
               }
             }
-            
+            break;
         }
       }
       
@@ -136,7 +134,7 @@ function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
           oString.Comment = sComment;
         }
         if (oString.References !== "") {
-          oString.References = oString.References + "\t" + sReference
+          oString.References = oString.References + "\t" + sReference;
         } else {
           oString.References = sReference;
         }
@@ -146,7 +144,7 @@ function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
         
         if (sKey in oStrings) { //If the key is already used...
           oStrings[sKey] = oString;
-        } else { //if the key is NOT already used...
+        } else { //If the key is NOT already used...
           oStrings[sContext + sString] = oString;
         }
       }
@@ -158,7 +156,7 @@ function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
 
 ////
 // ...
-function CreateMasterPotFile(sPotPath, oStrings, sCodePage) {
+function CreateMasterPotFile(sPotPath, oStrings) {
   var oPotFile = oFSO.CreateTextFile(sPotPath, true);
   
   oPotFile.WriteLine("# This file is part from WinMerge <https://winmerge.org/>");
@@ -166,23 +164,23 @@ function CreateMasterPotFile(sPotPath, oStrings, sCodePage) {
   oPotFile.WriteLine("#");
   oPotFile.WriteLine("msgid \"\"");
   oPotFile.WriteLine("msgstr \"\"");
-  oPotFile.WriteLine("\"Project-Id-Version: WinMerge Shell Extension\n\"");
-  oPotFile.WriteLine("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n\"");
-  oPotFile.WriteLine("\"POT-Creation-Date: " + GetPotCreationDate() + "\n\"");
-  oPotFile.WriteLine("\"PO-Revision-Date: \n\"");
-  oPotFile.WriteLine("\"Last-Translator: \n\"");
-  oPotFile.WriteLine("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n\"");
-  oPotFile.WriteLine("\"MIME-Version: 1.0\n\"");
-  oPotFile.WriteLine("\"Content-Type: text/plain; charset=CP" + sCodePage + "\n\"");
-  oPotFile.WriteLine("\"Content-Transfer-Encoding: 8bit\n\"");
-  oPotFile.WriteLine("\"X-Poedit-Language: English\n\"");
-  oPotFile.WriteLine("\"X-Poedit-SourceCharset: CP" + sCodePage + "\n\"");
-  oPotFile.WriteLine("\"X-Poedit-Basepath: ../../ShellExtension/Languages/\n\"");
-  //oPotFile.WriteLine("\"X-Generator: CreateMasterPotFile.js\n\"");
+  oPotFile.WriteLine("\"Project-Id-Version: WinMerge Shell Extension\\n\"");
+  oPotFile.WriteLine("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\\n\"");
+  oPotFile.WriteLine("\"POT-Creation-Date: " + GetPotCreationDate() + "\\n\"");
+  oPotFile.WriteLine("\"PO-Revision-Date: \\n\"");
+  oPotFile.WriteLine("\"Last-Translator: \\n\"");
+  oPotFile.WriteLine("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\\n\"");
+  oPotFile.WriteLine("\"MIME-Version: 1.0\\n\"");
+  oPotFile.WriteLine("\"Content-Type: text/plain; charset=UTF-8\\n\"");
+  oPotFile.WriteLine("\"Content-Transfer-Encoding: 8bit\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Language: English\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-SourceCharset: UTF-8\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Basepath: ../../ShellExtension/Languages/\\n\"");
+  //oPotFile.WriteLine("\"X-Generator: CreateMasterPotFile.js\\n\"");
   oPotFile.WriteLine("");
-  For (var sKey In oStrings) { //For all strings...
+  for (var sKey in oStrings) { //For all strings...
     var oString = oStrings[sKey];
-    if (oString.Comment !== "") { //if comment exists...
+    if (oString.Comment !== "") { //If comment exists...
       oPotFile.WriteLine("#. " + oString.Comment);
     }
     var aReferences = oString.References.split("\t");
@@ -190,7 +188,7 @@ function CreateMasterPotFile(sPotPath, oStrings, sCodePage) {
       oPotFile.WriteLine("#: " + aReferences[i]);
     }
     oPotFile.WriteLine("#, c-format");
-    if (oString.Context !== "") { //if context exists...
+    if (oString.Context !== "") { //If context exists...
       oPotFile.WriteLine("msgctxt \"" + oString.Context + "\"");
     }
     oPotFile.WriteLine("msgid \"" + oString.Id + "\"");
@@ -220,10 +218,10 @@ function GetPotCreationDate() {
 ////
 // ...
 function InfoBox(sText, iSecondsToWait) {
-  if (!bRunFromCmd) { //if run from command line...
+  if (!bRunFromCmd) { //If run from command line...
     var oShell = WScript.CreateObject("WScript.Shell");
     return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
-  } else { //if NOT run from command line...
+  } else { //If NOT run from command line...
     WScript.Echo(sText);
   }
 }
@@ -231,9 +229,9 @@ function InfoBox(sText, iSecondsToWait) {
 ////
 // ...
 function GetArchiveBit(sFilePath) {
-  if (oFSO.FileExists(sFilePath)) { //if the file exists...
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
     var oFile = oFSO.GetFile(sFilePath);
-    if (oFile.Attributes & 32) { //if archive bit set...
+    if (oFile.Attributes & 32) { //If archive bit set...
       return true;
     }
   }
@@ -243,13 +241,13 @@ function GetArchiveBit(sFilePath) {
 ////
 // ...
 function SetArchiveBit(sFilePath, bValue) {
-  if (oFSO.FileExists(sFilePath)) { //if the file exists...
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
     var oFile = oFSO.GetFile(sFilePath);
-    if (oFile.Attributes & 32) { //if archive bit set...
+    if (oFile.Attributes & 32) { //If archive bit set...
       if (!bValue) {
         oFile.Attributes -= 32;
       }
-    } else { //if archive bit NOT set...
+    } else { //If archive bit NOT set...
       if (bValue) {
         oFile.Attributes += 32;
       }
diff --git a/Translations/ShellExtension/Croatian.po b/Translations/ShellExtension/Croatian.po
index 1d60fdcedab..d949acd12f4 100644
--- a/Translations/ShellExtension/Croatian.po
+++ b/Translations/ShellExtension/Croatian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_HRV"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CROATIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Czech.po b/Translations/ShellExtension/Czech.po
index 2d832188e6c..8e70ca0ebc9 100644
--- a/Translations/ShellExtension/Czech.po
+++ b/Translations/ShellExtension/Czech.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_CSY"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CZECH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Danish.po b/Translations/ShellExtension/Danish.po
index 41b7e5d0e56..9861021e2bb 100644
--- a/Translations/ShellExtension/Danish.po
+++ b/Translations/ShellExtension/Danish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_DAN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_DANISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Dutch.po b/Translations/ShellExtension/Dutch.po
index 36c66ba004e..fb4825e5bfc 100644
--- a/Translations/ShellExtension/Dutch.po
+++ b/Translations/ShellExtension/Dutch.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_NLB"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_DUTCH, SUBLANG_DUTCH"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "1252"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/English.pot b/Translations/ShellExtension/English.pot
index 0a08583dd6b..503538f3843 100644
--- a/Translations/ShellExtension/English.pot
+++ b/Translations/ShellExtension/English.pot
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge Shell Extension\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-02-19 00:07+0000\n"
+"POT-Creation-Date: 2024-02-12 16:24+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1252\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: English\n"
-"X-Poedit-SourceCharset: CP1252\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../../ShellExtension/Languages/\n"
 
 #. AFX_TARG_*
@@ -28,12 +28,6 @@ msgstr ""
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr ""
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr ""
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Finnish.po b/Translations/ShellExtension/Finnish.po
index ff0620a95b3..2195c98398b 100644
--- a/Translations/ShellExtension/Finnish.po
+++ b/Translations/ShellExtension/Finnish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_FIN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FINNISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/French.po b/Translations/ShellExtension/French.po
index 225ccb2470a..e8bcb21e1ce 100644
--- a/Translations/ShellExtension/French.po
+++ b/Translations/ShellExtension/French.po
@@ -36,12 +36,6 @@ msgstr "AFX_TARG_FRA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FRENCH, SUBLANG_FRENCH"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Galician.po b/Translations/ShellExtension/Galician.po
index 20d17e4ffb7..f101ff626ba 100644
--- a/Translations/ShellExtension/Galician.po
+++ b/Translations/ShellExtension/Galician.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ESN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GALICIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/German.po b/Translations/ShellExtension/German.po
index 6d4c442774c..0940552ac97 100644
--- a/Translations/ShellExtension/German.po
+++ b/Translations/ShellExtension/German.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_DEU"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GERMAN, SUBLANG_GERMAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Greek.po b/Translations/ShellExtension/Greek.po
index 48ac7b7f360..a7ed34551c3 100644
--- a/Translations/ShellExtension/Greek.po
+++ b/Translations/ShellExtension/Greek.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ELL"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GREEK, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Hungarian.po b/Translations/ShellExtension/Hungarian.po
index a1b6bb69e96..116e3060dd9 100644
--- a/Translations/ShellExtension/Hungarian.po
+++ b/Translations/ShellExtension/Hungarian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_HUN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_HUNGARIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Italian.po b/Translations/ShellExtension/Italian.po
index 98ec1bbea60..245601d4c40 100644
--- a/Translations/ShellExtension/Italian.po
+++ b/Translations/ShellExtension/Italian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ITA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ITALIAN, SUBLANG_ITALIAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Japanese.po b/Translations/ShellExtension/Japanese.po
index 70b0ac21b7a..ab7f7eba0e1 100644
--- a/Translations/ShellExtension/Japanese.po
+++ b/Translations/ShellExtension/Japanese.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_JPN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_JAPANESE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Korean.po b/Translations/ShellExtension/Korean.po
index ad968df49fd..1c8c9f8fcf6 100644
--- a/Translations/ShellExtension/Korean.po
+++ b/Translations/ShellExtension/Korean.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_KOR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_KOREAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Lithuanian.po b/Translations/ShellExtension/Lithuanian.po
index 779c8ff49e2..85033c90dee 100644
--- a/Translations/ShellExtension/Lithuanian.po
+++ b/Translations/ShellExtension/Lithuanian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_LIT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_LITHUANIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Norwegian.po b/Translations/ShellExtension/Norwegian.po
index 8a6f5e32e0c..cd1623e32e6 100644
--- a/Translations/ShellExtension/Norwegian.po
+++ b/Translations/ShellExtension/Norwegian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_NOR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_NORWEGIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Persian.po b/Translations/ShellExtension/Persian.po
index 95c36a3bd3e..02d6a751a12 100644
--- a/Translations/ShellExtension/Persian.po
+++ b/Translations/ShellExtension/Persian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_FAR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FARSI, SUBLANG_NEUTRAL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Polish.po b/Translations/ShellExtension/Polish.po
index 0755da65d03..0253bcf7376 100644
--- a/Translations/ShellExtension/Polish.po
+++ b/Translations/ShellExtension/Polish.po
@@ -31,12 +31,6 @@ msgstr "AFX_TARG_PLK"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_POLISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Portuguese.po b/Translations/ShellExtension/Portuguese.po
index 070f0444131..9d42426ec95 100644
--- a/Translations/ShellExtension/Portuguese.po
+++ b/Translations/ShellExtension/Portuguese.po
@@ -33,12 +33,6 @@ msgstr "AFX_TARG_PTG"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_PORTUGUESE, SUBLANG_PORTUGUESE"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Romanian.po b/Translations/ShellExtension/Romanian.po
index 067efe93e05..8188ed4521e 100644
--- a/Translations/ShellExtension/Romanian.po
+++ b/Translations/ShellExtension/Romanian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_ROM"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ROMANIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Russian.po b/Translations/ShellExtension/Russian.po
index a3afb15c5c4..85a4383120f 100644
--- a/Translations/ShellExtension/Russian.po
+++ b/Translations/ShellExtension/Russian.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_RUS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_RUSSIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "1252"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Serbian.po b/Translations/ShellExtension/Serbian.po
index da7ea8a179c..deb3d4017e4 100644
--- a/Translations/ShellExtension/Serbian.po
+++ b/Translations/ShellExtension/Serbian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SER"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Sinhala.po b/Translations/ShellExtension/Sinhala.po
index 50f8d3bedda..125fc1cefb3 100644
--- a/Translations/ShellExtension/Sinhala.po
+++ b/Translations/ShellExtension/Sinhala.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_LKA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SINHALESE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Slovak.po b/Translations/ShellExtension/Slovak.po
index 1e0e00f7027..c18f2f205d0 100644
--- a/Translations/ShellExtension/Slovak.po
+++ b/Translations/ShellExtension/Slovak.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SKY"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SLOVAK, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Slovenian.po b/Translations/ShellExtension/Slovenian.po
index bb1c3d9f66a..e37d6e3a26e 100644
--- a/Translations/ShellExtension/Slovenian.po
+++ b/Translations/ShellExtension/Slovenian.po
@@ -33,12 +33,6 @@ msgstr "AFX_TARG_SLV"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SLOVENIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Spanish.po b/Translations/ShellExtension/Spanish.po
index fb0ffe7e85d..bfa53353cdf 100644
--- a/Translations/ShellExtension/Spanish.po
+++ b/Translations/ShellExtension/Spanish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ESN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SPANISH, SUBLANG_SPANISH_MODERN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Swedish.po b/Translations/ShellExtension/Swedish.po
index 9ce761b5f0f..7cff5ce9c50 100644
--- a/Translations/ShellExtension/Swedish.po
+++ b/Translations/ShellExtension/Swedish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SVE"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SWEDISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Tamil.po b/Translations/ShellExtension/Tamil.po
index 5c25bf38b92..3e2609ff18a 100644
--- a/Translations/ShellExtension/Tamil.po
+++ b/Translations/ShellExtension/Tamil.po
@@ -35,12 +35,6 @@ msgstr "AFX_TARG_TAM"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_TAMIL, SUBLANG_TAMIL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Turkish.po b/Translations/ShellExtension/Turkish.po
index 91a8bc6de46..03bdae0ea02 100644
--- a/Translations/ShellExtension/Turkish.po
+++ b/Translations/ShellExtension/Turkish.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_TRK"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_TURKISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Ukrainian.po b/Translations/ShellExtension/Ukrainian.po
index dedb59c3f29..5d4c527be08 100644
--- a/Translations/ShellExtension/Ukrainian.po
+++ b/Translations/ShellExtension/Ukrainian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_UKR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_UKRAINIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"

From afccc2fa228b8c90fef25ebde6d9fbc9660177b3 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 12 Feb 2024 21:48:24 +0900
Subject: [PATCH 41/58] WIP

---
 Tools/Scripts/CheckMenuResources.js           | 354 +++++++--------
 Tools/Scripts/CheckUnusedResources.js         | 407 ++++++++----------
 .../ShellExtension/CreateMasterPotFile.js     |   2 +-
 Translations/WinMerge/CreateMasterPotFile.js  |   2 +-
 4 files changed, 341 insertions(+), 424 deletions(-)

diff --git a/Tools/Scripts/CheckMenuResources.js b/Tools/Scripts/CheckMenuResources.js
index cae3fe64f1f..6f8b5e23c3b 100644
--- a/Tools/Scripts/CheckMenuResources.js
+++ b/Tools/Scripts/CheckMenuResources.js
@@ -1,211 +1,167 @@
-Option Explicit
-''
-' This script checks the menu resources.
-'
-' Copyright (C) 2008 by Tim Gerundt
-' Released under the "GNU General Public License"
+////
+// This script checks the menu resources.
+//
+// Copyright (C) 2008 by Tim Gerundt
+// Released under the "GNU General Public License"
 
-Const ForReading = 1
+var ForReading = 1;
 
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
 
-Dim oFSO, bRunFromCmd
 
-Set oFSO = CreateObject("Scripting.FileSystemObject")
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
 
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
 
-Call Main
+Main();
 
-''
-' ...
-Sub Main
-  Dim oMenuItems, oMenuItem, oIds, sKey, oTxtFile
-  Dim StartTime, EndTime, Seconds
-  
-  StartTime = Time
-  
-  InfoBox "Checking menu resources....", 3
-  
-  Set oMenuItems = GetMenuItemsFromRcFile("..\..\Src\Merge.rc")
-  Set oIds = GetIdsFromRcFile("..\..\Src\Merge.rc")
-  
-  Set oTxtFile = oFSO.CreateTextFile("MenuResources.txt", True)
-  
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NO MNEMONIC CHAR"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oMenuItems.Keys 'For all menu items...
-    Set oMenuItem = oMenuItems(sKey)
-    If (InStr(oMenuItem.Str, "&") = 0) Then 'If WITHOUT mnemonic...
-      oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
-    End If
-  Next
-  
-  oTxtFile.WriteLine ""
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NO DESCRIPTION TEXT"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oMenuItems.Keys 'For all menu items...
-    Set oMenuItem = oMenuItems(sKey)
-    If (oMenuItem.Id <> "") Then 'If NOT empty...
-      If (oIds.Exists(oMenuItem.Id) = False) Then 'If WITHOUT description...
-        oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
-      End If
-    End If
-  Next
-  
-  oTxtFile.Close
-  
-  EndTime = Time
-  Seconds = DateDiff("s", StartTime, EndTime)
-  
-  InfoBox "File ""MenuResources.txt"" created, after " & Seconds & " second(s).", 10
-End Sub
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Checking menu resources....", 3);
+  
+  var oMenuItems = GetMenuItemsFromRcFile("..\\..\\Src\\Merge.rc");
+  var oIds = GetIdsFromRcFile("..\\..\\Src\\Merge.rc");
+  
+  var oTxtFile = oFSO.CreateTextFile("MenuResources.txt", true);
+  
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NO MNEMONIC CHAR");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oMenuItems) { //For all menu items...
+    var oMenuItem = oMenuItems[sKey];
+    if (oMenuItem.Str.indexOf("&") === -1) { //If WITHOUT mnemonic...
+      oTxtFile.WriteLine(oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")");
+    }
+  }
+  
+  oTxtFile.WriteLine("");
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NO DESCRIPTION TEXT");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oMenuItems) { //For all menu items...
+    var oMenuItem = oMenuItems[sKey];
+    if (oMenuItem.Id !== "") { //If NOT empty...
+      if (!(oMenuItem.Id in oIds)) { //If WITHOUT description...
+        oTxtFile.WriteLine(oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")");
+      }
+    }
+  }
+  
+  oTxtFile.Close();
+  
+  var EndTime = new Date().getTime();
+  var Seconds = (EndTime - StartTime) / 1000.0;
+  
+  InfoBox("File \"MenuResources.txt\" created, after " + Seconds + " second(s).", 10);
+}
 
-''
-' ...
-Class CMenuItem
-  Dim Menu, Str, Id
-End Class
-
-''
-' ...
-Function GetMenuItemsFromRcFile(ByVal sRcFilePath)
-  Dim oMenuItems, oMenuItem, oRcFile, sLine, iCount
-  Dim iBlockType, sMenu, sString, sId, oMatch
-  
-  Set oMenuItems = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    iCount = 0
-    iBlockType = NO_BLOCK
-    sMenu = ""
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      
-      sString = ""
-      sId = ""
-      
-      If (FoundRegExpMatch(sLine, "(IDR_\w+) MENU", oMatch) = True) Then 'MENU...
-        iBlockType = MENU_BLOCK
-        sMenu = oMatch.SubMatches(0)
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        If (iBlockType = MENU_BLOCK) Then
-          If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-            If (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) And (InStr(sLine, "_POPUP_") = 0) Then 'If "string"...
-              sString = oMatch.SubMatches(0)
-              If (sString <> "") Then 'If NOT empty...
-                If (FoundRegExpMatch(sLine, "(ID_\w+)", oMatch) = True) Then 'If ID...
-                  sId = oMatch.SubMatches(0)
-                End If
-                iCount = iCount + 1
-              End If
-            End If
-          End If
-        End If
-      End If
+////
+// ...
+function GetMenuItemsFromRcFile(sRcFilePath) {
+  var oMenuItems = {};
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
+    var iCount = 0;
+    var iBlockType = NO_BLOCK;
+    var sMenu = "";
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var sString = "";
+      var sId = "";
+      var oMatch = /(IDR_\w+) MENU/.exec(sLine);
+      if (oMatch) { //MENU...
+        iBlockType = MENU_BLOCK;
+        sMenu = oMatch[1];
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK;
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK;
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK;
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK;
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        if (iBlockType === MENU_BLOCK) {
+          if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+            var oMatch = /"(.*)"/.exec(sLine);
+            if (oMatch && sLine.indexOf("_POPUP_") === -1) { //If "string"...
+              sString = oMatch[1];
+              oMatch = /(ID_\w+)/.exec(sLine);
+              if (sString !== "") { //If NOT empty...
+                if (oMatch) { //If ID...
+                  sId = oMatch[1];
+                }
+                iCount++;
+              }
+            }
+          }
+        }
+      }
       
-      If (sString <> "") Then
-        Set oMenuItem = New CMenuItem
-        oMenuItem.Menu = sMenu
-        oMenuItem.Str = sString
-        oMenuItem.Id = sId
-        oMenuItems.Add iCount, oMenuItem
-      End If
-    Loop
-    oRcFile.Close
-  End If
-  Set GetMenuItemsFromRcFile = oMenuItems
-End Function
+      if (sString !== "") {
+        var oMenuItem = { "Menu": "", "Str": "", "Id": "" };
+        oMenuItem.Menu = sMenu;
+        oMenuItem.Str = sString;
+        oMenuItem.Id = sId;
+        oMenuItems[iCount] = oMenuItem;
+      }
+    }
+    oRcFile.Close();
+  }
+  return oMenuItems;
+}
 
-''
-' ...
-Function GetIdsFromRcFile(ByVal sRcPath)
-  Dim oIds, oTextFile, sLine
-  Dim reId, oMatch, sId, sString
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reId = New RegExp
-  reId.Pattern = "(ID_\w+)\s+""(.*)"""
-  reId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
-    Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      
-      sId = ""
-      sString = ""
-      If reId.Test(sLine) Then 'If ID...
-        Set oMatch = reId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        sString = oMatch.SubMatches(1)
-        
-        If (oIds.Exists(sId) = False) Then 'If the key is NOT already used...
-          oIds.Add sId, sString
-        End If
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromRcFile = oIds
-End Function
+////
+// ...
+function GetIdsFromRcFile(sRcPath) {
+  var oIds = {};
+  var reId = /(ID_\w+)\s+\"(.*)\"/;
+  if (oFSO.FileExists(sRcPath)) { //If the RC file exists...
+    var oTextFile = oFSO.OpenTextFile(sRcPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var oMatch = reId.exec(sLine); //If ID...
+      if (oMatch) {
+        var sId = oMatch[1];
+        var sString = oMatch[2];
+        if (!(sId in oIds)) { //If the key is NOT already used...
+          oIds[sId] = sString;
+        }
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
 
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
-  
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
 
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
diff --git a/Tools/Scripts/CheckUnusedResources.js b/Tools/Scripts/CheckUnusedResources.js
index 048257d7f74..5c519a03def 100644
--- a/Tools/Scripts/CheckUnusedResources.js
+++ b/Tools/Scripts/CheckUnusedResources.js
@@ -1,236 +1,197 @@
-Option Explicit
-''
-' This script creates a list of (hopefully) unused resource IDs.
-'
-' Copyright (C) 2008 by Tim Gerundt
-' Released under the "GNU General Public License"
+////
+// This script creates a list of (hopefully) unused resource IDs.
+//
+// Copyright (C) 2008 by Tim Gerundt
+// Released under the "GNU General Public License"
 
-Const ForReading = 1
+var ForReading = 1;
 
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
 
-Dim oFSO, bRunFromCmd
 
-Set oFSO = CreateObject("Scripting.FileSystemObject")
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
 
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
 
-Call Main
+Main();
 
-''
-' ...
-Sub Main
-  Dim oHIds, oRcIds, oRc2Ids, oCppIds, sKey, oTxtFile
-  Dim StartTime, EndTime, Seconds
-  
-  StartTime = Time
-  
-  InfoBox "Creating list of unused resource IDs...", 3
-  
-  Set oHIds = GetIdsFromHeaderFile("..\..\Src\resource.h")
-  Set oRcIds = GetIdsFromResourceFile("..\..\Src\Merge.rc")
-  Set oRc2Ids = GetIdsFromResourceFile("..\..\Src\Merge2.rc")
-  
-  Set oCppIds = CreateObject("Scripting.Dictionary")
-  GetIdsFromCppFiles "..\..\Src\", oCppIds
-  GetIdsFromCppFiles "..\..\Externals\crystaledit\editlib\", oCppIds
-  
-  Set oTxtFile = oFSO.CreateTextFile("UnusedResources.txt", True)
-  
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "ONLY IN RESOURCE.H FILE"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oHIds.Keys 'For all header IDs...
-    If (oRcIds.Exists(sKey) = False) And (oRc2Ids.Exists(sKey) = False) And (oCppIds.Exists(sKey) = False) Then 'If header ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  
-  oTxtFile.WriteLine ""
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NOT USED IN *.CPP/*.H FILES"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oRcIds.Keys 'For all RC IDs...
-    If (oCppIds.Exists(sKey) = False) Then 'If RC ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  For Each sKey In oRc2Ids.Keys 'For all RC2 IDs...
-    If (oCppIds.Exists(sKey) = False) Then 'If RC2 ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  
-  oTxtFile.Close
-  
-  EndTime = Time
-  Seconds = DateDiff("s", StartTime, EndTime)
-  
-  InfoBox "File ""UnusedResources.txt"" created, after " & Seconds & " second(s).", 10
-End Sub
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Creating list of unused resource IDs...", 3);
+  
+  var oHIds = GetIdsFromHeaderFile("..\\..\\Src\\resource.h");
+  var oRcIds = GetIdsFromResourceFile("..\\..\\Src\\Merge.rc");
+  var oRc2Ids = GetIdsFromResourceFile("..\\..\\Src\\Merge2.rc");
+  
+  var oCppIds = {};
+  oCppIds = GetIdsFromCppFiles("..\\..\\Src\\", oCppIds);
+  oCppIds = GetIdsFromCppFiles("..\\..\\Externals\\crystaledit\\editlib\\", oCppIds);
+  
+  var oTxtFile = oFSO.CreateTextFile("UnusedResources.txt", true);
+  
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("ONLY IN RESOURCE.H FILE");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oHIds) { //For all header IDs...
+    if (!(sKey in oRcIds) && !(sKey in oRc2Ids) && !(sKey in oCppIds)) { //If header ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  
+  oTxtFile.WriteLine("");
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NOT USED IN *.CPP/*.H FILES");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oRcIds) { //For all RC IDs...
+    if (!(sKey in oCppIds)) { //If RC ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  for (var sKey in oRc2Ids) { //For all RC2 IDs...
+    if (!(sKey in oCppIds)) { //If RC2 ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  
+  oTxtFile.Close();
+  
+  var EndTime = new Date().getTime();
+  var Seconds = (EndTime - StartTime) / 1000.0;
+  
+  InfoBox("File \"UnusedResources.txt\" created, after " + Seconds + " second(s).", 10);
+}
 
-''
-' ...
-Function GetIdsFromHeaderFile(ByVal sHPath)
-  Dim oIds, oTextFile, sLine
-  Dim reDefineId, oMatch, sId, sResource
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reDefineId = New RegExp
-  reDefineId.Pattern = "^#define (ID\w+)\s+(\d+)$"
-  reDefineId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sHPath) = True) Then 'If the Header file exists...
-    Set oTextFile = oFSO.OpenTextFile(sHPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      
-      sId = ""
-      sResource = ""
-      If reDefineId.Test(sLine) Then 'If ID...
-        Set oMatch = reDefineId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        sResource = oMatch.SubMatches(1)
-        
-        oIds.Add sId, sResource
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromHeaderFile = oIds
-End Function
+////
+// ...
+function GetIdsFromHeaderFile(sHPath) {
+  var oIds = {};
+  var reDefineId = /^#define (ID\w+)\s+(\d+)$/;
+  if (oFSO.FileExists(sHPath)) { //If the Header file exists...
+    var oTextFile = oFSO.OpenTextFile(sHPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var oMatch = reDefineId.exec(sLine); //If ID...
+      if (oMatch) {
+        var sId = oMatch[1];
+        var sResource = oMatch[2];
+        oIds[sId] = sResource;
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
 
-''
-' ...
-Function GetIdsFromResourceFile(ByVal sRcPath)
-  Dim oIds, oTextFile, sLine, iLine, iBlockType
-  Dim reId, oMatch, sId
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reId = New RegExp
-  reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
-  reId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
-    iLine = 0
-    iBlockType = NO_BLOCK
-    Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      iLine = iLine + 1
-      
-      If (InStr(sLine, " MENU") > 0) Then 'MENU...
-        iBlockType = MENU_BLOCK
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        'If (iBlockType = MENU_BLOCK) Or (iBlockType = DIALOGEX_BLOCK) Then
-        '  sLine = ""
-        'End If
-      End If
+////
+// ...
+function GetIdsFromResourceFile(sRcPath) {
+  var reId = /(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)/g;
+  var oIds = {};
+  if (oFSO.FileExists(sRcPath)) { //If the RC file exists...
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var oTextFile = oFSO.OpenTextFile(sRcPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
+      if (sLine.indexOf(" MENU") >= 0) { //MENU...
+        iBlockType = MENU_BLOCK;
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK;
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK;
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK;
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK;
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        //if (iBlockType === MENU_BLOCK || iBlockType === DIALOGEX_BLOCK) {
+        //  sLine = "";
+        //}
+      }
       
-      sId = ""
-      
-      If reId.Test(sLine) Then 'If ID...
-        Set oMatch = reId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        
-        If (oIds.Exists(sId) = True) Then 'If the key is already used...
-          oIds(sId) = oIds(sId) & vbTab & iLine
-        Else 'If the key is NOT already used...
-          oIds.Add sId, iLine
-        End If
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromResourceFile = oIds
-End Function
+      var oMatch;
+      while (oMatch = reId.exec(sLine)) { //If ID...
+        var sId = oMatch[1];
+        if (sId in oIds) { //If the key is already used...
+          oIds[sId] = oIds[sId] + "\t" + iLine;
+        } else { //If the key is NOT already used...
+          oIds[sId] = iLine;
+        }
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
 
-''
-' ...
-Function GetIdsFromCppFiles(ByVal sFolderPath, ByRef oIds)
-  Dim oFolder, oFile, oSubFolder, sExtension
-  Dim oTextFile, sLine, iLine
-  Dim reId, oMatches, oMatch, sId
-  
-  Set reId = New RegExp
-  reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
-  reId.IgnoreCase = False
-  reId.Global = True
-  
-  If (oFSO.FolderExists(sFolderPath) = True) Then 'If the folder exists...
-    Set oFolder = oFSO.GetFolder(sFolderPath)
+////
+// ...
+function GetIdsFromCppFiles(sFolderPath, oIds) {
+  var reId = /(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)/g;
+  if (oFSO.FolderExists(sFolderPath)) { //If the folder exists...
+    var oFolder = oFSO.GetFolder(sFolderPath);
+    for (var it = new Enumerator(oFolder.Files); !it.atEnd(); it.moveNext()) { //For all files...
+      var oFile = it.item();
+      var sExtension = oFSO.GetExtensionName(oFile.Name).toLowerCase();
+      if (sExtension === "cpp" || (sExtension == "h" && oFile.Name !== "resource.h")) { //If a CPP/H file...
+        var iLine = 0;
+        var oTextFile = oFSO.OpenTextFile(oFile.Path, ForReading);
+        while (!oTextFile.AtEndOfStream) { //For all lines...
+          var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+          iLine++;
+          var oMatch;
+          while (oMatch = reId.exec(sLine)) { //For all results...
+            var sId = oMatch[1];
+            if (sId in oIds) { //If the key is already used...
+              oIds[sId] = oIds[sId] + "\t" + oFile.Name + ":" + iLine;
+            } else { //If the key is NOT already used...
+              oIds[sId] = oFile.Name + ":" + iLine;
+            }
+          }
+        }
+        oTextFile.Close();
+      }
+    }
     
-    For Each oFile In oFolder.Files 'For all files...
-      sExtension = LCase(oFSO.GetExtensionName(oFile.Name))
-      If (sExtension = "cpp") Or (sExtension = "h") And (oFile.Name <> "resource.h") Then 'If a CPP/H file...
-        iLine = 0
-        Set oTextFile = oFSO.OpenTextFile(oFile.Path, ForReading)
-        Do Until oTextFile.AtEndOfStream = True 'For all lines...
-          sLine = Trim(oTextFile.ReadLine)
-          iLine = iLine + 1
-          
-          sId = ""
-          If reId.Test(sLine) Then 'If ID...
-            Set oMatches = reId.Execute(sLine)
-            For Each oMatch In oMatches 'For all results...
-              sId = oMatch.SubMatches(0)
-              
-              If (oIds.Exists(sId) = True) Then 'If the key is already used...
-                oIds(sId) = oIds(sId) & vbTab & oFile.Name & ":" & iLine
-              Else 'If the key is NOT already used...
-                oIds.Add sId, oFile.Name & ":" & iLine
-              End If
-            Next
-          End If
-        Loop
-        oTextFile.Close
-      End If
-    Next
-    
-    For Each oSubFolder In oFolder.SubFolders 'For all folders...
-      If (oSubFolder.Name <> ".svn") And (oSubFolder.Name <> ".hg") And (oSubFolder.Name <> ".git") Then 'If NOT a SVN folder...
-        GetIdsFromCppFiles oSubFolder.Path, oIds
-      End If
-    Next
-  End If
-End Function
+    for (var it = new Enumerator(oFolder.SubFolders); !it.atEnd(); it.moveNext()) { //For all folders...
+      var oSubFolder = it.item();
+      if (oSubFolder.Name !== ".svn" && oSubFolder.Name !== ".hg" && oSubFolder.Name !== ".git") { //If NOT a SVN folder...
+        oIds = GetIdsFromCppFiles(oSubFolder.Path, oIds);
+      }
+    }
+  }
+  return oIds;
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
 
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
diff --git a/Translations/ShellExtension/CreateMasterPotFile.js b/Translations/ShellExtension/CreateMasterPotFile.js
index dd72012a097..0d0af357101 100644
--- a/Translations/ShellExtension/CreateMasterPotFile.js
+++ b/Translations/ShellExtension/CreateMasterPotFile.js
@@ -2,7 +2,7 @@
 // This script creates the master POT file (English.pot) for the shell extension.
 //
 // Copyright (C) 2007-2009 by Tim Gerundt
-// Released under the "GNU General Public License
+// Released under the "GNU General Public License"
 
 var ForReading = 1;
 
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
index 002768c3163..8614b36b85d 100644
--- a/Translations/WinMerge/CreateMasterPotFile.js
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -2,7 +2,7 @@
 // This script creates the master POT file (English.pot).
 //
 // Copyright (C) 2007-2009 by Tim Gerundt
-// Released under the "GNU General Public License
+// Released under the "GNU General Public License"
 
 var ForReading = 1;
 

From d0a13fd24d11aaffdc0fe897d4c5538b4dde633b Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 13 Feb 2024 08:39:36 +0900
Subject: [PATCH 42/58] WIP

---
 Translations/ShellExtension/CreateMasterPotFile.js |  2 --
 Translations/WinMerge/CreateMasterPotFile.js       | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Translations/ShellExtension/CreateMasterPotFile.js b/Translations/ShellExtension/CreateMasterPotFile.js
index 0d0af357101..1b85dd71f9d 100644
--- a/Translations/ShellExtension/CreateMasterPotFile.js
+++ b/Translations/ShellExtension/CreateMasterPotFile.js
@@ -12,8 +12,6 @@ var STRINGTABLE_BLOCK = 1;
 var PATH_ENGLISH_POT = "English.pot";
 var PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc";
 
-var bRunFromCmd;
-
 var oFSO = new ActiveXObject("Scripting.FileSystemObject");
 
 var bRunFromCmd = false;
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
index 8614b36b85d..5783d3e4cea 100644
--- a/Translations/WinMerge/CreateMasterPotFile.js
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -105,15 +105,15 @@ function GetStringsFromRcFile(sRcFilePath) {
       if (fContinuation) {
         // Nothing to do
       } else if (sLine.indexOf(" MENU") >= 0 && sLine.indexOf("IDR_") >= 0) { //MENU...
-        iBlockType = MENU_BLOCK
+        iBlockType = MENU_BLOCK;
       } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
+        iBlockType = DIALOGEX_BLOCK;
       } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
+        iBlockType = STRINGTABLE_BLOCK;
       } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
+        iBlockType = VERSIONINFO_BLOCK;
       } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
+        iBlockType = ACCELERATORS_BLOCK;
       } else if (sLine === "BEGIN") { //BEGIN...
         //IGNORE FOR SPEEDUP!
       } else if (sLine === "END") { //END...
@@ -257,7 +257,7 @@ function CreateMasterPotFile(sPotPath, oStrings) {
   oPotFile.Write("\"X-Poedit-Language: English\\n\"\n");
   oPotFile.Write("\"X-Poedit-SourceCharset: UTF-8\\n\"\n");
   oPotFile.Write("\"X-Poedit-Basepath: ../../Src/\\n\"\n");
-  //oPotFile.Write("\"X-Generator: CreateMasterPotFile.js\\n""\n"
+  //oPotFile.Write("\"X-Generator: CreateMasterPotFile.js\\n\"\n");
   oPotFile.Write("\n");
   for (var sKey in oStrings) { //For all strings...
     var oString = oStrings[sKey];

From 630708d2d2832541a58d72dc6da2addfc7a3d96f Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 14 Feb 2024 07:45:13 +0900
Subject: [PATCH 43/58] WIP

---
 BuildArc.cmd                         |  2 +-
 Plugins/Plugins.xml                  | 16 ++++++++--------
 ShellExtension/Register.bat          |  6 +++---
 Src/MergeLang.vcxproj.filters        |  4 ++--
 Tools/Scripts/README.md              |  4 ++--
 Tools/Scripts/UpdateTranslations.bat |  2 +-
 Translations/WinMerge/English.pot    |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/BuildArc.cmd b/BuildArc.cmd
index 684ca9c53a7..8f53ed741f2 100644
--- a/BuildArc.cmd
+++ b/BuildArc.cmd
@@ -25,7 +25,7 @@ if "%1" == "" (
 
 del "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" 2> NUL
 
-7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.asm -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb  -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!WinWebDiff.dll -xr!WinWebDiff.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h Version.in *.cmd *.bat *.inf *.sln *.vbs
+7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.asm -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb  -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!WinWebDiff.dll -xr!WinWebDiff.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h Version.in *.cmd *.bat *.inf *.sln *.js
 
 (
 echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-Setup.exe"
diff --git a/Plugins/Plugins.xml b/Plugins/Plugins.xml
index 8e822245735..9b893d55622 100644
--- a/Plugins/Plugins.xml
+++ b/Plugins/Plugins.xml
@@ -216,24 +216,24 @@
     </unpack-file>
   </plugin>
   <!--
-  <plugin name="VBScript-test">
+  <plugin name="JScript-test">
     <event value="FILE_PACK_UNPACK" />
-    <description value="VBScript test" />
+    <description value="JScript test" />
     <file-filters value="\.nomatch$" />
     <is-automatic value="false" />
     <unpacked-file-extension value=".txt" />
     <unpack-file>
       <command>cmd /c cscript //nologo "${SCRIPT_FILE}" "${SRC_FILE}" > "${DST_FILE}"</command>
-      <script fileExtension=".vbs">
-WScript.StdOut.WriteLine "Hello World!"
-WScript.StdOut.WriteLine WScript.Arguments(0)
+      <script fileExtension=".js">
+WScript.StdOut.WriteLine("Hello World!");
+WScript.StdOut.WriteLine(WScript.Arguments.Item(0));
       </script>
     </unpack-file>
     <pack-file>
       <command>cmd /c cscript //nologo "${SCRIPT_FILE}" "${SRC_FILE}" > "${DST_FILE}"</command>
-      <script fileExtension=".vbs">
-WScript.StdOut.WriteLine "!dlroW olleH"
-WScript.StdOut.WriteLine WScript.Arguments(0)
+      <script fileExtension=".js">
+WScript.StdOut.WriteLine("!dlroW olleH");
+WScript.StdOut.WriteLine(WScript.Arguments.Item(0));
       </script>
     </pack-file>
   </plugin>
diff --git a/ShellExtension/Register.bat b/ShellExtension/Register.bat
index 6984a08d390..b52ca7bd6ee 100644
--- a/ShellExtension/Register.bat
+++ b/ShellExtension/Register.bat
@@ -50,9 +50,9 @@ IF NOT ERRORLEVEL 1 (
   %1 %2 %3 %4
 ) Else (
   rem Windows Vista, Server 200x, Server 201x, Windows 8, Windows 10
-  Echo args="": For Each a in WScript.Arguments: If InStr^(a, " "^) ^> 0 Then args = args ^& """" ^& a ^& """ " Else args = args ^& a ^& " " End If: Next: CreateObject^("Shell.Application"^).ShellExecute "%~1", args, "", "runas" > "%TEMP%\Elevated.vbs"
-  Wscript //nologo "%TEMP%\Elevated.vbs" %2 %3 %4
-  Del "%TEMP%\Elevated.vbs" 2> NUL
+  Echo var args=""; for ^(var i = 1; i ^< WScript.Arguments.Count^(^); i++^) { var a = WScript.Arguments.Item^(i^); if ^(a.indexOf^(" "^) ^>= 0^) { args += "\"" + a + "\" " } else { args += a + " "; } } ^(new ActiveXObject^("Shell.Application"^)^).ShellExecute^(WScript.Arguments.Item^(0^), args, "", "runas"^) > "%TEMP%\Elevated.js"
+  Wscript //nologo "%TEMP%\Elevated.js" %1 %2 %3 %4
+  Del "%TEMP%\Elevated.js" 2> NUL
 )
 Goto :EOF
 
diff --git a/Src/MergeLang.vcxproj.filters b/Src/MergeLang.vcxproj.filters
index da7c80790ea..95278e865bd 100644
--- a/Src/MergeLang.vcxproj.filters
+++ b/Src/MergeLang.vcxproj.filters
@@ -115,13 +115,13 @@
     <None Include="..\Translations\WinMerge\UpdatePoFilesFromPotFile.ps1">
       <Filter>Scripts\WinMerge</Filter>
     </None>
-    <None Include="..\Translations\WinMerge\CreateMasterPotFile.vbs">
+    <None Include="..\Translations\WinMerge\CreateMasterPotFile.js">
       <Filter>Scripts\WinMerge</Filter>
     </None>
     <None Include="..\Translations\ShellExtension\UpdatePoFilesFromPotFile.ps1">
       <Filter>Scripts\ShellExtension</Filter>
     </None>
-    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.vbs">
+    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.js">
       <Filter>Scripts\ShellExtension</Filter>
     </None>
     <None Include="..\Translations\ShellExtension\Arabic.po">
diff --git a/Tools/Scripts/README.md b/Tools/Scripts/README.md
index 15524916b5e..7cd5519bead 100644
--- a/Tools/Scripts/README.md
+++ b/Tools/Scripts/README.md
@@ -1,12 +1,12 @@
 Some useful scripts:
 
 
-CheckMenuResources.vbs
+CheckMenuResources.js
 ----------------------
 Script that checking the menu resources for missing mnemonic chars and description texts.
 
 
-CheckUnusedResources.vbs
+CheckUnusedResources.js
 ------------------------
 Script for creating a list of (hopefully) unused resource IDs.
 
diff --git a/Tools/Scripts/UpdateTranslations.bat b/Tools/Scripts/UpdateTranslations.bat
index c993706cca1..47cf9c725d8 100644
--- a/Tools/Scripts/UpdateTranslations.bat
+++ b/Tools/Scripts/UpdateTranslations.bat
@@ -2,7 +2,7 @@
 rem This batch file calls the script to creates the master POT file.
 
 pushd "../../Translations/WinMerge/"
-cscript //nologo CreateMasterPotFile.vbs
+cscript //nologo CreateMasterPotFile.js
 echo.
 powershell -executionpolicy remotesigned -file UpdatePoFilesFromPotFile.ps1
 popd
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index cd8111133bc..cc539b13fd9 100644
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2024-02-12 10:05+0000\n"
+"POT-Creation-Date: 2024-02-14 07:37+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"

From 4df625645ef62640164d67e42d7694045d07ee2b Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 14 Feb 2024 08:32:19 +0900
Subject: [PATCH 44/58] WIP

---
 Testing/SingleInstanceTest.cmd | 12 --------
 crowdin.yml                    | 54 ----------------------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 Testing/SingleInstanceTest.cmd
 delete mode 100644 crowdin.yml

diff --git a/Testing/SingleInstanceTest.cmd b/Testing/SingleInstanceTest.cmd
deleted file mode 100644
index af5e812778a..00000000000
--- a/Testing/SingleInstanceTest.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-setlocal enabledelayedexpansion
-if not defined exepath (
-  set exepath=%~dp0\..\Build\x64\Release\WinMergeU.exe
-)
-for /L %%i in (0,1,5) do ( 
-  set cnt=%%i
-  set /a lrev=cnt
-  set /a rrev=cnt+1
-  echo %exepath% -s:2 -u %%1 %%2> %~dp0\tmp.cmd
-  git difftool --extcmd %~dp0\tmp.cmd HEAD~!lrev!..HEAD~!rrev! ../Src/MainFrm.cpp
-)
-rem del %~dp0\tmp.cmd
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index 0452199c1fb..00000000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-project_id : 544816
-base_path : .
-base_url : https://api.crowdin.com
-preserve_hierarchy: true
-files:
-  - source: /Docs/Users/ReadMe.txt
-    translation: /Translations/Docs/Readme/ReadMe-%language%.txt
-    languages_mapping: &anchor
-      language:
-        ar: Arabic
-        eu: Basque
-        pt-BR: Brazilian
-        bg: Bulgarian
-        ca: Catalan
-        zh-CN: ChineseSimplified
-        zh-TW: ChineseTraditional
-        co: Corsican
-        hr: Croatian
-        cs: Czech
-        da: Danish
-        nl: Dutch
-        fi: Finnish
-        fr: French
-        gl: Galician
-        de: German
-        el: Greek
-        hu: Hungarian
-        it: Italian
-        ja: Japanese
-        ko: Korean
-        it: Lithuanian
-        nb: Norwegian
-        fa: Persian
-        pl: Polish
-        pt: Portuguese
-        ro: Romanian
-        ru: Russian
-        sr: Serbian
-        si: Sinhala
-        sk: Slovak
-        sl: Slovenian
-        es: Spanish
-        sv: Swedish
-        tr: Turkish
-        uk: Ukrainian
-  - source: /Translations/WinMerge/English.pot
-    translation: /Translations/WinMerge/%language%.po
-    languages_mapping: *anchor
-  - source: /Translations/InnoSetup/English.isl
-    translation: /Translations/InnoSetup/%language%.isl
-    languages_mapping: *anchor
-  - source: /Translations/ShellExtension/English.pot
-    translation: /Translations/ShellExtension/%language%.po
-    languages_mapping: *anchor

From 0e8deb1b48b2e75b2c35bc31a8ebd6a613e5abe6 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 14 Feb 2024 08:35:50 +0900
Subject: [PATCH 45/58] WIP

---
 Testing/Data/Office/~$word.doc | Bin 162 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Testing/Data/Office/~$word.doc

diff --git a/Testing/Data/Office/~$word.doc b/Testing/Data/Office/~$word.doc
deleted file mode 100644
index 58d84eee0a34ba3295ea44b87f126a16ad8653d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmd<+b({6@LD-}=22ubELu~Z>h$Z>Dehdu%>lqk6$W55Sz{J2H(0i357HE(Z)Uc+9
j&U--eFaT7-08+;w026`GS3`oh6E`EoVEXU*d+Y%KiZd3n


From d53e77c69c1f39c9b9ce5aa9d6f9a4dcd8549c16 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 14 Feb 2024 08:38:54 +0900
Subject: [PATCH 46/58] WIP

---
 Src/7zcommon.patch | 102 ---------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 Src/7zcommon.patch

diff --git a/Src/7zcommon.patch b/Src/7zcommon.patch
deleted file mode 100644
index c05f96ec724..00000000000
--- a/Src/7zcommon.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- c:/dev/winmerge/src/7zCommon.cpp	Mon Mar  6 00:06:40 2023
-+++ d:/dev/winmerge/src/7zCommon.cpp	Tue Feb 14 23:00:32 2023
-@@ -151,17 +151,17 @@
- 		return nullptr;
- 	String path2(path);
- 	// Map extensions through ExternalArchiveFormat.ini
--	static tchar_t null[] = _T("");
--	static const tchar_t section[] = _T("extensions");
-+	static TCHAR null[] = _T("");
-+	static const TCHAR section[] = _T("extensions");
- 	String entry = paths::FindExtension(path);
--	tchar_t value[20];
--	static const tchar_t* filename = nullptr;
-+	TCHAR value[20];
-+	static LPCTSTR filename = nullptr;
- 	if (filename == nullptr)
- 	{
--		tchar_t cPath[INTERNET_MAX_PATH_LENGTH];
-+		TCHAR cPath[INTERNET_MAX_PATH_LENGTH];
- 		DWORD cchPath = SearchPath(nullptr, _T("ExternalArchiveFormat.ini"), nullptr,
- 			INTERNET_MAX_PATH_LENGTH, cPath, nullptr);
--		filename = cchPath && cchPath < INTERNET_MAX_PATH_LENGTH ? tc::tcsdup(cPath) : null;
-+		filename = cchPath && cchPath < INTERNET_MAX_PATH_LENGTH ? _tcsdup(cPath) : null;
- 	}
- 	if (*filename &&
- 		GetPrivateProfileString(section, entry.c_str(), null, value, 20, filename) &&
-@@ -169,7 +169,7 @@
- 	{
- 		// Remove end-of-line comments (in string returned from GetPrivateProfileString)
- 		// that is, remove semicolon & whatever follows it
--		if (tchar_t* p = StrChr(value, ';'))
-+		if (LPTSTR p = StrChr(value, ';'))
- 		{
- 			*p = '\0';
- 			StrTrim(value, _T(" \t"));
-@@ -318,7 +318,7 @@
- /**
-  * @brief SingleFileEnumerator constructor.
-  */
--SingleItemEnumerator::SingleItemEnumerator(const tchar_t* path, const tchar_t* FullPath, const tchar_t* Name)
-+SingleItemEnumerator::SingleItemEnumerator(LPCTSTR path, LPCTSTR FullPath, LPCTSTR Name)
- : FullPath(FullPath)
- , Name(Name)
- {
-@@ -408,20 +408,9 @@
- 	while ((m_nIndex = pView(m_pView)->GetNextItem(m_nIndex, m_nFlags & nMask)) == -1)
- 	{
- 		m_strFolderPrefix = *m_curFolderPrefix++;
--		m_index++;
-+		m_index = 1;
- 	}
--	const auto& di = m_pView->GetDiffItem(m_nIndex);
--	// If the current item is a folder, ignore the current item if the next selected item is a child element of that folder.
--	if (m_index > (((di.diffcode.diffcode & DIFFCODE::THREEWAY) == 0) ? 1 : 2) || !di.diffcode.isDirectory())
--		return di;
--	const int nextIndex = pView(m_pView)->GetNextItem(m_nIndex, m_nFlags & nMask);
--	if (nextIndex == -1)
--		return di;
--	const auto& diNext = m_pView->GetDiffItem(nextIndex);
--	const String curRelPath = strutils::makelower(di.diffFileInfo[m_index].GetFile());
--	if (strutils::makelower(diNext.diffFileInfo[m_index].GetFile()).find(curRelPath) != 0)
--		return di;
--	return *DIFFITEM::GetEmptyItem();
-+	return m_pView->GetDiffItem(m_nIndex);
- }
- 
- /**
-@@ -443,7 +432,7 @@
- 	const CDiffContext& ctxt = m_pView->GetDiffContext();
- 	const DIFFITEM &di = Next();
- 
--	if (di.isEmpty() || ((m_nFlags & DiffsOnly) && !IsItemNavigableDiff(ctxt, di)))
-+	if ((m_nFlags & DiffsOnly) && !IsItemNavigableDiff(ctxt, di))
- 	{
- 		return 0;
- 	}
-@@ -505,7 +494,7 @@
- /**
-  * @brief Apply appropriate handlers from left to right.
-  */
--bool DirItemEnumerator::MultiStepCompressArchive(const tchar_t* path)
-+bool DirItemEnumerator::MultiStepCompressArchive(LPCTSTR path)
- {
- 	DeleteFile(path);
- 	Merge7z::Format *piHandler = ArchiveGuessFormat(path);
-@@ -536,14 +525,14 @@
- /**
-  * @brief Generate archive from DirView items.
-  */
--void DirItemEnumerator::CompressArchive(const tchar_t* path)
-+void DirItemEnumerator::CompressArchive(LPCTSTR path)
- {
- 	String strPath;
- 	if (path == nullptr)
- 	{
- 		// 7z311 can only write 7z, zip, and tar(.gz|.bz2) archives, so don't
- 		// offer other formats here!
--		static const tchar_t _T_Filter[]
-+		static const TCHAR _T_Filter[]
- 		(
- 			_T("7z|*.7z|")
- 			//_T("z|*.z|")

From d4be8434d81d3a0b472b705dca2e4f8f0f5f1cd2 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 14 Feb 2024 08:56:49 +0900
Subject: [PATCH 47/58] WIP

---
 Externals/winimerge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals/winimerge b/Externals/winimerge
index f7fc9d5ddf0..21f69f358cc 160000
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit f7fc9d5ddf05785eb7046008fde657cfcea6ef2e
+Subproject commit 21f69f358cc71e5881b7d77304961a1b76cad0b9

From 9ae386deac60836e5488143d1b8d22468d26a924 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 15 Feb 2024 07:40:56 +0900
Subject: [PATCH 48/58] WIP

---
 Plugins/dlls/CompareMSVisioFiles.sct | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index bc22a375cb7..e29f8adfedc 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -79,6 +79,7 @@ function writeObjectProperties(fo, items) {
       try {
         var o = it.item();
         fo.WriteLine(o.Name + ": " + o.Value);
+        o = null;
       } catch (e) {}
     }
   } catch (e) {}
@@ -93,6 +94,7 @@ function ungroupShapes(pge) {
         try {
           var shp = it.item();
           shp.Ungroup();
+          shp = null;
         } catch (e) {}
       }
     } while (cnt !== pge.Shapes.Count);
@@ -105,6 +107,7 @@ function writeTextsInShapes(fo, pge) {
       try {
         var shp = it.item();
         fo.WriteLine(shp.Name + ": " + shp.Text);
+        shp = null;
       } catch (e) {}
     }
   } catch (e) {}
@@ -173,6 +176,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
       writeTextsInShapes(fo, pge);
       fo.WriteLine("");
     }
+    pge = null;
   }
 
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
@@ -186,13 +190,13 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
           fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
         }
         fo.WriteLine("");
+        cmp = null;
       }
     }
   }
 
+  doc.Close();
   doc = null;
-  pge.Close();
-  pge = null;
   vs.Quit();
   vs = null;
   fo.Close();
@@ -246,6 +250,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     if (regRead(REGKEY_PATH + "ComparePageAsImage", true)) {
       saveSlideAsImage(pge, fso.BuildPath(folderDst, pge.Name + ".png"));
     }
+    pge = null;
   }
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(doc)) {
@@ -256,11 +261,11 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
         var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = nul;
       }
     }
   }
 
-  pge = null;
   doc.Close();
   doc = null;
   vs.Quit();

From 10c97518a8956273a5d5b24e98fb5a5c44babbac Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 15 Feb 2024 07:57:41 +0900
Subject: [PATCH 49/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      | 10 ++++++++--
 Plugins/dlls/CompareMSPowerPointFiles.sct |  5 ++++-
 Plugins/dlls/CompareMSVisioFiles.sct      |  3 ++-
 Plugins/dlls/CompareMSWordFiles.sct       |  7 ++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index a51c95d886a..76e154edf3a 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -544,12 +544,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
     writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
     fo.Close();
+    fo = null;
   }
  
   if (regRead(REGKEY_PATH + "CompareNames", true)) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
     writeObjectProperties(fo, wbk.Names);
     fo.Close();
+    fo = null;
   }
  
   var No = 1;
@@ -561,12 +563,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
       writeCellValues(fo, sht);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
       writeFormulas(fo, sht);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
@@ -574,12 +578,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       ungroupShapes(sht);
       writeTextsInShapes(fo, sht);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
       writeHeadersAndFooters(fo, sht);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
@@ -590,12 +596,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       saveSheetAsHTML(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html"));
     }
     No = parseInt(No) + 1;
+    sht = null;
   }
   if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
     if (!isAccessibleVBAProject(wbk)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
+      fo = null;
     } else {
       for (var it = new Enumerator(wbk.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
         var cmp = it.item();
@@ -603,14 +611,12 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       }
     }
   }
-  sht = null;
 
   wbk.Close();
   wbk = null;
   xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking;
   xl.Quit();
   xl = null;
-  fo = null;
 
   pbChanged = true;
   pSubcode = 0;
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index b1d4f72f410..cc030bccfa6 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -259,6 +259,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
     writeObjectProperties(fo, prs.BuiltinDocumentProperties);
     fo.Close();
+    fo = null;
   }
  
   for (var it = new Enumerator(prs.Slides); !it.atEnd(); it.moveNext()) {
@@ -267,12 +268,14 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + ".txt"), true, true);
       writeTextsInShapes(fo, sld);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + "_NotesPage.txt"), true, true);
       writeTextsInShapes(fo, sld.NotesPage);
       fo.Close();
+      fo = null;
     }
  
     if (regRead(REGKEY_PATH + "CompareSlideAsImage", true)) {
@@ -285,6 +288,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
+      fo = null;
     } else {
       for (var it = new Enumerator(prs.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
         var cmp = it.item();
@@ -298,7 +302,6 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   prs = null;
   pp.Quit();
   pp = null;
-  fo = null;
 
   pbChanged = true;
   pSubcode = 0;
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index e29f8adfedc..2355d25028a 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -245,6 +245,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       ungroupShapes(pge);
       writeTextsInShapes(fo, pge);
       fo.Close();
+      fo = null;
     }
 
     if (regRead(REGKEY_PATH + "ComparePageAsImage", true)) {
@@ -257,6 +258,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
+      fo = null;
     } else {
       for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
         var cmp = it.item();
@@ -270,7 +272,6 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   doc = null;
   vs.Quit();
   vs = null;
-  fo = null;
 
   pbChanged = true;
   pSubcode = 0;
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index b2af4147d0a..43b0bed6980 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -260,18 +260,21 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
     writeObjectProperties(fo, doc.BuiltinDocumentProperties);
     fo.Close();
+    fo = null;
   }
 
   if (regRead(REGKEY_PATH + "CompareBookmarks", true)) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)Bookmarks.txt"), true, true);
     writeBookmarks(fo, doc.Bookmarks);
     fo.Close();
+    fo = null;
   }
 
   if (regRead(REGKEY_PATH + "CompareTextContents", true)) {
     var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Document.txt"), true, true);
     fo.Write(doc.Content.Text);
     fo.Close();
+    fo = null;
   }
 
   if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
@@ -279,6 +282,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     ungroupShapes(doc);
     writeTextsInShapes(fo, doc);
     fo.Close();
+    fo = null;
   }
 
   if (regRead(REGKEY_PATH + "CompareDocumentsAsHTML", true)) {
@@ -289,10 +293,12 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
       var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
       fo.WriteLine(translate(MsgCannotGetMacros));
       fo.Close();
+      fo = null;
     } else {
       for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
         var cmp = it.item();
         cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = null;
       }
     }
   }
@@ -301,7 +307,6 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   doc = null;
   wd.Quit();
   wd = null;
-  fo = null;
 
   pbChanged = true;
   pSubcode = 0;

From 28467b2552760f2d562ceb729264aace939e6150 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 15 Feb 2024 08:26:39 +0900
Subject: [PATCH 50/58] WIP

---
 Externals/frhed                              | 2 +-
 Translations/WinMerge/CreateMasterPotFile.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Externals/frhed b/Externals/frhed
index cdc0455feb4..b846962f49d 160000
--- a/Externals/frhed
+++ b/Externals/frhed
@@ -1 +1 @@
-Subproject commit cdc0455feb492bc826931bc70480f8b50ca05abb
+Subproject commit b846962f49ddd1d793d3de58acead9b01fcac27e
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
index 5783d3e4cea..60841767fcf 100644
--- a/Translations/WinMerge/CreateMasterPotFile.js
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -38,7 +38,7 @@ function Main() {
   InfoBox("Creating POT file from Merge.rc...", 3);
   
   var bNecessary = true;
-  if (oFSO.FileExists(PATH_ENGLISH_POT)) { //if the POT file exists...
+  if (oFSO.FileExists(PATH_ENGLISH_POT)) { //If the POT file exists...
     bNecessary = GetArchiveBit(PATH_MERGE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
   }
   

From c2b9c6090f7d978e68384eb9a6ec8d776d1ac1a5 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 15 Feb 2024 21:40:54 +0900
Subject: [PATCH 51/58] WIP

---
 Plugins/README.md                  | 63 ++++++++++++++++++------------
 Plugins/dlls/editor addin.sct      |  2 +-
 Testing/PluginTests/PluginTests.js |  4 +-
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/Plugins/README.md b/Plugins/README.md
index 67b3e4f762c..79a33d4c217 100644
--- a/Plugins/README.md
+++ b/Plugins/README.md
@@ -12,7 +12,7 @@ Examples are available in :
 
  * C++ COM component
  * VB ActiveX dll
- * Scriptlets (VBS, JS)
+ * Scriptlets (VBScript, JScript)
  * Delphi
 
 Limitation : Scriptlets only work for `EDITOR_SCRIPT` plugins.
@@ -94,45 +94,52 @@ This parameter is mandatory for the function's syntax. But you don't have to set
 
 #### `PluginEvent`
 
-| Language | Syntax                                                       |
-|:--------:|:-------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginEvent(BSTR * pVal)` |
-| VB       | `Public Property Get PluginEvent() As String`                |
-| VBS      | `Function get_PluginEvent()`                                 |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginEvent(BSTR * pVal)`        |
+| VB       | `Public Property Get PluginEvent() As String`                       |
+| VBScript | `Function get_PluginEvent()`                                        |
+| JScript  | `function get_PluginEvent()`                                        |
 
 #### `PluginDescription`
 
-| Language | Syntax                                                             |
-|:--------:|:-------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginDescription(BSTR * pVal)` |
-| VB       | `Public Property Get PluginDescription() As String`                |
-| VBS      | `Function get_PluginDescription()`                                 |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginDescription(BSTR * pVal)`  |
+| VB       | `Public Property Get PluginDescription() As String`                 |
+| VBScript | `Function get_PluginDescription()                                   |
+| JScript  | `function get_PluginDescription()`                                  |
 
 #### `PluginFileFilters`
 
 String formed of fileFilters, separated with `;`
 
-| Language | Syntax                                                             |
-|:--------:|:-------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginFileFilters(BSTR * pVal)` |
-| VB       | `Public Property Get PluginFileFilters() As String`                |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginFileFilters(BSTR * pVal)`  |
+| VB       | `Public Property Get PluginFileFilters() As String`                 |
+| VBScript | `Function get_PluginFileFilters()                                   |
+| JScript  | `function get_PluginFileFilters()`                                  |
 
 #### `PluginIsAutomatic`
 
-| Language | Syntax                                                                     |
-|:--------:|:---------------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginIsAutomatic(VARIANT_BOOL * pVal)` |
-| VB       | `Public Property Get PluginIsAutomatic() As Boolean`                       |
+| Language | Syntax                                                                        |
+|:--------:|:------------------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginIsAutomatic(VARIANT_BOOL * pVal)`    |
+| VB       | `Public Property Get PluginIsAutomatic() As Boolean`                          |
+| VBScript | `Function get_PluginIsAutomatic()`                                            |
+| JScript  | `function get_PluginIsAutomatic()`                                            |
 
 ### Methods syntax
 
 #### `EDITOR_SCRIPT`
 
-| Language | Functions parameters (function names are free)                                  |
-|:--------:|:--------------------------------------------------------------------------------|
-| C++      | `STDMETHOD(MakeUpperVB)([in] BSTR inputText, [out, retval] BSTR * outputText);` |
-| VB       | `Public Function MakeUpperVB(text As String)`                                   |
-| VBS      | `Function MakeUpperVBS(Text)`                                                   |
+| Language | Functions parameters (function names are free)                                |
+|:--------:|:------------------------------------------------------------------------------|
+| C++      | `STDMETHOD(MakeUpper)([in] BSTR inputText, [out, retval] BSTR * outputText);` |
+| VB       | `Public Function MakeUpper(text As String)`                                   |
+| VBScript | `Function MakeUpper(Text)`                                                    |
+| JScript  | `function MakeUpper(Text)`                                                    |
 
 #### `FILE_PREDIFF`
 
@@ -140,6 +147,8 @@ String formed of fileFilters, separated with `;`
 |:--------:|:------------------------------|:---------------------------------------------------------------------------------------------------------------------------|
 | VC++     | `STDMETHOD(PrediffFile)`      | `([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT * pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)` |
 | VB       | `Public Function PrediffFile` | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean`                                |
+| VBScript | `Function PrediffFile`        | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| JScript  | `function PrediffFile`        | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); r.Add(2, subcode); return r.Items(); }` |
 
 #### `BUFFER_PREDIFF`
 
@@ -147,6 +156,8 @@ String formed of fileFilters, separated with `;`
 |:--------:|:---------------------------------|:----------------------------------------------------------------------------------------------------------------|
 | C++      | `STDMETHOD(PrediffBufferW)`      | `([in] BSTR * pText, [in] INT * pSize, [in] VARIANT_BOOL * pbChanged, [out, retval] VARIANT_BOOL * pbHandled);` |
 | VB       | `Public Function PrediffBufferW` | `(ByRef text As String, ByRef size As Long, ByRef bChanged As Boolean) As Boolean`                              |
+| VBScript | `Function PrediffBufferW`        | `(text, size, bChanged)`                                                                                    |
+| JScript  | `function PrediffBufferW`        | `(text, size, bChanged) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, text); r.Add(2, size); r.Add(3, bChanged); return r.Items(); }` |
 
 #### `FILE_PACK_UNPACK`
 
@@ -156,6 +167,10 @@ String formed of fileFilters, separated with `;`
 | VC++     | `STDMETHOD(PackFile)`        | `([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)`   |
 | VB       | `Public Function UnpackFile` | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean`                                |
 | VB       | `Public Function PackFile`   | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, subcode As Long) As Boolean`                                      |
+| VBScript | `Function UnpackFile`        | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| VBScript | `Function PackFile`          | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| JScript  | `function UnpackFile`        | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); r.Add(2, subcode); return r.Items(); }` |
+| JScript  | `function PackFile`          | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); return r.Items(); }` |
 
 #### `BUFFER_PACK_UNPACK`
 
diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 6b02d258e5d..db2ee9c4d17 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -401,7 +401,7 @@ function ExecFilterCommand(Text) {
   var path = wsh.ExpandEnvironmentStrings("%TEMP%\\_winmerge_addin_temp_.txt");
   var fso = new ActiveXObject("Scripting.FileSystemObject");
   try {
-    var ts = fso.CreateTextFile(path);
+    var ts = fso.CreateTextFile(path, true, true);
     ts.Write(Text);
     ts.Close();
   } catch (e) {
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
index 8e1d1474971..796aaff22e1 100644
--- a/Testing/PluginTests/PluginTests.js
+++ b/Testing/PluginTests/PluginTests.js
@@ -4,7 +4,6 @@ var g_testname;
 var FileSys = new ActiveXObject("Scripting.FileSystemObject");
 var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
 var WShell = new ActiveXObject("Wscript.Shell");
-var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
 
 try {
   FileSys.CreateFolder(ScriptFolder + "\\result");
@@ -192,6 +191,9 @@ function EditorAddinTest() {
   assertEquals("1\r\n2\r\n", p.ExecFilterCommand("2\r\n1\r\n"));
   p.PluginArguments = "echo a";
   assertEquals("a \r\n", p.ExecFilterCommand(""));
+  p.PluginVariables = ScriptFolder;
+  p.PluginArguments = "dir %1";
+  p.ExecFilterCommand("");
 
   // SelectColumns
   setTestName("SelectColumns");

From 4585c06c3aa9a1efd2f0fa9456afd8130d90ef84 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 15 Feb 2024 22:42:33 +0900
Subject: [PATCH 52/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct |  18 +++++++++++++++++-
 Testing/Data/Office/excel.xls        | Bin 49664 -> 49664 bytes
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 76e154edf3a..c7aa7b7be40 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -114,7 +114,23 @@ function writeCellValues(fo, sht) {
         for (var col = 1; col <= varCells.ubound(2); col++) {
           try {
             var val = varCells.getItem(row, col);
-            ary[col - 1] = (val !== undefined) ? quoteIfNeeded(val.toString()) : "";
+            switch (typeof val) {
+            case "undefined":
+              ary[col - 1] = "";
+              break;
+            case "string":
+              ary[col - 1] = quoteIfNeeded(val);
+              break;
+            case "number":
+              ary[col - 1] = val.toString();
+              break;
+            case "date":
+              ary[col - 1] = (new Date(val)).toLocaleString();
+              break;
+            default:
+              ary[col - 1] = quoteIfNeeded(String(val));
+              break;
+            }
           } catch (e) {
             ary[col - 1] = "Error" + e.number;
           }
diff --git a/Testing/Data/Office/excel.xls b/Testing/Data/Office/excel.xls
index 262ff98426c6d401aafb0402a7b2d30c039524c4..bbc9b17272ce224bf667464589e112e133594a1c 100644
GIT binary patch
delta 4500
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

delta 4418
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


From 440fe54d2c017df6c63cfb3be693649aed1b00cd Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 16 Feb 2024 08:15:35 +0900
Subject: [PATCH 53/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct      | 39 ++++++++++++-----------
 Plugins/dlls/CompareMSPowerPointFiles.sct | 22 +++++++++++--
 Plugins/dlls/CompareMSVisioFiles.sct      | 22 +++++++++++--
 Plugins/dlls/CompareMSWordFiles.sct       | 23 +++++++++++--
 4 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index c7aa7b7be40..dee2f337b98 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -76,12 +76,31 @@ function regWrite(Key, Value, TypeNm) {
   mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
 }
 
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
         var o = it.item();
-        fo.WriteLine(o.Name + ": " + o.Value);
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
       } catch (e) {}
     }
   } catch (e) {}
@@ -114,23 +133,7 @@ function writeCellValues(fo, sht) {
         for (var col = 1; col <= varCells.ubound(2); col++) {
           try {
             var val = varCells.getItem(row, col);
-            switch (typeof val) {
-            case "undefined":
-              ary[col - 1] = "";
-              break;
-            case "string":
-              ary[col - 1] = quoteIfNeeded(val);
-              break;
-            case "number":
-              ary[col - 1] = val.toString();
-              break;
-            case "date":
-              ary[col - 1] = (new Date(val)).toLocaleString();
-              break;
-            default:
-              ary[col - 1] = quoteIfNeeded(String(val));
-              break;
-            }
+            ary[col - 1] = quoteIfNeeded(toString(val));
           } catch (e) {
             ary[col - 1] = "Error" + e.number;
           }
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index cc030bccfa6..da80f46f479 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -72,13 +72,31 @@ function regWrite(Key, Value, TypeNm) {
   mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
 }
 
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
         var o = it.item();
-        fo.WriteLine(o.Name + ": " + o.Value);
-        o = null;
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
       } catch (e) {}
     }
   } catch (e) {}
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 2355d25028a..7f6865058cd 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -73,13 +73,31 @@ function regWrite(Key, Value, TypeNm) {
   mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
 }
 
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
       try {
         var o = it.item();
-        fo.WriteLine(o.Name + ": " + o.Value);
-        o = null;
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
       } catch (e) {}
     }
   } catch (e) {}
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index 43b0bed6980..ceaf8ef4e50 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -74,12 +74,31 @@ function regWrite(Key, Value, TypeNm) {
   mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
 }
 
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
 function writeObjectProperties(fo, items) {
   try {
     for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
-      var o = it.item();
       try {
-        fo.WriteLine(o.Name + ": " + o.Value);
+      var o = it.item();
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
       } catch (e) {}
     }
   } catch (e) {}

From d3ac2fcaa19259c773fc819db4c90d85cfbea481 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 16 Feb 2024 08:39:25 +0900
Subject: [PATCH 54/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index dee2f337b98..511b600ec80 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -128,8 +128,8 @@ function writeCellValues(fo, sht) {
     fo.WriteLine(quoteIfNeeded(String(varCells)));
   } else if (varCells !== undefined) {
     try {
-      var ary = new Array(varCells.ubound(2));
       for (var row = 1; row <= varCells.ubound(1); row++) {
+        var ary = new Array(varCells.ubound(2));
         for (var col = 1; col <= varCells.ubound(2); col++) {
           try {
             var val = varCells.getItem(row, col);
@@ -138,6 +138,14 @@ function writeCellValues(fo, sht) {
             ary[col - 1] = "Error" + e.number;
           }
         }
+        for (var i = ary.length - 1; i >= 0; i--) {
+            if (ary[i] !== "") {
+               if (i < ary.length - 1) {
+                 ary = ary.splice(0, i + 1);
+               }
+               break;
+            }
+        }
         fo.WriteLine(ary.join("\t"));
       }
     } catch (e) {

From eb170460de775386c8fff66402ca0e6e0bb0c6a8 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 16 Feb 2024 22:01:01 +0900
Subject: [PATCH 55/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct |  51 ++++++++++++++++-----------
 Testing/Data/Office/excel.xls        | Bin 49664 -> 49664 bytes
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 511b600ec80..1972ca622cd 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -165,29 +165,33 @@ function getAddr(row, col) {
 }
 
 function writeFormulas(fo, sht) {
-  var row, col, formula
+  var row, col, formula;
   var rowOffset = sht.UsedRange.Row;
   var colOffset = sht.UsedRange.Column;
-  var varCells = sht.UsedRange.Formula;
-  if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
-    fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + varCells);
-  } else {
-    try {
-      for (var row = 1; row <= varCells.ubound(1); row++) {
-        for (var col = 1; col <= varCells.ubound(2); col++) {
-          try {
-            var formula = varCells.getItem(row, col);
-            if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
-              fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
+  try {
+    var varCells = sht.UsedRange.Formula;
+    if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+      fo.WriteLine(getAddr(1 + rowOffset - 1, 1 + colOffset - 1) + ": " + varCells);
+    } else {
+      try {
+        for (var row = 1; row <= varCells.ubound(1); row++) {
+          for (var col = 1; col <= varCells.ubound(2); col++) {
+            try {
+              var formula = varCells.getItem(row, col);
+              if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
+                fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
+              }
+            } catch (e) {
+              fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + "Error" + e.number);
             }
-          } catch (e) {
-            fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + "Error" + e.number);
           }
         }
+      } catch (e) {
+        fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + "Error" + e.number);
       }
-    } catch (e) {
-      fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + "Error" + e.number);
     }
+  } catch (e) {
+    fo.WriteLine(e.message);
   }
 }
 
@@ -242,7 +246,7 @@ function writeHeadersAndFooters(fo, sht) {
     fo.WriteLine("LeftFooter: " + sht.PageSetup.LeftFooter);
     fo.WriteLine("CenterFooter: " + sht.PageSetup.CenterFooter);
     fo.WriteLine("RightFooter: " + sht.PageSetup.RightFooter);
-  } catch(e) {}
+  } catch (e) {}
 }
 
 function getModuleExtension(cmp) {
@@ -399,9 +403,16 @@ function saveSheetAsImage(sht, basefilename) {
 }
 
 function saveSheetAsHTML(sht, filename) {
-  var pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", ""); // 1 = xlSourceSheet, 0 = xlHtmlStatic
-  pobj.Publish(true);
-  pobj.AutoRepublish = false;
+  try {
+    var pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", ""); // 1 = xlSourceSheet, 0 = xlHtmlStatic
+    pobj.Publish(true);
+    pobj.AutoRepublish = false;
+  } catch (e) {
+    var fo = fso.CreateTextFile(filename, true, true);
+    fo.Write(e.message);
+    fo.Close();
+    fo = null;
+  }
 }
 
 function escape(sheetName) {
diff --git a/Testing/Data/Office/excel.xls b/Testing/Data/Office/excel.xls
index bbc9b17272ce224bf667464589e112e133594a1c..666784be6ae076b0a43219b3f666e02b14b06fee 100644
GIT binary patch
delta 4466
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

delta 4248
zcmZu#2{@Ep8$R#M*bQS%*;TS;%-AW+kVtmQl8_?1klo0hCCi(n#gb$zzcC+*k`T#~
zN*mGVQ<jv*mgOh^JF4q*egAjPb&lhHp68tRJ=eM4`#ckyfR0T-*Z5$VK&96x9~_8D
zMy<ras~9hAK+^G1K9@o0mw_n=o3+Pd6Tw$|j`GoFnG$eth9EEOFDN7w#mWz&SizQJ
z01h_!DbgAQwZ$B}4l)ePz}oZV$zbI~zy&ZtTMz;Rp@nQghz!InYzv~oKnM|A5LE^u
z10PmBE$atPZCM)yxB;LaWw-)nx(3oi{EXEBV1hrWD#2oEdXN_FxLPp>o3%CooQR>C
z#ztD;WS%tvpwtvDh_^s(0Gh3NBg7NR&b=8LjrcJkRSK4{+<9spg#;n<asyTr4nW9|
z8EkAqzcGfxKQZ*bV3>cwn0{e!g=Gpm8MJ-&&~p25P8asG(&Hup#+yPYW`IG~CBYA@
zl$4{82XF@_Kmw^6Km~jOiLBfJMfcqa01mLy84>JA(?k~I257o1tY}S!l;J?@ZJ44m
z*>YOC^#+T87~;W0M>=o}>;M9Q7kPeVxX957dJnHV%0mRW(3c21If+TmqB#&RG%^<s
zv~P)$*o*>z0Q2|>^Id1*1{nHv765K=vTr_v2Hfwy4Wp;|tPD=K-p@@yLivEyEDPdN
z(FW0!k7=Qp&I5t?%W%MPQOa|_K|FtS;UAQmwGnAOeI`{Khcde>mDt=x^xpGmsI$)}
zk0hRE^L6KUj+X^X`&P1ty;%;F?aQsyxxCzQZ{phY*fee4R`#8hkfUcV{dHhZzC}eJ
zyXxWPuW!0btov@GbI%Q!?21xU&=qf{gw{Xp(K8>H3gNVt(QeUe_2{G6#>>=BnO=0s
z4B5@!+*>F6Xmr4|q^D({w9?6e3uDgi@;fDHM9KG^^d#<RKSwIBRS92TKA-#^j=Gi!
zx|L$*t0xH)3-f2(k7n<_-<BW8YyA3Z+3Kvv`f}4ql*i(@(SvsbnGXZ{26YCb4P`Go
zM)%9}o6V-Ed@ZXN!!TF9r(Dc12|L%p%bwWoS~P!6@~G0xA5BLmLt2OKz|MOvu!%C4
z=ad>Sm&_Vx()f=Ao2{0uTbnE4igR<RGbWSq#>yra1LB(|*;?lYwJO_>v&PXJ1mB&M
z{N&C5D3a`Su<eor-`->8>tgKsCLuC{P3B<_hi2Tice4+>z8dg;e}0zo^hx=%u4OtW
zfoD17#G2}-50*;;gNG6pb1IcB@L2n<#yWoeo{X03OPwDdGn3Lv)c-1yRDH>oi^~+*
z!Imj^fp16KxN%}^!nLtm50uZMjVGm^J-7Eye~4aOt&7;VR%<b+vPd~~)rYzmAV#mZ
zV`Y|5vMB6&ZE!kn<82sM2nGG!XNf7<$x9_dE-jUoug1O6F@v@7{NW$!g7N6+;>alD
z`ihc!yvP<>ymD~5!(hq6tr@mWK2=QGuIo}E7<$t3bGW|m72~3-#^ohL%3fJBgU==c
z7EULqzd~1^_Wf^#@C6Tx^J+EnCEqFq>r^K)tIZW{)KF;k4I@v&3{GH2do<>APOq7N
z!<*xhXN9p#V{~o+TN?1w@NV(YuY>x~TN9o=u><-BbGl1G-(e+p0pb2eVbCEcy@eRR
z>7;?sNfAzWSLQ3+BuC*Ea%gUn1E=$g9K>JbVA~`I`X@O!HDi~rY?9-U-w+-*ylqmH
zbw;!+_3I$%BRHH54EuKk1_6f~KJWM|au$@jg=8X9oQo$LC!QN>k)Kvu2Me&w#tF)L
zjYPJox21I-mVJ`yZ7q}E|K0u|TVBOecFn_+>v_|5g}f*7doEk#><RA1J`ib+4x)Ai
z-<A$4a6n1kJnt%5O!THyX|S4VjqN6SRQ|;~GH#OB(`sWLZ%R|eC>i1sU6t^;;|fG#
z-&dB6B(7sV*4a6w4!bY%cB|X*pMjqJD0RxH%KrXrs_fN4Sn7~xGH;iOg#EYXSDCug
zogWrwv@1e&KMz;OtT6?hF^g|IA{6(wH?j^Iy(?C9YplQHTum5EnXa|$Dk!G9Cu06m
zunRW>x3|>|NoEa8t3<q+;%;SqZqF%aoa%n#?4B<RGRCf*;U4|s3!?kXF`;&YZ-uMP
zqz&;FB-Lv-c0RFd=x~$%L6W#;dE-enhorL<Tc7ZniD#{wRB`L-d+}n4n^|RU*&!sB
z;c|}C3i1KT+16#V5|j>Ea>@SPW0yP>#tM$BCme@=phNPCOZ2joB!$u8FN<>1huLQy
zzYo+1KO+514R=)JK2HR;qQDHFXmQ4ZYEg+d3s^|rvkOR_;Y$Ag^euMRjd>jwj|YSw
z(7@D@xli<NlHBmejq|>>k4M_>bq+Z`5(W=qqos$WO4-)PW15s#*nZkq51})~Et3^8
zawextbk~~dU*AT}Q;rdOWuMzQ$(C!?aKN%(%*z*hjfAuhG?wuOUB9iR$}Vlv1X<M`
zy<}K1&QyO|N@&E?seY!jNdK*)dLiv~C(nBu?wYc%)47k&Y7|gYjrh)#ysGs&;Yh0v
zKIXZX#`E&a%m(Y>ZS81Md{}zyv0BZk_1Q-G_Af`)*EQDA40^!J-Z+|(R}jSX^SD0r
zwuWXI^x$7+2pdwk={TgvN3enMS=iV|1k(J)3qJUk4;~`IZ+wmmSR*dK<w$x{SXcoO
zrus?3KE4D<1rZ}#Q87dW4<Q14XN&J|5mG@!ND)$lb^QX7p6W-0)R8e6mhs<<jHrI%
zcpb2c$Rviois&PW`KLswGV~bH$`cR=eHS9D6y#qFhy__Ch)mw{7lE+p2q8BRiyop`
zu|H{Pejvu+3CtBFO4&k7zG$C!7jUwkd^h!YR1Ullagnp6@}}}1d|l{6o2uUS**7Yi
z%h<j?ttjoSy~Y6N%E;JSSPa!iBcE96Elb#OJ?SFe@=2{==Jx32m}o+=fiP}&fb7u&
zM@(O)t&JtmpRBOLJvNn#!;#87pG@{#R>Pu>^-zwYS8eJ|iyCq&q4>hj$}$29xcj5}
zB1t8B4XOGS9_jh=--_?Gsd0pNX>5FyxnE&bJ6lDX)6wL<&D<2s5)kNUyYi=x%J!wb
z-hs}$w}pGucW3mjmdJ=1QFY_?hqmkcucUv`oU`N}8Tyi~u_H6*j(?^Gd*nj&_^6C&
zeX}BEKFPe{<~dSVx|Q487jy@mvBCJ1m1u3->nZ;86;dJj&l7kd>?yDH)yVZ#kM-3w
z&eQ$hYK`dK!~Wa!v}F$F<$5(Hv}(V2r>AHkcC)tf385sOt{^6T)J9&R`lAp2k?IR_
zYMvyMpHQYWdRi%fOc3HEPjKJIHBoH`qg>}GE|%@6(F`G(G5*%I1H!_oipif|=Dhh7
z(z~L3<ImODV`mJ<TZrt2j}p%NVzTNyKED{XcJX$&D&S$qxh<4)Y;tvac&eqgMXz(_
zg+F`heQ)O7^I9-&Lru<Cen?)U*DTA{&Nbn}tvh@*u7g;+fv(AA1=T7!yUQin$r~K$
z&nPy}CjIt4o_%uF;o#yW;J11;viWfK@{1Z<w@Za5@73nS{7LcIAWvfop`bKffxNVI
z!TWx)k5+!n{paxZ7+LBys_!~SmgQK}74IN_CNa6k87bc__=R_fcw?4#Hv7Im)UK6e
zQ@pt1VXZz_(ecQDjpe^1%7JqMnR$PWcSP$xGVFRI+e}fqyJt=ms^}W#q>B1DnQItG
zKb4ia8!3Dj{rQ~sjbkp_NsS`@ywgd49H@$%2+N?2v2(t?61?((B6+=cV&?`2gT(Bo
zPn{^1MUHt91nYYVP)xHN%~8s@#1DtpxO*=zOAmi)luE>9G#F&WO3vQ-()R*8bk<j1
zVPnLeHM^l8f4+C2$J1&$$M^Y4>kcST9+f0rXYcwN)hw8)&W0Di+2wv3%l@_`xodgO
zZC7&saQ=3`3D;iFlv%Q@UZMq7bE$%)7~O5>S)S)uc2Z*MHAN@rj8R)i*O2AFgo9v`
znvDJEgVtc;#w%2eRCPg*+dSQQ@Ab-70=4^_LCSPhL<Eb1i|CKueV?4+1>eQ<U0ne}
zOF3+lP<P>y{1JEJ6j}?qnEArWO2|5)@!Ay|`#1N4JXC|u?r{MMb)U{juV+t)p?Lxu
z_;}3jSXaR9HoHf$qF=HzGP$5=Pxd_???o51gP#)bihei{?@XSb&&*oZ{j$sr?+?vl
z+x!?HxBoZr{S&H8o7)KUgbAR;nP9BDBr$}Mhad$<=iU5^WE6k})FF3m2Z$X^A=vMa
z-p@;e7*K_y!s574$Y%(-_X8ACF&LOL+>?1N7yz}9U)c&wj~AnT4v&S9%mwy|Y+$Ym
z1>jTYzgdN28kobv0cZ{X+sa6I;3$e6ODNlBz5^eQ6lFlmluBl~C?vgz`rFrpW^m4C
zbDb-3KbZE%0B|0@9&gETr*CFX$V4KrbAlf16v@Rvs}sa|)|dbpIZogW@}`Wt4S=~5
zXW^EX=-MP5W()zzT4;Ldd?;Lv3;*_Wgm;FeUL)^5VqKPC3k*LTdI5*Kqc(H*4t31v
zKP<7O+p9iEz{#n5B>oBhGnzJXVF|^i2~Gi3WCc8JBzuGvBLSQMt>wxZ8Y2ZHkWoPd
zGu)Vt%XVRAf{?5R1yj?vXS-nFGo|}~g(?Ge_+F{m-xI;OThhB3siQUU1SgRi3<!W9
z;E`8T1L{aJ_H#)_oZ~IhmRWAya)zDCgR@<9V4*ViY!@8dU(O2Gr}JmKTy(PO?A-5n
zS<<-Bgj!XwHbK}x3S-Z#Ziz=ljkM}rUYq7pZH=q{jpu#@kEUaqP3!u~#<?U?`hVl{
z=(qua(CR~_E9OE*izzlj$Z@2pRJ5}~ICzD69QU<{m_97|#-QfJy~zvvNIo>rT5+cT
z-}$@-iT~SmT4%!)%0f*;MW0O2AgK^Eh=v66)+U8zH?Sb>lfsknh6FW|Awge7l|cI0
r5StNspOhv+6Hn40l8Fb128>3=mn<|wwfFC#FelZK9~K@olhOYJ{2i#X


From 94384184cfdabe5cd9c858db7a9268cfe0c204e5 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 19 Feb 2024 08:09:31 +0900
Subject: [PATCH 56/58] WIP

---
 Plugins/dlls/CompareMSExcelFiles.sct        | 34 ++++++++++++++-------
 Plugins/dlls/CompareMSPowerPointFiles.sct   | 20 +++++++++---
 Plugins/dlls/CompareMSVisioFiles.sct        | 18 ++++++++---
 Plugins/dlls/CompareMSWordFiles.sct         | 19 +++++++++---
 Src/HexMergeView.cpp                        |  2 +-
 Src/Merge.rc                                |  2 +-
 Src/PropCompareBinary.cpp                   |  2 +-
 Src/resource.h                              |  2 +-
 Translations/WinMerge/Arabic.po             |  4 +--
 Translations/WinMerge/Basque.po             |  2 +-
 Translations/WinMerge/Brazilian.po          |  4 +--
 Translations/WinMerge/Bulgarian.po          |  4 +--
 Translations/WinMerge/Catalan.po            |  4 +--
 Translations/WinMerge/ChineseSimplified.po  |  4 +--
 Translations/WinMerge/ChineseTraditional.po |  4 +--
 Translations/WinMerge/Corsican.po           |  4 +--
 Translations/WinMerge/Croatian.po           |  2 +-
 Translations/WinMerge/Czech.po              |  2 +-
 Translations/WinMerge/Danish.po             |  2 +-
 Translations/WinMerge/Dutch.po              |  4 +--
 Translations/WinMerge/English.pot           |  5 +--
 Translations/WinMerge/Finnish.po            |  4 +--
 Translations/WinMerge/French.po             |  4 +--
 Translations/WinMerge/Galician.po           |  4 +--
 Translations/WinMerge/German.po             |  4 +--
 Translations/WinMerge/Greek.po              |  2 +-
 Translations/WinMerge/Hungarian.po          |  4 +--
 Translations/WinMerge/Italian.po            |  4 +--
 Translations/WinMerge/Japanese.po           |  4 +--
 Translations/WinMerge/Korean.po             |  4 +--
 Translations/WinMerge/Lithuanian.po         |  4 +--
 Translations/WinMerge/Norwegian.po          |  2 +-
 Translations/WinMerge/Persian.po            |  2 +-
 Translations/WinMerge/Polish.po             |  4 +--
 Translations/WinMerge/Portuguese.po         |  4 +--
 Translations/WinMerge/Romanian.po           |  4 +--
 Translations/WinMerge/Russian.po            |  4 +--
 Translations/WinMerge/Serbian.po            |  2 +-
 Translations/WinMerge/Sinhala.po            |  2 +-
 Translations/WinMerge/Slovak.po             |  4 +--
 Translations/WinMerge/Slovenian.po          |  4 +--
 Translations/WinMerge/Spanish.po            |  4 +--
 Translations/WinMerge/Swedish.po            |  4 +--
 Translations/WinMerge/Tamil.po              |  4 +--
 Translations/WinMerge/Turkish.po            |  4 +--
 Translations/WinMerge/Ukrainian.po          |  2 +-
 46 files changed, 139 insertions(+), 93 deletions(-)

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 1972ca622cd..e5888023a99 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -124,10 +124,10 @@ function quoteIfNeeded(str) {
 
 function writeCellValues(fo, sht) {
   var varCells = sht.UsedRange.Value;
-  if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
-    fo.WriteLine(quoteIfNeeded(String(varCells)));
-  } else if (varCells !== undefined) {
-    try {
+  try {
+    if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+      fo.WriteLine(quoteIfNeeded(String(varCells)));
+    } else if (varCells !== undefined) {
       for (var row = 1; row <= varCells.ubound(1); row++) {
         var ary = new Array(varCells.ubound(2));
         for (var col = 1; col <= varCells.ubound(2); col++) {
@@ -148,9 +148,9 @@ function writeCellValues(fo, sht) {
         }
         fo.WriteLine(ary.join("\t"));
       }
-    } catch (e) {
-      fo.WriteLine("Error" + e.number);
     }
+  } catch (e) {
+    fo.WriteLine("Error" + e.number + ": " + e.message);
   }
 }
 
@@ -191,7 +191,7 @@ function writeFormulas(fo, sht) {
       }
     }
   } catch (e) {
-    fo.WriteLine(e.message);
+    fo.WriteLine("Error" + e.number + ": " + e.message);
   }
 }
 
@@ -462,8 +462,13 @@ function PluginOnEvent(eventType, obj) {
 
 function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var fo = fso.CreateTextFile(fileDst, true, true);
-
-  var xl = new ActiveXObject("Excel.Application");
+  var xl;
+  try {
+    xl = new ActiveXObject("Excel.Application");
+  } catch (e) {}
+  if (!xl) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Excel"));
+  }
   xl.EnableEvents = false;
   xl.DisplayAlerts = false;
 
@@ -528,6 +533,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   }
   sht = null;
 
+  wbk.Saved = true;
   wbk.Close();
   wbk = null;
   xl.Quit();
@@ -557,8 +563,13 @@ function IsFolder(file) {
 
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
-
-  var xl = new ActiveXObject("Excel.Application");
+  var xl;
+  try {
+    xl = new ActiveXObject("Excel.Application");
+  } catch (e) {}
+  if (!xl) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Excel"));
+  }
   xl.EnableEvents = false;
   xl.DisplayAlerts = false;
 
@@ -650,6 +661,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     }
   }
 
+  wbk.Saved = true;
   wbk.Close();
   wbk = null;
   xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking;
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index da80f46f479..4a13d171255 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -178,8 +178,13 @@ function PluginOnEvent(eventType, obj) {
 
 function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var fo = fso.CreateTextFile(fileDst, true, true);
-
-  var pp = new ActiveXObject("PowerPoint.Application");
+  var pp;
+  try {
+    pp = new ActiveXObject("PowerPoint.Application");
+  } catch (e) {}
+  if (!pp) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "PowerPoint"));
+  }
   pp.Visible = true;
   pp.DisplayAlerts = false;
 
@@ -230,6 +235,7 @@ function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
     }
   }
 
+  prs.Saved = true;
   prs.Close();
   prs = null;
   pp.Quit();
@@ -259,8 +265,13 @@ function IsFolder(file) {
 
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
-
-  var pp = new ActiveXObject("PowerPoint.Application");
+  var pp;
+  try {
+    pp = new ActiveXObject("PowerPoint.Application");
+  } catch (e) {}
+  if (!pp) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "PowerPoint"));
+  }
   pp.Visible = true;
   pp.DisplayAlerts = false;
 
@@ -316,6 +327,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     }
   }
 
+  prs.Saved = true;
   prs.Close();
   prs = null;
   pp.Quit();
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 7f6865058cd..31446c91344 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -172,8 +172,13 @@ function PluginOnEvent(eventType, obj) {
 
 function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var fo = fso.CreateTextFile(fileDst, true, true);
-
-  var vs = new ActiveXObject("Visio.Application");
+  var vs;
+  try {
+    vs = new ActiveXObject("Visio.Application");
+  } catch (e) {}
+  if (!vs) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Visio"));
+  }
   vs.Visible = false;
   vs.AlertResponse = vbNo;
 
@@ -242,8 +247,13 @@ function IsFolder(file) {
 
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
-
-  var vs = new ActiveXObject("Visio.Application");
+  var vs;
+  try {
+    vs = new ActiveXObject("Visio.Application");
+  } catch (e) {}
+  if (!vs) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Visio"));
+  }
   vs.Visible = false;
   vs.AlertResponse = vbNo;
 
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index ceaf8ef4e50..c789568501a 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -178,8 +178,13 @@ function PluginOnEvent(eventType, obj) {
 
 function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
   var fo = fso.CreateTextFile(fileDst, true, true);
-
-  var wd = new ActiveXObject("Word.Application");
+  var wd;
+  try {
+    wd = new ActiveXObject("Word.Application");
+  } catch (e) {}
+  if (!wd) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Word"));
+  }
   wd.DisplayAlerts = false;
 
   var fileSrc2 = fileSrc;
@@ -262,8 +267,13 @@ function IsFolder(file) {
 
 function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
   if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
-
-  var wd = new ActiveXObject("Word.Application");
+  var wd;
+  try {
+    wd = new ActiveXObject("Word.Application");
+  } catch (e) {}
+  if (!wd) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Word"));
+  }
   wd.DisplayAlerts = false;
 
   var fileSrc2 = fileSrc;
@@ -322,6 +332,7 @@ function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
     }
   }
 
+  doc.Saved = true;
   doc.Close();
   doc = null;
   wd.Quit();
diff --git a/Src/HexMergeView.cpp b/Src/HexMergeView.cpp
index c4e74b11b29..deb4607068e 100644
--- a/Src/HexMergeView.cpp
+++ b/Src/HexMergeView.cpp
@@ -129,7 +129,7 @@ bool CHexMergeView::IsLoadable()
 BOOL CHexMergeView::PreCreateWindow(CREATESTRUCT& cs)
 {
 	if (!IsLoadable())
-		LangMessageBox(IDS_FRHED_NOTINSTALLED, MB_OK);
+		AfxMessageBox(strutils::format_string1(_("%1 is not installed."), _T("Frhed")).c_str(), MB_OK);
 	cs.lpszClass = _T("heksedit");
 	cs.style |= WS_HSCROLL | WS_VSCROLL;
 	return TRUE;
diff --git a/Src/Merge.rc b/Src/Merge.rc
index 201eaa8ffa0..f2ca6cc0a37 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -4076,7 +4076,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_FRHED_NOTINSTALLED  "Frhed is not installed."
+    IDS_NOTINSTALLED  "%1 is not installed."
 END
 
 STRINGTABLE
diff --git a/Src/PropCompareBinary.cpp b/Src/PropCompareBinary.cpp
index 6ffd3944a93..74c2773bbef 100644
--- a/Src/PropCompareBinary.cpp
+++ b/Src/PropCompareBinary.cpp
@@ -26,7 +26,7 @@ class Heksedit
 			pv = LoadLibrary(_T("Frhed\\hekseditU.dll"));
 		if (pv == nullptr)
 		{
-			LangMessageBox(IDS_FRHED_NOTINSTALLED, MB_OK);
+			AfxMessageBox(strutils::format_string1(_("%1 is not installed."), _T("Frhed")).c_str(), MB_OK);
 			return;
 		}
 		wnd.Create(_T("heksedit"), nullptr, 0, CRect(), pwndParent, 1);
diff --git a/Src/resource.h b/Src/resource.h
index b5cabb35732..c7dfa0fa7ae 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -1492,7 +1492,7 @@
 #define IDS_AUTOCOMPLETE_DISABLED       43142
 #define IDS_AUTOCOMPLETE_FILE_SYS       43143
 #define IDS_AUTOCOMPLETE_MRU            43144
-#define IDS_FRHED_NOTINSTALLED          43229
+#define IDS_NOTINSTALLED                43229
 #define IDS_AUTO_MERGE                  43241
 #define IDS_CODEPAGE_MERGED             43244
 #define IDS_CODEPAGE_CONFLICT           43245
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 51e2497757f..34fee8f6399 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -3763,8 +3763,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "المحرر Frhed غير مثبت."
+msgid "%1 is not installed."
+msgstr "المحرر %1 غير مثبت."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 2c1e5144af5..80f582d5421 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -4371,7 +4371,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index d8ea5230c0b..747fb6dea10 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -3451,8 +3451,8 @@ msgstr "Página Web"
 msgid "W&rap Text"
 msgstr "O&rganizar Texto"
 
-msgid "Frhed is not installed."
-msgstr "O Frhed não está instalado."
+msgid "%1 is not installed."
+msgstr "O %1 não está instalado."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 246b5bb7d96..c51acf42c3c 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -3822,8 +3822,8 @@ msgstr "Страница от &интернет"
 msgid "W&rap Text"
 msgstr "П&ренасяне на текста"
 
-msgid "Frhed is not installed."
-msgstr "Frhed не е инсталиран."
+msgid "%1 is not installed."
+msgstr "%1 не е инсталиран."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 5dd9bc02492..89eaf865d93 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -4520,8 +4520,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "L'aplicació Frhed no està instal·lada."
+msgid "%1 is not installed."
+msgstr "L'aplicació %1 no està instal·lada."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 38889b7acaa..21f4b413f93 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -3870,8 +3870,8 @@ msgstr "网页(&B)"
 msgid "W&rap Text"
 msgstr "自动换行(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed 未安装。"
+msgid "%1 is not installed."
+msgstr "%1 未安装。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 42b30c3386c..385a1082cc3 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -4520,8 +4520,8 @@ msgstr "網頁(&B)"
 msgid "W&rap Text"
 msgstr "自動換行(&W)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed 未安裝。"
+msgid "%1 is not installed."
+msgstr "Frhed %1。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index 126615fb00e..23360adef75 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -3838,8 +3838,8 @@ msgstr "Pagina we&b"
 msgid "W&rap Text"
 msgstr "&Ritornu autumaticu à a linea"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ùn hè micca installatu."
+msgid "%1 is not installed."
+msgstr "%1 ùn hè micca installatu."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 75e11fa40cb..488a7c81b63 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -4370,7 +4370,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 33d959714c6..e146df2316d 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -4303,7 +4303,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 5ec6e811342..0997438ebb2 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -4408,7 +4408,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index e5df665be47..1b6d70731d5 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -3824,8 +3824,8 @@ msgstr "Webpagina"
 msgid "W&rap Text"
 msgstr "Tekstterugloop"
 
-msgid "Frhed is not installed."
-msgstr "Fhred is niet geïnstalleerd."
+msgid "%1 is not installed."
+msgstr "%1 is niet geïnstalleerd."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index cc539b13fd9..434f4eb1cb8 100644
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2024-02-14 07:37+0000\n"
+"POT-Creation-Date: 2024-02-18 21:54+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -3445,7 +3445,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+#, c-format
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 30a14424d0b..9ee415dcf6f 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -3856,8 +3856,8 @@ msgstr "Ver&kkosivu"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed ei ole asennettu."
+msgid "%1 is not installed."
+msgstr "%1 ei ole asennettu."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index bb6c8b9e29c..941dfd8df2f 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -4550,8 +4550,8 @@ msgstr "Page &Web"
 msgid "W&rap Text"
 msgstr "Habillage de texte"
 
-msgid "Frhed is not installed."
-msgstr "Frhed n'est pas installé."
+msgid "%1 is not installed."
+msgstr "%1 n'est pas installé."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 4a2df9f9fe9..08d78b65a26 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -3828,8 +3828,8 @@ msgstr "Páxina We&b"
 msgid "W&rap Text"
 msgstr "Axusta&r texto"
 
-msgid "Frhed is not installed."
-msgstr "Non está instalado Frhed."
+msgid "%1 is not installed."
+msgstr "Non está instalado %1."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 9f12f2f0d71..f999a030dbe 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -4166,8 +4166,8 @@ msgstr "We&bseite"
 msgid "W&rap Text"
 msgstr "Text umbrechen"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ist nicht installiert."
+msgid "%1 is not installed."
+msgstr "%1 ist nicht installiert."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 0a8f4c0ab16..5b85aee5a6c 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -4348,7 +4348,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 4b13391b26b..be1ce72226a 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -4504,8 +4504,8 @@ msgstr "Weboldal"
 msgid "W&rap Text"
 msgstr "Szöveg tördelése"
 
-msgid "Frhed is not installed."
-msgstr "Az Frhed hexa szerkesztő nincs telepítve."
+msgid "%1 is not installed."
+msgstr "Az %1 hexa szerkesztő nincs telepítve."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index feebc848c68..babd4081989 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -3802,8 +3802,8 @@ msgstr "Pagina we&b"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed non è installato."
+msgid "%1 is not installed."
+msgstr "%1 non è installato."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index f76a5cdf307..449be2fe820 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -3829,8 +3829,8 @@ msgstr "Webページ(&B)"
 msgid "W&rap Text"
 msgstr "折り返して全体を表示(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed がインストールされていません。"
+msgid "%1 is not installed."
+msgstr "%1 がインストールされていません。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 7f37080741e..0847387e952 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -4545,8 +4545,8 @@ msgstr "웹페이지(&B)"
 msgid "W&rap Text"
 msgstr "텍스트 줄 바꿈(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed가 설치되지 않았습니다."
+msgid "%1 is not installed."
+msgstr "%1가 설치되지 않았습니다."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 3c15e879f4a..415388afa7f 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -3451,8 +3451,8 @@ msgstr "Ti&nklapiai"
 msgid "W&rap Text"
 msgstr "S&kaidyti tekstą"
 
-msgid "Frhed is not installed."
-msgstr "„Frhed“ neįdiegtas."
+msgid "%1 is not installed."
+msgstr "„%1“ neįdiegtas."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 48280721bec..9db7ae450cd 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -3835,7 +3835,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 9d7aca24a62..aef71e8f24e 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -4417,7 +4417,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 6dba1f8722d..920ebaed457 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -3452,8 +3452,8 @@ msgstr "Strona internetowa"
 msgid "W&rap Text"
 msgstr "Zawijaj tekst"
 
-msgid "Frhed is not installed."
-msgstr "Free Hex Editor nie został zainstalowany."
+msgid "%1 is not installed."
+msgstr "%1 nie został zainstalowany."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index e51619769ff..799e748004c 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -3836,8 +3836,8 @@ msgstr "&Página web"
 msgid "W&rap Text"
 msgstr "M&udança de linha"
 
-msgid "Frhed is not installed."
-msgstr "O Frhed não está instalado."
+msgid "%1 is not installed."
+msgstr "O %1 não está instalado."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index c05ac0d7404..b94ef0fd879 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -3911,8 +3911,8 @@ msgstr "Pagină &web"
 msgid "W&rap Text"
 msgstr "Înfășoa&ră textul"
 
-msgid "Frhed is not installed."
-msgstr "Frhed nu este instalat."
+msgid "%1 is not installed."
+msgstr "%1 nu este instalat."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index b89c4273d76..4384f528713 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -3453,8 +3453,8 @@ msgstr "Веб-страница"
 msgid "W&rap Text"
 msgstr "&Перенос строк"
 
-msgid "Frhed is not installed."
-msgstr "Frhed не установлен."
+msgid "%1 is not installed."
+msgstr "%1 не установлен."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index bb8584e3cbe..a2a8afb8526 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -4342,7 +4342,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index ae2d73f9888..7844def20ec 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -4371,7 +4371,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index c191ace9aa5..a98e5bfdf62 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -3803,8 +3803,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed nie je nainštalovaný."
+msgid "%1 is not installed."
+msgstr "%1 nie je nainštalovaný."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 839323934a9..383a6582b0a 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -3826,8 +3826,8 @@ msgstr "&Spletna stran"
 msgid "W&rap Text"
 msgstr "Pre&lom besedila"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ni nameščen."
+msgid "%1 is not installed."
+msgstr "%1 ni nameščen."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index dc1b47c5c14..3363b176c8f 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -3830,8 +3830,8 @@ msgstr "Página We&b"
 msgid "W&rap Text"
 msgstr "Ajusta&r texto"
 
-msgid "Frhed is not installed."
-msgstr "No está instalado Frhed."
+msgid "%1 is not installed."
+msgstr "No está instalado %1."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index b8bac13b5af..6630f691c58 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -3905,8 +3905,8 @@ msgstr "Websida"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed är inte installerad."
+msgid "%1 is not installed."
+msgstr "%1 är inte installerad."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index 9a46f0fb4f5..d4dcb21cdb1 100644
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -3825,8 +3825,8 @@ msgstr "வலைப்பக்கம்"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed நிறுவப்படவில்லை."
+msgid "%1 is not installed."
+msgstr "%1 நிறுவப்படவில்லை."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index ca207298a97..f22b29c0eda 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -3450,8 +3450,8 @@ msgstr "İnternet &sayfası"
 msgid "W&rap Text"
 msgstr "&Metin kaydırılsın"
 
-msgid "Frhed is not installed."
-msgstr "Frhed kurulmamış."
+msgid "%1 is not installed."
+msgstr "%1 kurulmamış."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index ecc0c639fb3..06f3da8992e 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -4357,7 +4357,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format

From 7e4856234c4fe50e6936ab574db084bc6f3e1f20 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 20 Feb 2024 07:32:30 +0900
Subject: [PATCH 57/58] WIP

---
 Src/MergeAppCOMClass.cpp | 12 ++++++------
 Src/MergeAppCOMClass.h   |  8 ++++----
 Src/MergeAppLib.h        | 24 +++++++++++-------------
 Src/MergeAppLib.idl      |  6 +++---
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 182e993b21a..28a0691192b 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -118,12 +118,6 @@ HRESULT STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varVal
 	return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE MergeAppCOMClass::Log(int level, BSTR text)
-{
-	LogErrorString(text);
-	return S_OK;
-}
-
 HRESULT STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet)
 {
 	VARIANT varButtons2, varTitle2;
@@ -211,3 +205,9 @@ HRESULT STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTit
 	return S_OK;
 }
 
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::LogError(BSTR text)
+{
+	LogErrorString(text);
+	return S_OK;
+}
+
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index 69cf38f0459..accccfb9c4a 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -8,9 +8,9 @@ enum
 	DISPID_Translate = 1,
 	DISPID_GetOption = 2,
 	DISPID_SaveOption = 3,
-	DISPID_Log = 4,
-	DISPID_MsgBox = 5,
-	DISPID_InputBox = 6,
+	DISPID_MsgBox = 4,
+	DISPID_InputBox = 5,
+	DISPID_LogError = 6,
 };
 
 
@@ -104,9 +104,9 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	HRESULT STDMETHODCALLTYPE Translate(BSTR text, BSTR* pRet) override;
 	HRESULT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault, VARIANT* pRet) override;
 	HRESULT STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
-	HRESULT STDMETHODCALLTYPE Log(int level, BSTR text) override;
 	HRESULT STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet) override;
 	HRESULT STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault, BSTR* pRet) override;
+	HRESULT STDMETHODCALLTYPE LogError(BSTR text) override;
 private:
 	static INT_PTR CALLBACK InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam);
 	std::wstring m_inputBoxTitle;
diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h
index c89c05a6ac5..56ce5e5c3cd 100644
--- a/Src/MergeAppLib.h
+++ b/Src/MergeAppLib.h
@@ -103,10 +103,6 @@ EXTERN_C const IID IID_IMergeApp;
             /* [in] */ BSTR name,
             /* [in] */ VARIANT varValue) = 0;
         
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Log( 
-            /* [in] */ int level,
-            /* [in] */ BSTR text) = 0;
-        
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE MsgBox( 
             /* [in] */ BSTR prompt,
             /* [optional][in] */ VARIANT varButtons,
@@ -119,6 +115,9 @@ EXTERN_C const IID IID_IMergeApp;
             /* [optional][in] */ VARIANT varDefault,
             /* [retval][out] */ BSTR *pRet) = 0;
         
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE LogError( 
+            /* [in] */ BSTR text) = 0;
+        
     };
     
     
@@ -203,12 +202,6 @@ EXTERN_C const IID IID_IMergeApp;
             /* [in] */ BSTR name,
             /* [in] */ VARIANT varValue);
         
-        DECLSPEC_XFGVIRT(IMergeApp, Log)
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Log )( 
-            IMergeApp * This,
-            /* [in] */ int level,
-            /* [in] */ BSTR text);
-        
         DECLSPEC_XFGVIRT(IMergeApp, MsgBox)
         /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *MsgBox )( 
             IMergeApp * This,
@@ -225,6 +218,11 @@ EXTERN_C const IID IID_IMergeApp;
             /* [optional][in] */ VARIANT varDefault,
             /* [retval][out] */ BSTR *pRet);
         
+        DECLSPEC_XFGVIRT(IMergeApp, LogError)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *LogError )( 
+            IMergeApp * This,
+            /* [in] */ BSTR text);
+        
         END_INTERFACE
     } IMergeAppVtbl;
 
@@ -270,15 +268,15 @@ EXTERN_C const IID IID_IMergeApp;
 #define IMergeApp_SaveOption(This,name,varValue)	\
     ( (This)->lpVtbl -> SaveOption(This,name,varValue) ) 
 
-#define IMergeApp_Log(This,level,text)	\
-    ( (This)->lpVtbl -> Log(This,level,text) ) 
-
 #define IMergeApp_MsgBox(This,prompt,varButtons,varTitle,pRet)	\
     ( (This)->lpVtbl -> MsgBox(This,prompt,varButtons,varTitle,pRet) ) 
 
 #define IMergeApp_InputBox(This,prompt,varTitle,varDefault,pRet)	\
     ( (This)->lpVtbl -> InputBox(This,prompt,varTitle,varDefault,pRet) ) 
 
+#define IMergeApp_LogError(This,text)	\
+    ( (This)->lpVtbl -> LogError(This,text) ) 
+
 #endif /* COBJMACROS */
 
 
diff --git a/Src/MergeAppLib.idl b/Src/MergeAppLib.idl
index 7d3f1c8d3c0..d5438b8aa7d 100644
--- a/Src/MergeAppLib.idl
+++ b/Src/MergeAppLib.idl
@@ -15,9 +15,9 @@ interface IMergeApp : IDispatch
 	[id(1), helpstring("method Translate")] HRESULT Translate([in] BSTR text, [out, retval] BSTR* pRet);
 	[id(2), helpstring("method GetOption")] HRESULT GetOption([in] BSTR name, [in] VARIANT varDefault, [out, retval] VARIANT* pRet);
 	[id(3), helpstring("method SaveOption")] HRESULT SaveOption([in] BSTR name, [in] VARIANT varValue);
-	[id(4), helpstring("method Log")] HRESULT Log([in] int level, [in] BSTR text);
-	[id(5), helpstring("method MsgBox")] HRESULT MsgBox([in] BSTR prompt, [in, optional] VARIANT varButtons, [in, optional] VARIANT varTitle, [out, retval] int* pRet);
-	[id(6), helpstring("method InputBox")] HRESULT InputBox([in] BSTR prompt, [in, optional] VARIANT varTitle, [in, optional] VARIANT varDefault, [out, retval] BSTR* pRet);
+	[id(4), helpstring("method MsgBox")] HRESULT MsgBox([in] BSTR prompt, [in, optional] VARIANT varButtons, [in, optional] VARIANT varTitle, [out, retval] int* pRet);
+	[id(5), helpstring("method InputBox")] HRESULT InputBox([in] BSTR prompt, [in, optional] VARIANT varTitle, [in, optional] VARIANT varDefault, [out, retval] BSTR* pRet);
+	[id(6), helpstring("method LogError")] HRESULT LogError([in] BSTR text);
 };
 
 [

From 86875cf49b0f9191db24d2e2647052e6a08bc06d Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Tue, 20 Feb 2024 07:47:03 +0900
Subject: [PATCH 58/58] WIP

---
 Plugins/dlls/editor addin.sct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index db2ee9c4d17..6bd475fddab 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -145,7 +145,7 @@ function regWrite(Key, Value, TypeNm) {
 }
 
 function ReplaceVariables(str) {
-  var newstr;
+  var newstr = "";
   var pos = 0;
   while (true) {
     var foundpos = str.indexOf("%", pos);