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

---
 MiniRez/MiniRez.cpp     | 11 ++++++-----
 MiniRez/MiniRez.vcxproj |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/MiniRez/MiniRez.cpp b/MiniRez/MiniRez.cpp
index 8b94f39..6b03b48 100644
--- a/MiniRez/MiniRez.cpp
+++ b/MiniRez/MiniRez.cpp
@@ -9,6 +9,7 @@
 
 #include "MacBinary2.h"
 #include "MacFileMem.h"
+#include "WindowsUnicodeToolShim.h"
 
 // Very simplified resource compiler
 
@@ -117,7 +118,7 @@ void DefError()
 	exit(-1);
 }
 
-int main(int argc, const char **argv)
+int toolMain(int argc, const char **argv)
 {
 	if (argc != 3)
 	{
@@ -125,8 +126,8 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-	FILE *f = nullptr;
-	if (fopen_s(&f, argv[1], "rb"))
+	FILE *f = fopen_utf8(argv[1], "rb");
+	if (!f)
 	{
 		fprintf(stderr, "Failed to open input file");
 		return -1;
@@ -524,8 +525,8 @@ int main(int argc, const char **argv)
 
 	printf("Writing to %s...", argv[2]);
 
-	FILE *outF = nullptr;
-	if (fopen_s(&outF, argv[2], "wb"))
+	FILE *outF = fopen_utf8(argv[2], "wb");
+	if (!outF)
 	{
 		fprintf(stderr, "Failed to open output file");
 		return -1;
diff --git a/MiniRez/MiniRez.vcxproj b/MiniRez/MiniRez.vcxproj
index 58c880e..1e3eb6f 100644
--- a/MiniRez/MiniRez.vcxproj
+++ b/MiniRez/MiniRez.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">