From 34a73b50104f85a535f986180f0dc4f259f08fc4 Mon Sep 17 00:00:00 2001
From: Christian Ullrich <chris@chrullrich.net>
Date: Fri, 10 Dec 2021 02:56:38 +0100
Subject: [PATCH] [wtl] Add two "post-release updates". (#21924)

* [wtl] Add two "post-release updates".

See https://sourceforge.net/projects/wtl/files/WTL%2010/WTL10%20Post-Release%20Updates.txt/download

* Ran magic undocumented command line.
---
 ports/wtl/appwizard_setup.js-vs2022.patch | 35 +++++++++++++++++++++++
 ports/wtl/atlmisc.h-bug329.patch          | 11 +++++++
 ports/wtl/portfile.cmake                  |  3 ++
 ports/wtl/vcpkg.json                      |  2 +-
 versions/baseline.json                    |  2 +-
 versions/w-/wtl.json                      |  5 ++++
 6 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 ports/wtl/appwizard_setup.js-vs2022.patch
 create mode 100644 ports/wtl/atlmisc.h-bug329.patch

diff --git a/ports/wtl/appwizard_setup.js-vs2022.patch b/ports/wtl/appwizard_setup.js-vs2022.patch
new file mode 100644
index 0000000000..1f0f4e5f0c
--- /dev/null
+++ b/ports/wtl/appwizard_setup.js-vs2022.patch
@@ -0,0 +1,35 @@
+--- a/AppWizard/Setup.js
++++ b/AppWizard/Setup.js
+@@ -185,26 +185,30 @@
+ 		}
+ 	}
+ 
+-// Search for Visual Studio 2017-2019
+-	var nVersionsNew = 2;
++// Search for Visual Studio 2017/2019/2022
++	var nVersionsNew = 3;
+ 
+ 	var strWizardFolderNew = "Common7\\IDE\\VC\\vcprojects";
+ 
+ 	var astrVersionsNew = new Array();
+ 	astrVersionsNew[0] = "Visual Studio 2017 (15.0)";
+ 	astrVersionsNew[1] = "Visual Studio 2019 (16.0)";
++	astrVersionsNew[2] = "Visual Studio 2022 (17.0)";
+ 
+ 	var astrWizVerNew = new Array();
+ 	astrWizVerNew[0] = "15.0";
+ 	astrWizVerNew[1] = "16.0";
++	astrWizVerNew[2] = "17.0";
+ 
+ 	var astrParamVerNew = new Array();
+ 	astrParamVerNew[0] = "15";
+ 	astrParamVerNew[1] = "16";
++	astrParamVerNew[2] = "17";
+ 
+ 	var astrFilterVer = new Array();
+ 	astrFilterVer[0] = "[15.0,16.0]";
+ 	astrFilterVer[1] = "[16.0,17.0]";
++	astrFilterVer[2] = "[17.0,18.0]";
+ 
+ 	// Ensure that we can run vswhere.exe
+ 	var strProgFileRegKey_x86 = "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\ProgramFilesDir (x86)";
diff --git a/ports/wtl/atlmisc.h-bug329.patch b/ports/wtl/atlmisc.h-bug329.patch
new file mode 100644
index 0000000000..6bffba9be1
--- /dev/null
+++ b/ports/wtl/atlmisc.h-bug329.patch
@@ -0,0 +1,11 @@
+--- a/Include/atlmisc.h
++++ b/Include/atlmisc.h
+@@ -628,7 +628,7 @@
+ 	{
+ 		ATLASSERT(m_hFind != NULL);
+ 
+-		ATL::CString strResult("file://");
++		ATL::CString strResult(_T("file://"));
+ 		strResult += GetFilePath();
+ 		return strResult;
+ 	}
diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake
index 4c1bb2b77a..4c6845f1b5 100644
--- a/ports/wtl/portfile.cmake
+++ b/ports/wtl/portfile.cmake
@@ -5,6 +5,9 @@ vcpkg_from_sourceforge(
     FILENAME "WTL10_10320_Release.zip"
     NO_REMOVE_ONE_LEVEL
 	SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309
+	PATCHES
+		appwizard_setup.js-vs2022.patch
+		atlmisc.h-bug329.patch
 )
 
 file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h")
diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json
index 733316f0d9..64dcf31575 100644
--- a/ports/wtl/vcpkg.json
+++ b/ports/wtl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wtl",
   "version-string": "10.0.10320",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.",
   "homepage": "https://sourceforge.net/projects/wtl/"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 0d5691254e..c335949580 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7270,7 +7270,7 @@
     },
     "wtl": {
       "baseline": "10.0.10320",
-      "port-version": 1
+      "port-version": 2
     },
     "wxchartdir": {
       "baseline": "1.0.0",
diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json
index 394a38ef49..474f02cc8f 100644
--- a/versions/w-/wtl.json
+++ b/versions/w-/wtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3345336300f47e924a80d3be0f3fb76c558a54fe",
+      "version-string": "10.0.10320",
+      "port-version": 2
+    },
     {
       "git-tree": "6d429012165553d38ea4ae45057ce85bb34deb96",
       "version-string": "10.0.10320",