From b8bf6be44fe886457a51f83ad4785077a82845e4 Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Thu, 11 Mar 2021 22:18:07 -0500
Subject: [PATCH] Change hqx2gp to use WindowsUnicodeToolShim

---
 hqx2gp/hqx2gp.cpp     | 27 +++++----------------------
 hqx2gp/hqx2gp.vcxproj |  5 +++++
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/hqx2gp/hqx2gp.cpp b/hqx2gp/hqx2gp.cpp
index 4f632d0..30e52e0 100644
--- a/hqx2gp/hqx2gp.cpp
+++ b/hqx2gp/hqx2gp.cpp
@@ -30,12 +30,13 @@ SOFTWARE.
 #include "MacBinary2.h"
 #include "MacFileMem.h"
 #include "ZipFile.h"
+#include "WindowsUnicodeToolShim.h"
 
 #include <string>
 
 using namespace PortabilityLayer;
 
-int main(int argc, const char **argv)
+int toolMain(int argc, const char **argv)
 {
 	if (argc != 4)
 	{
@@ -43,13 +44,7 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-#ifdef _CRT_INSECURE_DEPRECATE
-	FILE *f = nullptr;
-	if (fopen_s(&f, argv[1], "rb"))
-		f = nullptr;
-#else
-	FILE *f = fopen(argv[1], "rb");
-#endif
+	FILE *f = fopen_utf8(argv[1], "rb");
 
 	if (!f)
 	{
@@ -57,13 +52,7 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-#ifdef _CRT_INSECURE_DEPRECATE
-	FILE *tsF = nullptr;
-	if (fopen_s(&tsF, argv[2], "rb"))
-		tsF = nullptr;
-#else
-	FILE *tsF = fopen(argv[2], "rb");
-#endif
+	FILE *tsF = fopen_utf8(argv[2], "rb");
 
 	if (!tsF)
 	{
@@ -130,13 +119,7 @@ int main(int argc, const char **argv)
 
 		std::string path = fname + extensions[i];
 
-#ifdef _CRT_INSECURE_DEPRECATE
-		FILE *outF = nullptr;
-		if (fopen_s(&outF, path.c_str(), "wb"))
-			outF = nullptr;
-#else
-		FILE *outF = fopen(path.c_str(), "wb");
-#endif
+		FILE *outF = fopen_utf8(path.c_str(), "wb");
 
 		if (!outF)
 			continue;
diff --git a/hqx2gp/hqx2gp.vcxproj b/hqx2gp/hqx2gp.vcxproj
index 3bc6142..e5df7e6 100644
--- a/hqx2gp/hqx2gp.vcxproj
+++ b/hqx2gp/hqx2gp.vcxproj
@@ -41,6 +41,7 @@
     <Import Project="..\Common.props" />
     <Import Project="..\GpCommon.props" />
     <Import Project="..\Debug.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -48,6 +49,7 @@
     <Import Project="..\Common.props" />
     <Import Project="..\GpCommon.props" />
     <Import Project="..\Release.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -80,6 +82,9 @@
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
+      <Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">