Change MiniRez to use WindowsUnicodeToolShim

AerofoilAndroid/app/build.gradle

@@ -15,8 +15,8 @@ android {
         }
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 11
+        versionCode 12
-        versionName "1.0.15"
+        versionName "1.0.16"
         externalNativeBuild {
             ndkBuild {
                 arguments "APP_PLATFORM=android-16"

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;
+	FILE *tsF = fopen_utf8(timestampPath.c_str(), "rb");
-	errno_t ferr = fopen_s(&tsF, 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;
+	FILE *file = fopen_utf8(outPath.c_str(), "wb");
-	errno_t err = fopen_s(&file, outPath.c_str(), "wb");
+	if (file)
-	if (!err)
 	{
 		PortabilityLayer::CFileStream stream(file);
 

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" />

GpApp/Main.cpp

@@ -567,8 +567,7 @@ void StepLoadScreen(int steps, bool insertDelay)
 
 void InitLoadingWindow()
 {
-	// Only phones are slow enough for this to matter
+	if (!thisMac.isTouchscreen && isPrefsLoaded)
-	if (!thisMac.isTouchscreen)
 		return;
 
 	if (isPrefsLoaded)
@@ -781,6 +780,10 @@ void PreloadAATables()
 		PortabilityLayer::RGBAColor::Create(0, 255, 255, 255),
 		PortabilityLayer::RGBAColor::Create(0, 0, 255, 255),
 		PortabilityLayer::RGBAColor::Create(204, 102, 51, 255),
+		PortabilityLayer::RGBAColor::Create(102, 102, 102, 255),
+		PortabilityLayer::RGBAColor::Create(51, 51, 102, 255),
+		PortabilityLayer::RGBAColor::Create(255, 255, 51, 255),
+		PortabilityLayer::RGBAColor::Create(0, 0, 0, 255),
 	};
 
 	const size_t numPalettePreloads = sizeof(preloadColors) / sizeof(preloadColors[0]);
@@ -814,7 +817,7 @@ void PreloadAATables()
 
 			if (!toneAlreadyQueued)
 			{
-				PreloadAATableSpec &spec = specs[i + numTonePreloads];
+				PreloadAATableSpec &spec = specs[numPalettePreloads + numTonePreloads];
 				numTonePreloads++;
 
 				spec.m_color = PortabilityLayer::RGBAColor::Create(tone, tone, tone, 255);

GpApp/SavedGames.cpp

@@ -266,7 +266,7 @@ Boolean OpenSavedGame (void)
 	char savePath[sizeof(spec.m_name) + 1];
 	size_t savePathLength = 0;
 
-	if (!fm->PromptOpenFile(spec.m_dir, ".sav", savePath, savePathLength, sizeof(spec.m_name), PSTR("Open Saved Game"), true, GetSavedGameDetailsAPI()))
+	if (!fm->PromptOpenFile(spec.m_dir, ".sav", savePath, savePathLength, sizeof(spec.m_name), PSTR("Open Saved Game"), false, GetSavedGameDetailsAPI()))
 		return false;
 
 	assert(savePathLength < sizeof(spec.m_name) - 1);

GpCommon/GpBuildVersion.h

@@ -2,8 +2,8 @@
 
 #define GP_BUILD_VERSION_MAJOR 1
 #define GP_BUILD_VERSION_MINOR 0
-#define GP_BUILD_VERSION_UPDATE 15
+#define GP_BUILD_VERSION_UPDATE 16
 
-#define GP_APPLICATION_VERSION_STRING "1.0.15"
+#define GP_APPLICATION_VERSION_STRING "1.0.16"
 #define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Eric Lasota"
 #define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"

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;
+	FILE *f = fopen_utf8(argv[1], "rb");
-	if (fopen_s(&f, 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;
+	FILE *outF = fopen_utf8(argv[2], "wb");
-	if (fopen_s(&outF, argv[2], "wb"))
+	if (!outF)
 	{
 		fprintf(stderr, "Failed to open output file");
 		return -1;

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">

WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj

@@ -40,12 +40,14 @@
     <Import Project="..\WindowsUnicodeToolShim.props" />
     <Import Project="..\PortabilityLayer.props" />
     <Import Project="..\Common.props" />
+    <Import Project="..\Debug.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" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
     <Import Project="..\PortabilityLayer.props" />
     <Import Project="..\Common.props" />
+    <Import Project="..\Release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />

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 = fopen_utf8(argv[1], "rb");
-	FILE *f = nullptr;
-	if (fopen_s(&f, argv[1], "rb"))
-		f = nullptr;
-#else
-	FILE *f = fopen(argv[1], "rb");
-#endif
 
 	if (!f)
 	{
@@ -57,13 +52,7 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
-#ifdef _CRT_INSECURE_DEPRECATE
+	FILE *tsF = fopen_utf8(argv[2], "rb");
-	FILE *tsF = nullptr;
-	if (fopen_s(&tsF, argv[2], "rb"))
-		tsF = nullptr;
-#else
-	FILE *tsF = fopen(argv[2], "rb");
-#endif
 
 	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 = fopen_utf8(path.c_str(), "wb");
-		FILE *outF = nullptr;
-		if (fopen_s(&outF, path.c_str(), "wb"))
-			outF = nullptr;
-#else
-		FILE *outF = fopen(path.c_str(), "wb");
-#endif
 
 		if (!outF)
 			continue;

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">