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

---
 FTagData/FTagData.cpp     | 14 +++++++-------
 FTagData/FTagData.vcxproj |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/FTagData/FTagData.cpp b/FTagData/FTagData.cpp
index 274ba06..705a75d 100644
--- a/FTagData/FTagData.cpp
+++ b/FTagData/FTagData.cpp
@@ -5,7 +5,9 @@
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"
 
-int main(int argc, const char **argv)
+#include "WindowsUnicodeToolShim.h"
+
+int toolMain(int argc, const char **argv)
 {
 	if (argc < 7)
 	{
@@ -28,12 +30,11 @@ int main(int argc, const char **argv)
 		return -3;
 	}
 
-	FILE *tsF = nullptr;
-	errno_t ferr = fopen_s(&tsF, timestampPath.c_str(), "rb");
+	FILE *tsF = fopen_utf8(timestampPath.c_str(), "rb");
 	int64_t timestamp = 0;
 	PortabilityLayer::CombinedTimestamp ts;
 
-	if (!ferr)
+	if (tsF)
 	{
 		if (fread(&ts, 1, sizeof(ts), tsF) != sizeof(ts))
 		{
@@ -77,9 +78,8 @@ int main(int argc, const char **argv)
 	PortabilityLayer::MacFilePropertiesSerialized mps;
 	mps.Serialize(mfp);
 
-	FILE *file = nullptr;
-	errno_t err = fopen_s(&file, outPath.c_str(), "wb");
-	if (!err)
+	FILE *file = fopen_utf8(outPath.c_str(), "wb");
+	if (file)
 	{
 		PortabilityLayer::CFileStream stream(file);
 
diff --git a/FTagData/FTagData.vcxproj b/FTagData/FTagData.vcxproj
index 25e4626..dd37835 100644
--- a/FTagData/FTagData.vcxproj
+++ b/FTagData/FTagData.vcxproj
@@ -41,6 +41,7 @@
     <Import Project="..\GpCommon.props" />
     <Import Project="..\Common.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="..\GpCommon.props" />
     <Import Project="..\Common.props" />
     <Import Project="..\Release.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -77,6 +79,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>
   <ItemGroup>
     <ClCompile Include="FTagData.cpp" />