Save house after opening so it doesn't throw an IO error if the user quits immediately.

This reverts commit bd9676be40.

.gitignore

@@ -24,3 +24,13 @@
 Packaged/*
 DebugData/*
 ReleasePkg/*
+InstallerPackages/*
+*.msi
+*.wixpdb
+*.wixobj
+*.CopyComplete
+ReleasePackageInstaller/obj/*
+ReleasePackageInstaller/bin/*
+ReleasePackageInstaller/AerofoilPackageDefs.wxi
+ReleasePackageInstaller/AerofoilPackageVersion.wxi
+packages/*

ACKNOWLEDGMENTS.txt

@@ -1,14 +1,6 @@
-Virtue font:
-(c)1997-1999 Marty P. Pfeiffer at Scooter Graphics 
-
-Virtue is used with permission and is authorized only for NON-COMMERCIAL redistribution as part of the GlidePort package.
-
-Please visit the author's website (http://www.scootergraphics.com/) for more information.
-
-
-Roboto font:
+Open Sans font:
 (c)2011 Google
-Distributed under the Apache License (see Resources/Fonts/Roboto/LICENSE)
+Distributed under the Apache License (see Resources/Fonts/OpenSans/LICENSE)
 
 
 stb_image_write:
@@ -19,3 +11,26 @@ MacRomanConversion uses a table from LIBICONV:
 Copyright (C) 1999-2001, 2016 Free Software Foundation, Inc.
 
 Distributed under the LGPLv2 license (See MacRomanConversion/LICENSE.txt)
+
+
+RapidJSON:
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
+
+Distributed under the MIT license (See rapidjson/license.txt)
+
+
+zlib:
+(C) 1995-2017 Jean-loup Gailly and Mark Adler
+Distributed under zlib license (See zlib/README)
+
+
+The Unarchiver:
+Copyright (C) 2006-2013 Dag Ågren
+
+Distributed under the LGPLv2 license (See unpacktool/LICENSE.txt)
+
+
+MACE Audio decoder:
+Copyright (c) 2002 Laszlo Torok <torokl@alpha.dfmk.hu>
+
+Distributed under the LGPLv2 license (See macedec.cpp comments)

Aerofoil.sln

@@ -33,6 +33,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aerofoil", "Aerofoil\Aerofo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MacRomanConversion", "MacRomanConversion\MacRomanConversion.vcxproj", "{07351A8E-1F79-42C9-BBAB-31F071EAA99E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr2gpa", "gpr2gpa\gpr2gpa.vcxproj", "{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2gp", "bin2gp\bin2gp.vcxproj", "{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakeTimestamp", "MakeTimestamp\MakeTimestamp.vcxproj", "{9023DF2F-A33D-485A-B13D-0973348B2F9B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flattenmov", "flattenmov\flattenmov.vcxproj", "{89F8D13E-F216-4B67-8DE9-7F842D349E94}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unpacktool", "unpacktool\unpacktool.vcxproj", "{A778D062-DE76-49F6-8D05-EB26852DD605}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ReleasePackageInstaller", "ReleasePackageInstaller\ReleasePackageInstaller.wixproj", "{D26BD501-28A7-4849-8130-FB5EA0A2B82F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B} = {7EFF1E21-C375-45EA-A069-4E2232C8A72B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsUnicodeToolShim", "WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj", "{15009625-1120-405E-8BBA-69A16CD6713D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmitWiXVersion", "EmitWiXVersion\EmitWiXVersion.vcxproj", "{7EFF1E21-C375-45EA-A069-4E2232C8A72B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -161,6 +182,74 @@ Global
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x64.Build.0 = Release|x64
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x86.ActiveCfg = Release|Win32
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x86.Build.0 = Release|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x64.ActiveCfg = Debug|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x64.Build.0 = Debug|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x86.ActiveCfg = Debug|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x86.Build.0 = Debug|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x64.ActiveCfg = Release|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x64.Build.0 = Release|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x86.ActiveCfg = Release|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x86.Build.0 = Release|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x64.ActiveCfg = Debug|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x64.Build.0 = Debug|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x86.ActiveCfg = Debug|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x86.Build.0 = Debug|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x64.ActiveCfg = Release|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x64.Build.0 = Release|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x86.ActiveCfg = Release|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x86.Build.0 = Release|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x64.ActiveCfg = Debug|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x64.Build.0 = Debug|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x86.ActiveCfg = Debug|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x86.Build.0 = Debug|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x64.ActiveCfg = Release|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x64.Build.0 = Release|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x86.ActiveCfg = Release|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x86.Build.0 = Release|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x64.ActiveCfg = Debug|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x64.Build.0 = Debug|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x86.ActiveCfg = Debug|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x86.Build.0 = Debug|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x64.ActiveCfg = Release|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x64.Build.0 = Release|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x86.ActiveCfg = Release|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x86.Build.0 = Release|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x64.ActiveCfg = Debug|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x64.Build.0 = Debug|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x86.ActiveCfg = Debug|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x86.Build.0 = Debug|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x64.ActiveCfg = Release|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x64.Build.0 = Release|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x86.ActiveCfg = Release|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x86.Build.0 = Release|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x64.ActiveCfg = Debug|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x64.Build.0 = Debug|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x86.ActiveCfg = Debug|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x86.Build.0 = Debug|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.ActiveCfg = Release|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.Build.0 = Release|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x86.ActiveCfg = Release|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x86.Build.0 = Release|Win32
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x64.ActiveCfg = Debug|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x86.ActiveCfg = Debug|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x64.ActiveCfg = Release|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x86.ActiveCfg = Release|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x64.ActiveCfg = Debug|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x64.Build.0 = Debug|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x86.ActiveCfg = Debug|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x86.Build.0 = Debug|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x64.ActiveCfg = Release|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x64.Build.0 = Release|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x86.ActiveCfg = Release|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x86.Build.0 = Release|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x64.ActiveCfg = Debug|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x64.Build.0 = Debug|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x86.ActiveCfg = Debug|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x86.Build.0 = Debug|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x64.ActiveCfg = Release|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x64.Build.0 = Release|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x86.ActiveCfg = Release|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Aerofoil/Aerofoil.vcxproj

@@ -73,6 +73,7 @@
     <Import Project="..\GpMainApp.props" />
     <Import Project="..\FreeTypePublic.props" />
     <Import Project="..\FreeTypeImport.props" />
+    <Import Project="..\Release.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -91,6 +92,7 @@
     <Import Project="..\GpMainApp.props" />
     <Import Project="..\FreeTypePublic.props" />
     <Import Project="..\FreeTypeImport.props" />
+    <Import Project="..\Release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -154,13 +156,11 @@
     <ClCompile Include="GpFontHandler_FreeType2.cpp" />
     <ClCompile Include="GpGlobalConfig.cpp" />
     <ClCompile Include="GpInputDriverFactory.cpp" />
+    <ClCompile Include="GpLogDriver_Win32.cpp" />
     <ClCompile Include="GpMain.cpp" />
     <ClCompile Include="GpMain_Win32.cpp" />
     <ClCompile Include="GpMemoryBuffer.cpp" />
     <ClCompile Include="GpMutex_Win32.cpp" />
-    <ClCompile Include="GpPLGlueAudioChannel.cpp" />
-    <ClCompile Include="GpPLGlueAudioDriver.cpp" />
-    <ClCompile Include="GpPLGlueDisplayDriver.cpp" />
     <ClCompile Include="GpSystemServices_Win32.cpp" />
     <ClCompile Include="GpFiberStarter_Win32.cpp" />
     <ClCompile Include="GpThreadEvent_Win32.cpp" />
@@ -173,16 +173,13 @@
     <ClInclude Include="..\GpCommon\GpDisplayDriverTickStatus.h" />
     <ClInclude Include="..\GpCommon\GpFileCreationDisposition.h" />
     <ClInclude Include="..\GpCommon\GpInputDriverProperties.h" />
-    <ClInclude Include="..\GpCommon\IGpColorCursor.h" />
+    <ClInclude Include="..\GpCommon\IGpCursor.h" />
     <ClInclude Include="..\GpCommon\IGpAudioChannelCallbacks.h" />
-    <ClInclude Include="..\GpCommon\GpColorCursor_Win32.h" />
     <ClInclude Include="..\GpCommon\IGpDisplayDriverSurface.h" />
+    <ClInclude Include="..\GpCommon\IGpLogDriver.h" />
     <ClInclude Include="GpAppEnvironment.h" />
     <ClInclude Include="GpAudioDriverFactory.h" />
-    <ClInclude Include="GpComPtr.h" />
-    <ClInclude Include="GpCoreDefs.h" />
     <ClInclude Include="GpDisplayDriverFactory.h" />
-    <ClInclude Include="GpFiber.h" />
     <ClInclude Include="GpFiber_Win32.h" />
     <ClInclude Include="GpFileStream_Win32.h" />
     <ClInclude Include="GpFileSystem_Win32.h" />
@@ -190,21 +187,14 @@
     <ClInclude Include="GpFontHandlerFactory.h" />
     <ClInclude Include="GpGlobalConfig.h" />
     <ClInclude Include="GpInputDriverFactory.h" />
+    <ClInclude Include="GpLogDriver_Win32.h" />
     <ClInclude Include="GpMain.h" />
     <ClInclude Include="GpMemoryBuffer.h" />
     <ClInclude Include="GpMutex_Win32.h" />
-    <ClInclude Include="GpPLGlueAudioChannel.h" />
-    <ClInclude Include="GpPLGlueAudioDriver.h" />
-    <ClInclude Include="GpPLGlueDisplayDriver.h" />
-    <ClInclude Include="GpRingBuffer.h" />
     <ClInclude Include="GpSystemServices_Win32.h" />
     <ClInclude Include="GpFiberStarter.h" />
     <ClInclude Include="GpThreadEvent_Win32.h" />
     <ClInclude Include="GpVOSEventQueue.h" />
-    <ClInclude Include="GpWindows.h" />
-    <ClInclude Include="IGpAudioChannel.h" />
-    <ClInclude Include="IGpAudioDriver.h" />
-    <ClInclude Include="IGpDisplayDriver.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

Aerofoil/Aerofoil.vcxproj.filters

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="GpVOSEventQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpAppEnvironment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpAudioDriverFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpColorCursor_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpDisplayDriverFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFiber_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFiberStarter_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFileStream_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFileSystem_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFontHandler_FreeType2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpFontHandlerFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpGlobalConfig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpInputDriverFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpMain_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpMemoryBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpMutex_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpSystemServices_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpThreadEvent_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GpLogDriver_Win32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\GpCommon\EGpInputDriverType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\EGpStandardCursor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpAppEnvironment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\GpApplicationName.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpAudioDriverFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpDisplayDriverFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\GpDisplayDriverTickStatus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFiber_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFiberStarter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\GpFileCreationDisposition.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFileStream_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFileSystem_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFontHandler_FreeType2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpFontHandlerFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpGlobalConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpInputDriverFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\GpInputDriverProperties.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpMain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpMemoryBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpMutex_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpSystemServices_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpThreadEvent_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpVOSEventQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\IGpAudioChannelCallbacks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\IGpCursor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\IGpDisplayDriverSurface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Resource Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GpCommon\IGpLogDriver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GpLogDriver_Win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ConvertedResources\Large128.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="ConvertedResources\Small128.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{0db467fa-83af-4c89-b36b-2478899f4f9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bdb8c57b-c9f7-443a-be30-89718b8ca3e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{8ed8ebed-2aea-4f6d-8f2f-c18a64eb6e20}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Aerofoil.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Aerofoil/GpAppEnvironment.cpp

@@ -3,8 +3,6 @@
 #include "GpAppInterface.h"
 #include "GpDisplayDriverTickStatus.h"
 #include "GpFontHandlerFactory.h"
-#include "GpPLGlueAudioDriver.h"
-#include "GpPLGlueDisplayDriver.h"
 #include "HostSuspendCallArgument.h"
 #include "IGpDisplayDriver.h"
 #include "IGpFiber.h"
@@ -96,6 +94,11 @@ void GpAppEnvironment::Render()
 	GpAppInterface_Get()->PL_Render(m_displayDriver);
 }
 
+bool GpAppEnvironment::AdjustRequestedResolution(uint32_t &physicalWidth, uint32_t &physicalHeight, uint32_t &virtualWidth, uint32_t &virtualheight, float &pixelScaleX, float &pixelScaleY)
+{
+	return GpAppInterface_Get()->PL_AdjustRequestedResolution(physicalWidth, physicalHeight, virtualWidth, virtualheight, pixelScaleX, pixelScaleY);
+}
+
 void GpAppEnvironment::SetDisplayDriver(IGpDisplayDriver *displayDriver)
 {
 	m_displayDriver = displayDriver;
@@ -137,15 +140,12 @@ void GpAppEnvironment::AppThreadFunc()
 
 void GpAppEnvironment::InitializeApplicationState()
 {
-	GpAppInterface_Get()->PL_HostDisplayDriver_SetInstance(GpPLGlueDisplayDriver::GetInstance());
-	GpAppInterface_Get()->PL_HostAudioDriver_SetInstance(GpPLGlueAudioDriver::GetInstance());
+	GpAppInterface_Get()->PL_HostDisplayDriver_SetInstance(m_displayDriver);
+	GpAppInterface_Get()->PL_HostAudioDriver_SetInstance(m_audioDriver);
 	GpAppInterface_Get()->PL_InstallHostSuspendHook(GpAppEnvironment::StaticSuspendHookFunc, this);
 
 	GpAppInterface_Get()->PL_HostFontHandler_SetInstance(m_fontHandler);
 	GpAppInterface_Get()->PL_HostVOSEventQueue_SetInstance(m_vosEventQueue);
-
-	GpPLGlueDisplayDriver::GetInstance()->SetGpDisplayDriver(m_displayDriver);
-	GpPLGlueAudioDriver::GetInstance()->SetGpAudioDriver(m_audioDriver);
 }
 
 void GpAppEnvironment::SynchronizeState()
@@ -175,6 +175,10 @@ void GpAppEnvironment::DispatchSystemCall(PortabilityLayer::HostSuspendCallID ca
 		m_applicationState = ApplicationState_TimedSuspend;
 		m_delaySuspendTicks = args[0].m_uint;
 		break;
+	case PortabilityLayer::HostSuspendCallID_CallOnVOSThread:
+		args[0].m_functionPtr(static_cast<const PortabilityLayer::HostSuspendCallArgument*>(args[1].m_constPointer), static_cast<PortabilityLayer::HostSuspendCallArgument*>(args[2].m_pointer));
+		m_applicationState = ApplicationState_Running;
+		break;
 	default:
 		assert(false);
 	}

Aerofoil/GpAppEnvironment.h

@@ -28,6 +28,7 @@ public:
 
 	GpDisplayDriverTickStatus_t Tick(IGpFiber *vosFiber);
 	void Render();
+	bool AdjustRequestedResolution(uint32_t &physicalWidth, uint32_t &physicalHeight, uint32_t &virtualWidth, uint32_t &virtualheight, float &pixelScaleX, float &pixelScaleY);
 
 	void SetDisplayDriver(IGpDisplayDriver *displayDriver);
 	void SetAudioDriver(IGpAudioDriver *audioDriver);

Aerofoil/GpColorCursor_Win32.cpp

@@ -1,14 +1,14 @@
-#include "GpColorCursor_Win32.h"
+#include "GpCursor_Win32.h"
 
 #include <stdlib.h>
 #include <new>
 
-void GpColorCursor_Win32::Destroy()
+void GpCursor_Win32::Destroy()
 {
 	this->DecRef();
 }
 
-IGpColorCursor_Win32 *GpColorCursor_Win32::Load(const wchar_t *path)
+IGpCursor_Win32 *GpCursor_Win32::Load(const wchar_t *path)
 {
 	HANDLE imageH = LoadImageW(nullptr, path, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
 
@@ -16,43 +16,43 @@ IGpColorCursor_Win32 *GpColorCursor_Win32::Load(const wchar_t *path)
 		return nullptr;
 
 	HCURSOR cursor = reinterpret_cast<HCURSOR>(imageH);
-	void *storage = malloc(sizeof(GpColorCursor_Win32));
+	void *storage = malloc(sizeof(GpCursor_Win32));
 	if (!storage)
 	{
 		DestroyCursor(cursor);
 		return nullptr;
 	}
 
-	return new (storage) GpColorCursor_Win32(reinterpret_cast<HCURSOR>(cursor));
+	return new (storage) GpCursor_Win32(reinterpret_cast<HCURSOR>(cursor));
 }
 
-GpColorCursor_Win32::GpColorCursor_Win32(HCURSOR cursor)
+GpCursor_Win32::GpCursor_Win32(HCURSOR cursor)
 	: m_cursor(cursor)
 	, m_refCount(1)
 {
 }
 
-GpColorCursor_Win32::~GpColorCursor_Win32()
+GpCursor_Win32::~GpCursor_Win32()
 {
 	DestroyCursor(m_cursor);
 }
 
-const HCURSOR &GpColorCursor_Win32::GetHCursor() const
+const HCURSOR &GpCursor_Win32::GetHCursor() const
 {
 	return m_cursor;
 }
 
-void GpColorCursor_Win32::IncRef()
+void GpCursor_Win32::IncRef()
 {
 	m_refCount++;
 }
 
-void GpColorCursor_Win32::DecRef()
+void GpCursor_Win32::DecRef()
 {
 	m_refCount--;
 	if (m_refCount == 0)
 	{
-		this->~GpColorCursor_Win32();
+		this->~GpCursor_Win32();
 		free(this);
 	}
 }

Aerofoil/GpFiberStarter_Win32.cpp

@@ -32,10 +32,14 @@ IGpFiber *GpFiberStarter::StartFiber(ThreadFunc_t threadFunc, void *context, IGp
 {
 	ULONG_PTR lowLimit;
 	ULONG_PTR highLimit;
-
+
+#if 0
 	GetCurrentThreadStackLimits(&lowLimit, &highLimit);
 
-	ULONG_PTR stackSize = highLimit - lowLimit;
+	ULONG_PTR stackSize = highLimit - lowLimit;
+#else
+	ULONG_PTR stackSize = 1024 * 1024;
+#endif
 
 	GpFiberStarter_Win32::FiberStartState startState;
 	startState.m_context = context;

Aerofoil/GpFileStream_Win32.cpp

@@ -46,8 +46,11 @@ size_t GpFileStream_Win32::Write(const void *bytes, size_t size)
 		DWORD numWritten = 0;
 
 		BOOL writeSucceeded = WriteFile(m_handle, bytes, chunkSizeToWrite, &numWritten, nullptr);
-		if (!writeSucceeded)
-			return totalWritten;
+		if (!writeSucceeded)
+		{
+			DWORD lastError = GetLastError();
+			return totalWritten;
+		}
 
 		totalWritten += static_cast<size_t>(numWritten);
 		size -= static_cast<size_t>(numWritten);
@@ -92,7 +95,7 @@ bool GpFileStream_Win32::SeekCurrent(PortabilityLayer::FilePos_t loc)
 bool GpFileStream_Win32::SeekEnd(PortabilityLayer::UFilePos_t loc)
 {
 	LARGE_INTEGER li;
-	li.QuadPart = static_cast<LONGLONG>(loc);
+	li.QuadPart = -static_cast<LONGLONG>(loc);
 	return SetFilePointerEx(m_handle, li, nullptr, FILE_END) != 0;
 }
 
@@ -139,3 +142,8 @@ void GpFileStream_Win32::Close()
 {
 	CloseHandle(m_handle);
 }
+
+void GpFileStream_Win32::Flush()
+{
+	FlushFileBuffers(m_handle);
+}

Aerofoil/GpFileStream_Win32.h

@@ -20,7 +20,8 @@ public:
 	bool Truncate(PortabilityLayer::UFilePos_t loc) override;
 	PortabilityLayer::UFilePos_t Size() const override;
 	PortabilityLayer::UFilePos_t Tell() const override;
-	void Close() override;
+	void Close() override;
+	void Flush() override;
 
 private:
 	HANDLE m_handle;

Aerofoil/GpFileSystem_Win32.cpp

@@ -13,6 +13,8 @@
 
 #include <assert.h>
 
+extern GpWindowsGlobals g_gpWindowsGlobals;
+
 class GpDirectoryCursor_Win32 final : public PortabilityLayer::HostDirectoryCursor
 {
 public:
@@ -120,16 +122,19 @@ GpFileSystem_Win32::GpFileSystem_Win32()
 		m_userHousesDir = m_prefsDir + L"\\Houses";
 		m_userSavesDir = m_prefsDir + L"\\SavedGames";
 		m_scoresDir = m_prefsDir + L"\\Scores";
+		m_logsDir = m_prefsDir + L"\\Logs";
 
 		CreateDirectoryW(m_prefsDir.c_str(), nullptr);
 		CreateDirectoryW(m_scoresDir.c_str(), nullptr);
 		CreateDirectoryW(m_userHousesDir.c_str(), nullptr);
 		CreateDirectoryW(m_userSavesDir.c_str(), nullptr);
+		CreateDirectoryW(m_logsDir.c_str(), nullptr);
 
 		m_prefsDir.append(L"\\");
 		m_scoresDir.append(L"\\");
 		m_userHousesDir.append(L"\\");
 		m_userSavesDir.append(L"\\");
+		m_logsDir.append(L"\\");
 	}
 
 	DWORD modulePathSize = GetModuleFileNameW(nullptr, m_executablePath, MAX_PATH);
@@ -201,6 +206,7 @@ bool GpFileSystem_Win32::FileLocked(PortabilityLayer::VirtualDirectory_t virtual
 		return false;
 	}
 
+	*exists = true;
 	return (attribs & FILE_ATTRIBUTE_READONLY) != 0;
 }
 
@@ -306,6 +312,7 @@ bool GpFileSystem_Win32::PromptSaveFile(PortabilityLayer::VirtualDirectory_t vir
 	ofn.nMaxFile = MAX_PATH;
 	ofn.lpstrInitialDir = baseDir;
 	ofn.Flags = OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT;
+	ofn.hwndOwner = g_gpWindowsGlobals.m_hwnd;
 
 	if (!GetSaveFileNameW(&ofn))
 		return false;
@@ -386,6 +393,7 @@ bool GpFileSystem_Win32::PromptOpenFile(PortabilityLayer::VirtualDirectory_t vir
 	ofn.nMaxFile = MAX_PATH;
 	ofn.lpstrInitialDir = baseDir;
 	ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST;
+	ofn.hwndOwner = g_gpWindowsGlobals.m_hwnd;
 
 	if (!GetOpenFileNameW(&ofn))
 		return false;
@@ -509,6 +517,9 @@ bool GpFileSystem_Win32::ResolvePath(PortabilityLayer::VirtualDirectory_t virtua
 	case PortabilityLayer::VirtualDirectories::kHighScores:
 		baseDir = m_scoresDir.c_str();
 		break;
+	case PortabilityLayer::VirtualDirectories::kLogs:
+		baseDir = m_logsDir.c_str();
+		break;
 	default:
 		return false;
 	}

Aerofoil/GpFileSystem_Win32.h

@@ -34,6 +34,7 @@ private:
 	std::wstring m_scoresDir;
 	std::wstring m_packagedDir;
 	std::wstring m_housesDir;
+	std::wstring m_logsDir;
 	std::wstring m_userHousesDir;
 	std::wstring m_userSavesDir;
 	std::wstring m_resourcesDir;

Aerofoil/GpFontHandler_FreeType2.cpp

@@ -39,7 +39,7 @@ class GpFont_FreeType2 final : public PortabilityLayer::HostFont
 {
 public:
 	void Destroy() override;
-	GpFontRenderedGlyph_FreeType2 *Render(uint32_t unicodeCodePoint, unsigned int size) override;
+	GpFontRenderedGlyph_FreeType2 *Render(uint32_t unicodeCodePoint, unsigned int size, bool aa) override;
 	bool GetLineSpacing(unsigned int size, int32_t &outSpacing) override;
 
 	static GpFont_FreeType2 *Create(const FT_StreamRec_ &streamRec, PortabilityLayer::IOStream *stream);
@@ -106,7 +106,7 @@ void GpFont_FreeType2::Destroy()
 	free(this);
 }
 
-GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoint, unsigned int size)
+GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoint, unsigned int size, bool aa)
 {
 	if (m_currentSize != size)
 	{
@@ -120,16 +120,39 @@ GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoin
 	if (!glyphIndex)
 		return nullptr;
 
-	if (FT_Load_Glyph(m_face, glyphIndex, FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO) != 0)
+	FT_Int32 loadFlags = 0;
+	FT_Render_Mode renderMode = FT_RENDER_MODE_NORMAL;
+
+	if (aa)
+	{
+		renderMode = FT_RENDER_MODE_NORMAL;
+		loadFlags = FT_LOAD_TARGET_NORMAL;
+	}
+	else
+	{
+		loadFlags = FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO;
+		renderMode = FT_RENDER_MODE_MONO;
+	}
+
+	if (FT_Load_Glyph(m_face, glyphIndex, loadFlags) != 0)
 		return nullptr;
 
-	if (FT_Render_Glyph(m_face->glyph, FT_RENDER_MODE_MONO) != 0)
+	if (FT_Render_Glyph(m_face->glyph, renderMode) != 0)
 		return nullptr;
 
 	const FT_GlyphSlot glyph = m_face->glyph;
 
-	if (glyph->bitmap.pixel_mode != FT_PIXEL_MODE_MONO)
-		return nullptr;	// ????
+	if (aa == false && glyph->bitmap.pixel_mode != FT_PIXEL_MODE_MONO)
+		return nullptr;
+
+	if (aa == true)
+	{
+		if (glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
+			return nullptr;
+
+		if (glyph->bitmap.num_grays < 2)
+			return nullptr;	// This should never happen
+	}
 
 	PortabilityLayer::RenderedGlyphMetrics metrics;
 	memset(&metrics, 0, sizeof(metrics));
@@ -141,7 +164,13 @@ GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoin
 	metrics.m_advanceX = glyph->metrics.horiAdvance / 64;
 
 	const size_t numRowsRequired = glyph->bitmap.rows;
-	size_t pitchRequired = (glyph->bitmap.width + 7) / 8;
+	size_t pitchRequired = 0;
+
+	if (aa)
+		pitchRequired = (glyph->bitmap.width + 1) / 2;
+	else
+		pitchRequired = (glyph->bitmap.width + 7) / 8;
+
 	pitchRequired = pitchRequired + (GP_SYSTEM_MEMORY_ALIGNMENT - 1);
 	pitchRequired -= pitchRequired % GP_SYSTEM_MEMORY_ALIGNMENT;
 
@@ -158,8 +187,8 @@ GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoin
 	unsigned int bmWidth = glyph->bitmap.width;
 	unsigned int bmHeight = glyph->bitmap.rows;
 	unsigned int bmPitch = glyph->bitmap.pitch;
-	unsigned int copyableBytesPerRow = (bmWidth + 7) / 8;
 	const uint8_t *bmBytes = glyph->bitmap.buffer;
+	const uint16_t numGrays = glyph->bitmap.num_grays;
 
 	size_t fillOffset = 0;
 	for (unsigned int row = 0; row < bmHeight; row++)
@@ -167,15 +196,36 @@ GpFontRenderedGlyph_FreeType2 *GpFont_FreeType2::Render(uint32_t unicodeCodePoin
 		const uint8_t *bmReadStart = bmBytes + bmPitch * row;
 		uint8_t *bmWriteStart = fillData + pitchRequired * row;
 
-		for (unsigned int i = 0; i < copyableBytesPerRow; i++)
+		if (aa)
 		{
-			const uint8_t b = bmReadStart[i];
+			for (size_t i = 0; i < pitchRequired; i++)
+				bmWriteStart[i] = 0;
 
-			uint8_t fillByte = 0;
-			for (int bit = 0; bit < 8; bit++)
-				fillByte |= ((b >> (7 - bit)) & 1) << bit;
+			for (size_t i = 0; i < bmWidth; i++)
+			{
+				const uint8_t b = bmReadStart[i];
+				const uint8_t normalizedGray = (b * 30 + (numGrays - 1)) / ((numGrays - 1) * 2);
 
-			bmWriteStart[i] = fillByte;
+				if (i & 1)
+					bmWriteStart[i / 2] |= (normalizedGray << 4);
+				else
+					bmWriteStart[i / 2] = normalizedGray;
+			}
+		}
+		else
+		{
+			const size_t copyableBytesPerRow = (glyph->bitmap.width + 7) / 8;
+
+			for (size_t i = 0; i < copyableBytesPerRow; i++)
+			{
+				const uint8_t b = bmReadStart[i];
+
+				uint8_t fillByte = 0;
+				for (int bit = 0; bit < 8; bit++)
+					fillByte |= ((b >> (7 - bit)) & 1) << bit;
+
+				bmWriteStart[i] = fillByte;
+			}
 		}
 	}
 

Aerofoil/GpGlobalConfig.h

@@ -2,7 +2,9 @@
 
 #include "EGpDisplayDriverType.h"
 #include "EGpAudioDriverType.h"
-#include "EGpInputDriverType.h"
+#include "EGpInputDriverType.h"
+
+struct IGpLogDriver;
 
 struct GpGlobalConfig
 {
@@ -11,6 +13,7 @@ struct GpGlobalConfig
 	const EGpInputDriverType *m_inputDriverTypes;
 	size_t m_numInputDrivers;
 
+	IGpLogDriver *m_logger;
 	void *m_osGlobals;
 };
 

Aerofoil/GpLogDriver_Win32.cpp

@@ -0,0 +1,113 @@
+#include "GpLogDriver_Win32.h"
+#include "GpFileSystem_Win32.h"
+
+#include "GpApplicationName.h"
+#include "IOStream.h"
+
+GpLogDriver_Win32::GpLogDriver_Win32()
+	: m_stream(nullptr)
+	, m_isInitialized(false)
+{
+}
+
+void GpLogDriver_Win32::Init()
+{
+	ms_instance.InitInternal();
+}
+
+void GpLogDriver_Win32::VPrintf(Category category, const char *fmt, va_list args)
+{
+	size_t fmtSize = 0;
+	bool hasFormatting = false;
+	for (const char *fmtCheck = fmt; *fmtCheck; fmtCheck++)
+	{
+		if (*fmtCheck == '%')
+			hasFormatting = true;
+
+		fmtSize++;
+	}
+
+	SYSTEMTIME sysTime;
+	GetSystemTime(&sysTime);
+
+	char timestampBuffer[64];
+	sprintf(timestampBuffer, "[%02d:%02d:%02d:%03d] ", sysTime.wHour, sysTime.wMinute, sysTime.wSecond, sysTime.wMilliseconds);
+
+	m_stream->Write(timestampBuffer, strlen(timestampBuffer));
+
+	const char *debugTag = "";
+
+	switch (category)
+	{
+	case Category_Warning:
+		debugTag = "[WARNING] ";
+		break;
+	case Category_Error:
+		debugTag = "[ERROR] ";
+		break;
+	};
+
+	if (debugTag[0])
+		m_stream->Write(debugTag, strlen(debugTag));
+
+	if (!hasFormatting)
+		m_stream->Write(fmt, fmtSize);
+	else
+	{
+		int formattedSize = vsnprintf(nullptr, 0, fmt, args);
+		if (formattedSize <= 0)
+			return;
+
+		char *charBuff = static_cast<char*>(malloc(formattedSize + 1));
+		if (!charBuff)
+			return;
+
+		vsnprintf(charBuff, formattedSize + 1, fmt, args);
+
+		m_stream->Write(charBuff, formattedSize);
+		free(charBuff);
+	}
+
+	m_stream->Write("\n", 1);
+
+	m_stream->Flush();
+}
+
+void GpLogDriver_Win32::Shutdown()
+{
+	if (m_stream)
+		m_stream->Close();
+}
+
+GpLogDriver_Win32 *GpLogDriver_Win32::GetInstance()
+{
+	if (ms_instance.m_isInitialized)
+		return &ms_instance;
+	else
+		return nullptr;
+}
+
+void GpLogDriver_Win32::InitInternal()
+{
+	SYSTEMTIME utcTime;
+	GetSystemTime(&utcTime);
+
+	char logFileName[256];
+
+	sprintf(logFileName, GP_APPLICATION_NAME "-%04d-%02d-%02d_%02d-%02d_%02d.txt", utcTime.wYear, utcTime.wMonth, utcTime.wDay, utcTime.wHour, utcTime.wMinute, utcTime.wSecond);
+
+	m_stream = GpFileSystem_Win32::GetInstance()->OpenFile(PortabilityLayer::VirtualDirectories::kLogs, logFileName, true, GpFileCreationDispositions::kCreateOrOverwrite);
+	if (m_stream)
+	{
+		this->Printf(IGpLogDriver::Category_Information, GP_APPLICATION_NAME " build " __TIMESTAMP__);
+#ifdef NDEBUG
+		this->Printf(IGpLogDriver::Category_Information, "Configuration: Release");
+#else
+		this->Printf(IGpLogDriver::Category_Information, "Configuration: Debug");
+#endif
+
+		m_isInitialized = true;
+	}
+}
+
+GpLogDriver_Win32 GpLogDriver_Win32::ms_instance;

Aerofoil/GpLogDriver_Win32.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "IGpLogDriver.h"
+
+namespace PortabilityLayer
+{
+	class IOStream;
+}
+
+class GpLogDriver_Win32 : public IGpLogDriver
+{
+public:
+	GpLogDriver_Win32();
+
+	static void Init();
+
+	void VPrintf(Category category, const char *fmt, va_list args) override;
+	void Shutdown() override;
+
+	static GpLogDriver_Win32 *GetInstance();
+
+private:
+	void InitInternal();
+
+	PortabilityLayer::IOStream *m_stream;
+	bool m_isInitialized;
+
+	static GpLogDriver_Win32 ms_instance;
+};

Aerofoil/GpMain.cpp

@@ -27,6 +27,11 @@ namespace
 	{
 		static_cast<GpAppEnvironment*>(context)->Render();
 	}
+
+	bool AdjustRequestedResolution(void *context, uint32_t &physicalWidth, uint32_t &physicalHeight, uint32_t &virtualWidth, uint32_t &virtualheight, float &pixelScaleX, float &pixelScaleY)
+	{
+		return static_cast<GpAppEnvironment*>(context)->AdjustRequestedResolution(physicalWidth, physicalHeight, virtualWidth, virtualheight, pixelScaleX, pixelScaleY);
+	}
 }
 
 int GpMain::Run()
@@ -52,9 +57,13 @@ int GpMain::Run()
 	ddProps.m_renderFunc = RenderAppEnvironment;
 	ddProps.m_renderFuncContext = appEnvironment;
 
+	ddProps.m_adjustRequestedResolutionFunc = AdjustRequestedResolution;
+	ddProps.m_adjustRequestedResolutionFuncContext = appEnvironment;
+
 	ddProps.m_type = g_gpGlobalConfig.m_displayDriverType;
 	ddProps.m_osGlobals = g_gpGlobalConfig.m_osGlobals;
 	ddProps.m_eventQueue = eventQueue;
+	ddProps.m_logger = g_gpGlobalConfig.m_logger;
 
 	GpAudioDriverProperties adProps;
 	memset(&adProps, 0, sizeof(adProps));
@@ -63,7 +72,12 @@ int GpMain::Run()
 	// This appears to be the "standard" Mac sample rate, probably rounded from 244800/11.
 	adProps.m_type = g_gpGlobalConfig.m_audioDriverType;
 	adProps.m_sampleRate = (244800 * 2 + 11) / (11 * 2);
+#ifdef NDEBUG
+	adProps.m_debug = false;
+#else
 	adProps.m_debug = true;
+#endif
+	adProps.m_logger = g_gpGlobalConfig.m_logger;
 
 	IGpInputDriver **inputDrivers = static_cast<IGpInputDriver**>(malloc(sizeof(IGpInputDriver*) * g_gpGlobalConfig.m_numInputDrivers));
 

Aerofoil/GpMain_Win32.cpp

@@ -1,10 +1,11 @@
 #include "GpMain.h"
 #include "GpAudioDriverFactory.h"
-#include "GpColorCursor_Win32.h"
+#include "GpCursor_Win32.h"
 #include "GpDisplayDriverFactory.h"
 #include "GpGlobalConfig.h"
 #include "GpFiber_Win32.h"
 #include "GpFileSystem_Win32.h"
+#include "GpLogDriver_Win32.h"
 #include "GpInputDriverFactory.h"
 #include "GpAppInterface.h"
 #include "GpSystemServices_Win32.h"
@@ -15,6 +16,9 @@
 
 #include "GpWindows.h"
 
+#include "resource.h"
+
+#include <shellapi.h>
 #include <stdio.h>
 #include <windowsx.h>
 
@@ -24,7 +28,7 @@ extern "C" __declspec(dllimport) IGpAudioDriver *GpDriver_CreateAudioDriver_XAud
 extern "C" __declspec(dllimport) IGpDisplayDriver *GpDriver_CreateDisplayDriver_D3D11(const GpDisplayDriverProperties &properties);
 extern "C" __declspec(dllimport) IGpInputDriver *GpDriver_CreateInputDriver_XInput(const GpInputDriverProperties &properties);
 
-static void PostMouseEvent(IGpVOSEventQueue *eventQueue, GpMouseEventType_t eventType, GpMouseButton_t button, int32_t x, int32_t y)
+static void PostMouseEvent(IGpVOSEventQueue *eventQueue, GpMouseEventType_t eventType, GpMouseButton_t button, int32_t x, int32_t y, float pixelScaleX, float pixelScaleY)
 {
 	if (GpVOSEvent *evt = eventQueue->QueueEvent())
 	{
@@ -35,6 +39,12 @@ static void PostMouseEvent(IGpVOSEventQueue *eventQueue, GpMouseEventType_t even
 		mEvent.m_x = x;
 		mEvent.m_y = y;
 		mEvent.m_eventType = eventType;
+
+		if (pixelScaleX != 1.0f)
+			mEvent.m_x = static_cast<int32_t>(static_cast<float>(x) / pixelScaleX);
+
+		if (pixelScaleY != 1.0f)
+			mEvent.m_y = static_cast<int32_t>(static_cast<float>(y) / pixelScaleX);
 	}
 }
 
@@ -277,7 +287,7 @@ static bool IdentifyVKey(const WPARAM &wparam, const LPARAM &lparam, GpKeyIDSubs
 	return true;
 }
 
-static void PostKeyboardEvent(IGpVOSEventQueue *eventQueue, GpKeyboardInputEventType_t eventType, GpKeyIDSubset_t subset, const GpKeyboardInputEvent::KeyUnion &key)
+static void PostKeyboardEvent(IGpVOSEventQueue *eventQueue, GpKeyboardInputEventType_t eventType, GpKeyIDSubset_t subset, const GpKeyboardInputEvent::KeyUnion &key, uint32_t repeatCount)
 {
 	if (GpVOSEvent *evt = eventQueue->QueueEvent())
 	{
@@ -287,10 +297,11 @@ static void PostKeyboardEvent(IGpVOSEventQueue *eventQueue, GpKeyboardInputEvent
 		mEvent.m_key = key;
 		mEvent.m_eventType = eventType;
 		mEvent.m_keyIDSubset = subset;
+		mEvent.m_repeatCount = repeatCount;
 	}
 }
 
-static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue)
+static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue, float pixelScaleX, float pixelScaleY)
 {
 	WPARAM wParam = msg->wParam;
 	LPARAM lParam = msg->lParam;
@@ -298,48 +309,52 @@ static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue
 	switch (msg->message)
 	{
 		case WM_LBUTTONDOWN:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_LBUTTONUP:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_MBUTTONDOWN:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_MBUTTONUP:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_RBUTTONDOWN:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_RBUTTONUP:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_XBUTTONDOWN:
 			if (GET_XBUTTON_WPARAM(wParam) == XBUTTON1)
-				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			else if (GET_XBUTTON_WPARAM(wParam) == XBUTTON2)
-				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_XBUTTONUP:
 			if (GET_XBUTTON_WPARAM(wParam) == XBUTTON1)
-				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			else if (GET_XBUTTON_WPARAM(wParam) == XBUTTON2)
-				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_MOUSEMOVE:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kMove, GpMouseButtons::kNone, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kMove, GpMouseButtons::kNone, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), pixelScaleX, pixelScaleY);
 			break;
 		case WM_MOUSELEAVE:
-			PostMouseEvent(eventQueue, GpMouseEventTypes::kLeave, GpMouseButtons::kNone, 0, 0);
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kLeave, GpMouseButtons::kNone, 0, 0, pixelScaleX, pixelScaleY);
 			break;
 		case WM_KEYDOWN:
 		case WM_SYSKEYDOWN:
 			{
 				GpKeyIDSubset_t subset;
 				GpKeyboardInputEvent::KeyUnion key;
+				bool isRepeat = ((lParam & 0x40000000) != 0);
+				const GpKeyboardInputEventType_t keyEventType = isRepeat ? GpKeyboardInputEventTypes::kAuto : GpKeyboardInputEventTypes::kDown;
 				if (IdentifyVKey(wParam, lParam, subset, key))
-					PostKeyboardEvent(eventQueue, GpKeyboardInputEventTypes::kDown, subset, key);
+					PostKeyboardEvent(eventQueue, keyEventType, subset, key, static_cast<uint32_t>(lParam & 0xffff));
+
+				(void)TranslateMessage(msg);
 			}
 			break;
 		case WM_KEYUP:
@@ -348,10 +363,31 @@ static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue
 				GpKeyIDSubset_t subset;
 				GpKeyboardInputEvent::KeyUnion key;
 				if (IdentifyVKey(wParam, lParam, subset, key))
-					PostKeyboardEvent(eventQueue, GpKeyboardInputEventTypes::kUp, subset, key);
+					PostKeyboardEvent(eventQueue, GpKeyboardInputEventTypes::kUp, subset, key, (lParam & 0xffff));
 			}
 			break;
 		case WM_CHAR:
+		case WM_UNICHAR:
+			{
+				bool isRepeat = ((lParam & 0x4000000) != 0);
+				const GpKeyboardInputEventType_t keyEventType = isRepeat ? GpKeyboardInputEventTypes::kAutoChar : GpKeyboardInputEventTypes::kDownChar;
+				GpKeyboardInputEvent::KeyUnion key;
+				GpKeyIDSubset_t subset = GpKeyIDSubsets::kASCII;
+				if (wParam <= 128)
+					key.m_asciiChar = static_cast<char>(wParam);
+				else
+				{
+					subset = GpKeyIDSubsets::kUnicode;
+					key.m_unicodeChar = static_cast<uint32_t>(wParam);
+				}
+				PostKeyboardEvent(eventQueue, keyEventType, subset, key, (lParam & 0xffff));
+			}
+			break;
+		case WM_QUIT:
+			{
+				if (GpVOSEvent *evt = eventQueue->QueueEvent())
+					evt->m_eventType = GpVOSEventTypes::kQuit;
+			}
 			break;
 		default:
 			break;
@@ -360,20 +396,40 @@ static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
+	LPWSTR cmdLine = GetCommandLineW();
+
+	int nArgs;
+	LPWSTR *cmdLineArgs = CommandLineToArgvW(cmdLine, &nArgs);
+
+	for (int i = 1; i < nArgs; i++)
+	{
+		if (!wcscmp(cmdLineArgs[i], L"-diagnostics"))
+			GpLogDriver_Win32::Init();
+	}
+
+	IGpLogDriver *logger = GpLogDriver_Win32::GetInstance();
+
 	GpAppInterface_Get()->PL_HostFileSystem_SetInstance(GpFileSystem_Win32::GetInstance());
 	GpAppInterface_Get()->PL_HostSystemServices_SetInstance(GpSystemServices_Win32::GetInstance());
+	GpAppInterface_Get()->PL_HostLogDriver_SetInstance(GpLogDriver_Win32::GetInstance());
 
 	g_gpWindowsGlobals.m_hInstance = hInstance;
 	g_gpWindowsGlobals.m_hPrevInstance = hPrevInstance;
-	g_gpWindowsGlobals.m_cmdLine = lpCmdLine;
+	g_gpWindowsGlobals.m_cmdLine = cmdLine;
+	g_gpWindowsGlobals.m_cmdLineArgc = nArgs;
+	g_gpWindowsGlobals.m_cmdLineArgv = cmdLineArgs;
 	g_gpWindowsGlobals.m_nCmdShow = nCmdShow;
 	g_gpWindowsGlobals.m_baseDir = GpFileSystem_Win32::GetInstance()->GetBasePath();
+	g_gpWindowsGlobals.m_hwnd = nullptr;
+	g_gpWindowsGlobals.m_hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_ICON1));
+	g_gpWindowsGlobals.m_hIconSm = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_ICON2));
 
 	g_gpWindowsGlobals.m_createFiberFunc = GpFiber_Win32::Create;
-	g_gpWindowsGlobals.m_loadColorCursorFunc = GpColorCursor_Win32::Load;
+	g_gpWindowsGlobals.m_loadCursorFunc = GpCursor_Win32::Load;
 	g_gpWindowsGlobals.m_translateWindowsMessageFunc = TranslateWindowsMessage;
 
 	g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_D3D11;
+
 	g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_XAudio2;
 
 	EGpInputDriverType inputDrivers[] =
@@ -385,10 +441,21 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	g_gpGlobalConfig.m_numInputDrivers = sizeof(inputDrivers) / sizeof(inputDrivers[0]);
 
 	g_gpGlobalConfig.m_osGlobals = &g_gpWindowsGlobals;
+	g_gpGlobalConfig.m_logger = logger;
 
 	GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_D3D11, GpDriver_CreateDisplayDriver_D3D11);
 	GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_XAudio2, GpDriver_CreateAudioDriver_XAudio2);
 	GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType_XInput, GpDriver_CreateInputDriver_XInput);
 
-	return GpMain::Run();
+	if (logger)
+		logger->Printf(IGpLogDriver::Category_Information, "Windows environment configured, starting up");
+
+	int returnCode = GpMain::Run();
+
+	if (logger)
+		logger->Printf(IGpLogDriver::Category_Information, "Windows environment exited with code %i, cleaning up", returnCode);
+
+	LocalFree(cmdLineArgs);
+
+	return returnCode;
 }

Aerofoil/GpPLGlueAudioChannel.cpp

@@ -1,54 +0,0 @@
-#include "GpPLGlueAudioChannel.h"
-#include "ClientAudioChannelContext.h"
-#include "IGpAudioChannel.h"
-
-#include <stdlib.h>
-#include <new>
-
-void GpPLGlueAudioChannel::SetClientAudioChannelContext(PortabilityLayer::ClientAudioChannelContext *context)
-{
-	m_clientContext = context;
-	m_audioChannel->SetAudioChannelContext(this);
-}
-
-void GpPLGlueAudioChannel::PostBuffer(const void *buffer, size_t bufferSize)
-{
-	m_audioChannel->PostBuffer(buffer, bufferSize);
-}
-
-void GpPLGlueAudioChannel::Stop()
-{
-	m_audioChannel->Stop();
-}
-
-void GpPLGlueAudioChannel::Destroy()
-{
-	this->~GpPLGlueAudioChannel();
-	free(this);
-}
-
-void GpPLGlueAudioChannel::NotifyBufferFinished()
-{
-	if (m_clientContext)
-		m_clientContext->NotifyBufferFinished();
-}
-
-GpPLGlueAudioChannel *GpPLGlueAudioChannel::Create(IGpAudioChannel *audioChannel)
-{
-	void *storage = malloc(sizeof(GpPLGlueAudioChannel));
-	if (!storage)
-		return nullptr;
-
-	return new (storage) GpPLGlueAudioChannel(audioChannel);
-}
-
-GpPLGlueAudioChannel::GpPLGlueAudioChannel(IGpAudioChannel *audioChannel)
-	: m_audioChannel(audioChannel)
-	, m_clientContext(nullptr)
-{
-}
-
-GpPLGlueAudioChannel::~GpPLGlueAudioChannel()
-{
-	m_audioChannel->Destroy();
-}

Aerofoil/GpPLGlueAudioChannel.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "HostAudioChannel.h"
-#include "IGpAudioChannelCallbacks.h"
-
-struct IGpAudioChannel;
-
-class GpPLGlueAudioChannel final : public PortabilityLayer::HostAudioChannel, public IGpAudioChannelCallbacks
-{
-public:
-	void SetClientAudioChannelContext(PortabilityLayer::ClientAudioChannelContext *context) override;
-	void PostBuffer(const void *buffer, size_t bufferSize) override;
-	void Stop() override;
-	void Destroy() override;
-
-	void NotifyBufferFinished() override;
-
-	static GpPLGlueAudioChannel *Create(IGpAudioChannel *audioChannel);
-
-private:
-	explicit GpPLGlueAudioChannel(IGpAudioChannel *audioChannel);
-	~GpPLGlueAudioChannel();
-
-	PortabilityLayer::ClientAudioChannelContext *m_clientContext;
-	IGpAudioChannel *m_audioChannel;
-};

Aerofoil/GpPLGlueAudioDriver.cpp

@@ -1,43 +0,0 @@
-#include "GpPLGlueAudioDriver.h"
-
-#include "GpPLGlueAudioChannel.h"
-#include "IGpAudioChannel.h"
-#include "IGpAudioDriver.h"
-
-GpPLGlueAudioDriver::GpPLGlueAudioDriver()
-	: m_audioDriver(nullptr)
-{
-}
-
-PortabilityLayer::HostAudioChannel *GpPLGlueAudioDriver::CreateChannel()
-{
-	IGpAudioChannel *channel = m_audioDriver->CreateChannel();
-	if (!channel)
-		return nullptr;
-
-	PortabilityLayer::HostAudioChannel *glueChannel = GpPLGlueAudioChannel::Create(channel);
-	if (!glueChannel)
-	{
-		channel->Destroy();
-		return nullptr;
-	}
-
-	return glueChannel;
-}
-
-void GpPLGlueAudioDriver::SetMasterVolume(uint32_t vol, uint32_t maxVolume)
-{
-	m_audioDriver->SetMasterVolume(vol, maxVolume);
-}
-
-GpPLGlueAudioDriver *GpPLGlueAudioDriver::GetInstance()
-{
-	return &ms_instance;
-}
-
-void GpPLGlueAudioDriver::SetGpAudioDriver(IGpAudioDriver *audioDriver)
-{
-	m_audioDriver = audioDriver;
-}
-
-GpPLGlueAudioDriver GpPLGlueAudioDriver::ms_instance;

Aerofoil/GpPLGlueAudioDriver.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "HostAudioDriver.h"
-
-struct IGpAudioDriver;
-
-class GpPLGlueAudioDriver final : public PortabilityLayer::HostAudioDriver
-{
-public:
-	GpPLGlueAudioDriver();
-
-	PortabilityLayer::HostAudioChannel *CreateChannel() override;
-	void SetMasterVolume(uint32_t vol, uint32_t maxVolume) override;
-
-	void SetGpAudioDriver(IGpAudioDriver *audioDriver);
-
-	static GpPLGlueAudioDriver *GetInstance();
-
-private:
-	IGpAudioDriver *m_audioDriver;
-
-	static GpPLGlueAudioDriver ms_instance;
-};

Aerofoil/GpPLGlueDisplayDriver.cpp

@@ -1,40 +0,0 @@
-#include "GpPLGlueDisplayDriver.h"
-#include "VirtualDirectory.h"
-#include "IGpDisplayDriver.h"
-
-GpPLGlueDisplayDriver::GpPLGlueDisplayDriver()
-	: m_displayDriver(nullptr)
-{
-}
-
-void GpPLGlueDisplayDriver::GetDisplayResolution(unsigned int *width, unsigned int *height, GpPixelFormat_t *bpp)
-{
-	m_displayDriver->GetDisplayResolution(width, height, bpp);
-}
-
-IGpColorCursor *GpPLGlueDisplayDriver::LoadColorCursor(int cursorID)
-{
-	return m_displayDriver->LoadColorCursor(cursorID);
-}
-
-void GpPLGlueDisplayDriver::SetColorCursor(IGpColorCursor *colorCursor)
-{
-	m_displayDriver->SetColorCursor(colorCursor);
-}
-
-void GpPLGlueDisplayDriver::SetStandardCursor(EGpStandardCursor_t standardCursor)
-{
-	m_displayDriver->SetStandardCursor(standardCursor);
-}
-
-GpPLGlueDisplayDriver *GpPLGlueDisplayDriver::GetInstance()
-{
-	return &ms_instance;
-}
-
-void GpPLGlueDisplayDriver::SetGpDisplayDriver(IGpDisplayDriver *displayDriver)
-{
-	m_displayDriver = displayDriver;
-}
-
-GpPLGlueDisplayDriver GpPLGlueDisplayDriver::ms_instance;

Aerofoil/GpPLGlueDisplayDriver.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include "HostDisplayDriver.h"
-
-struct IGpDisplayDriver;
-
-class GpPLGlueDisplayDriver final : public PortabilityLayer::HostDisplayDriver
-{
-public:
-	GpPLGlueDisplayDriver();
-
-	void GetDisplayResolution(unsigned int *width, unsigned int *height, GpPixelFormat_t *bpp) override;
-	IGpColorCursor *LoadColorCursor(int id) override;
-	void SetColorCursor(IGpColorCursor *colorCursor) override;
-	void SetStandardCursor(EGpStandardCursor_t standardCursor) override;
-
-	void SetGpDisplayDriver(IGpDisplayDriver *displayDriver);
-
-	static GpPLGlueDisplayDriver *GetInstance();
-
-private:
-	IGpDisplayDriver *m_displayDriver;
-
-	static GpPLGlueDisplayDriver ms_instance;
-};

Aerofoil/GpSystemServices_Win32.cpp

@@ -35,7 +35,7 @@ int64_t GpSystemServices_Win32::GetTime() const
 	int64_t epochStart64 = (static_cast<int64_t>(epochStartFT.dwLowDateTime) & 0xffffffff) | (static_cast<int64_t>(epochStartFT.dwHighDateTime) << 32);
 	int64_t currentTime64 = (static_cast<int64_t>(currentTime.dwLowDateTime) & 0xffffffff) | (static_cast<int64_t>(currentTime.dwHighDateTime) << 32);
 
-	return currentTime64 - epochStart64;
+	return (currentTime64 - epochStart64) / 10000000;
 }
 
 void GpSystemServices_Win32::GetLocalDateTime(unsigned int &year, unsigned int &month, unsigned int &day, unsigned int &hour, unsigned int &minute, unsigned int &second) const

ApplicationResourcePatches/DITL/1017.json

@@ -0,0 +1,117 @@
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 267, 211 ],
+			"size" : [ 58, 20 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 201, 211 ],
+			"size" : [ 58, 20 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 209, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1020,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 249, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1021,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 289, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1022,
+			"enabled" : true
+		},
+		{
+			"name" : "Number of Rooms to Display:\r(the less rooms, the faster)",
+			"itemType" : "Label",
+			"pos" : [ 8, 40 ],
+			"size" : [ 195, 32 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "Image",
+			"pos" : [ 0, 0 ],
+			"size" : [ 333, 32 ],
+			"id" : 1006,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 80 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "Beautiful opening color fade",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 142 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "32-bit color (Requires restart)",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 162 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Adjust resolution to fit window",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 182 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 137 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 200 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "Defaults",
+			"itemType" : "Button",
+			"pos" : [ 8, 211 ],
+			"size" : [ 64, 20 ],
+			"id" : 0,
+			"enabled" : true
+		}
+	]
+}

ApplicationResourcePatches/DITL/2000.json

@@ -0,0 +1,13 @@
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		}
+	]
+}

ApplicationResourcePatches/manifest.json

@@ -0,0 +1,10 @@
+{
+	"add" :
+	{
+		"DITL/1017.json" : "ApplicationResourcePatches/DITL/1017.json",
+		"DITL/2000.json" : "ApplicationResourcePatches/DITL/2000.json"
+	},
+	"delete" :
+	[
+	]
+}

Common.props

@@ -6,6 +6,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

Common/CoreDefs.h

@@ -41,4 +41,6 @@ struct __GpStaticAssertHelper<true>
 
 static const size_t GP_SYSTEM_MEMORY_ALIGNMENT = 16;
 
+#if !defined(NDEBUG)
 #define GP_DEBUG_CONFIG	1
+#endif

CompileShadersD3D11/CompileShadersD3D11.cpp

@@ -52,6 +52,14 @@ const CompileJob kCompileJobs[] =
 		drawQuadDefs,
 		"PSMain",
 		"ps_4_0"
+	},
+	{
+		L"ShaderSrc\\ScaleQuadP.hlsl",
+		L"GpDisplayDriver_D3D11\\CompiledShaders\\ScaleQuadP_D3D11.cpp",
+		"g_scaleQuadP_D3D11",
+		drawQuadDefs,
+		"PSMain",
+		"ps_4_0"
 	}
 };
 

ConvertColorCursors/ConvertColorCursors.cpp

@@ -1,4 +1,5 @@
 #include "CFileStream.h"
+#include "BMPFormat.h"
 #include "MMHandleBlock.h"
 #include "ResourceCompiledTypeList.h"
 #include "ResourceFile.h"
@@ -8,6 +9,7 @@
 #include <assert.h>
 
 #include <string>
+#include <vector>
 
 #include "stb_image_write.h"
 
@@ -53,6 +55,14 @@ struct CursorHeader
 	BEUInt32_t m_cursorResourceID;
 };
 
+struct BWCursor
+{
+	uint8_t m_pixels[32];
+	uint8_t m_mask[32];
+	BEUInt16_t m_hotSpotX;
+	BEUInt16_t m_hotSpotY;
+};
+
 struct IconDir
 {
 	uint16_t m_reserved;
@@ -84,6 +94,108 @@ void WriteToFileCallback(void *context, void *data, int size)
 	fwrite(data, 1, size, static_cast<FILE*>(context));
 }
 
+void WriteToVectorCallback(void *context, void *data, int size)
+{
+	std::vector<uint8_t> *vec = static_cast<std::vector<uint8_t>*>(context);
+	for (int i = 0; i < size; i++)
+		vec->push_back(static_cast<const uint8_t*>(data)[i]);
+}
+
+void ConvertBWCursors(PortabilityLayer::ResourceFile *resFile)
+{
+	const PortabilityLayer::ResourceCompiledTypeList *typeList = resFile->GetResourceTypeList('CURS');
+	if (!typeList)
+		return;
+
+	const size_t numRefs = typeList->m_numRefs;
+	for (size_t i = 0; i < numRefs; i++)
+	{
+		const int resID = typeList->m_firstRef[i].m_resID;
+		const THandle<void> resHdl = resFile->LoadResource('CURS', resID);
+		const void *cursorDataBase = *resHdl;
+		const BWCursor *cursorData = static_cast<const BWCursor *>(cursorDataBase);
+
+		char outPathDebug[64];
+		sprintf_s(outPathDebug, "Packaged\\WinCursors\\b%i.bmp", resID);
+
+		char outPath[64];
+		sprintf_s(outPath, "Packaged\\WinCursors\\b%i.cur", resID);
+
+		FILE *outF = nullptr;
+		errno_t outErr = fopen_s(&outF, outPath, "wb");
+
+		if (!outErr)
+		{
+			IconDir iconDir;
+			iconDir.m_reserved = 0;
+			iconDir.m_type = 2;
+			iconDir.m_numImages = 1;
+
+			IconDirEntry iconDirEntry;
+			iconDirEntry.m_width = 16;
+			iconDirEntry.m_height = 16;
+			iconDirEntry.m_numColors = 0;
+			iconDirEntry.m_reserved = 0;
+			iconDirEntry.m_numPlanes_HotSpotX = cursorData->m_hotSpotX;
+			iconDirEntry.m_bpp_HotSpotY = cursorData->m_hotSpotY;
+			iconDirEntry.m_imageDataSize = 0;
+			iconDirEntry.m_imageDataOffset = sizeof(IconDir) + sizeof(IconDirEntry);
+
+			fwrite(&iconDir, 1, sizeof(IconDir), outF);
+			fwrite(&iconDirEntry, 1, sizeof(IconDirEntry), outF);
+
+			long imageDataStart = ftell(outF);
+
+			PortabilityLayer::BitmapInfoHeader bmpHeader;
+			bmpHeader.m_thisStructureSize = sizeof(bmpHeader);
+			bmpHeader.m_width = 16;
+			bmpHeader.m_height = 32;
+			bmpHeader.m_planes = 1;
+			bmpHeader.m_bitsPerPixel = 1;
+			bmpHeader.m_compression = 0;
+			bmpHeader.m_imageSize = (16 * 16 / 8);
+			bmpHeader.m_xPixelsPerMeter = 0;
+			bmpHeader.m_yPixelsPerMeter = 0;
+			bmpHeader.m_numColors = 2;
+			bmpHeader.m_importantColorCount = 2;
+
+			fwrite(&bmpHeader, 1, sizeof(bmpHeader), outF);
+
+			const uint8_t paletteData[] = {
+				0, 0, 0, 0,
+				255, 255, 255, 0 };
+
+			fwrite(paletteData, 1, sizeof(paletteData), outF);
+			uint8_t padding[2] = { 0, 0 };
+
+			for (int y = 0; y < 16; y++)
+			{
+				const uint8_t *maskRow = cursorData->m_mask + (15 - y) * 2;
+				const uint8_t *row = cursorData->m_pixels + (15 - y) * 2;
+				const uint8_t modifiedRow[] = { row[0] ^ maskRow[0], row[1] ^ maskRow[1] };
+				fwrite(modifiedRow, 1, 2, outF);
+				fwrite(padding, 1, 2, outF);
+			}
+
+			for (int y = 0; y < 16; y++)
+			{
+				const uint8_t *row = cursorData->m_mask + (15 - y) * 2;
+				const uint8_t modifiedRow[] = { row[0] ^ 255, row[1] ^ 255 };
+				fwrite(modifiedRow, 1, 2, outF);
+				fwrite(padding, 1, 2, outF);
+			}
+
+			long imageDataEnd = ftell(outF);
+
+			fseek(outF, sizeof(IconDir), SEEK_SET);
+
+			iconDirEntry.m_imageDataSize = static_cast<uint32_t>(imageDataEnd - imageDataStart);
+			fwrite(&iconDirEntry, 1, sizeof(IconDirEntry), outF);
+			fclose(outF);
+		}
+	}
+}
+
 void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
 {
 	const PortabilityLayer::ResourceCompiledTypeList *typeList = resFile->GetResourceTypeList('crsr');
@@ -94,7 +206,7 @@ void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
 	for (size_t i = 0; i < numRefs; i++)
 	{
 		const int resID = typeList->m_firstRef[i].m_resID;
-		const THandle<void> resHdl = resFile->GetResource('crsr', resID, true);
+		const THandle<void> resHdl = resFile->LoadResource('crsr', resID);
 		const void *cursorDataBase = *resHdl;
 		const void *cursorData = cursorDataBase;
 
@@ -196,7 +308,7 @@ void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
 		}
 
 		char outPath[64];
-		sprintf_s(outPath, "Packaged\\WinCursors\\%i.cur", resID);
+		sprintf_s(outPath, "Packaged\\WinCursors\\c%i.cur", resID);
 
 		FILE *outF = nullptr;
 		errno_t outErr = fopen_s(&outF, outPath, "wb");
@@ -234,6 +346,7 @@ void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
 
 		delete[] colorValues;
 		delete[] pixelDataRGBA;
+		resHdl.Dispose();
 	}
 }
 
@@ -247,11 +360,15 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
 	for (size_t i = 0; i < numRefs; i++)
 	{
 		const int resID = typeList->m_firstRef[i].m_resID;
-		const THandle<void> bwBlock = resFile->GetResource(iconBitmapType, resID, true);
-		const THandle<void> colorBlock = resFile->GetResource(iconColorType, resID, true);
+		const THandle<void> bwBlock = resFile->LoadResource(iconBitmapType, resID);
+		const THandle<void> colorBlock = resFile->LoadResource(iconColorType, resID);
 
 		if (!bwBlock || !colorBlock)
+		{
+			bwBlock.Dispose();
+			colorBlock.Dispose();
 			continue;
+		}
 
 		const uint8_t *bwIconData = static_cast<const uint8_t*>(*bwBlock);
 		const uint8_t *bwMaskData = bwIconData + (dimension * dimension / 8);
@@ -309,6 +426,8 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
 		}
 
 		delete[] pixelData;
+		bwBlock.Dispose();
+		colorBlock.Dispose();
 	}
 }
 
@@ -328,6 +447,7 @@ int main(int argc, const char **argv)
 	stream.Close();
 
 	ConvertCursors(resFile);
+	ConvertBWCursors(resFile);
 	ConvertIconFamily(resFile, 'ics#', 'ics8', "Small", 16);
 	ConvertIconFamily(resFile, 'ICN#', 'icl8', "Large", 32);
 

ConvertResources.bat

@@ -1,49 +1,84 @@
+rmdir /S /Q Packaged
+
 mkdir Packaged
 mkdir Packaged\Houses
 mkdir Packaged\WinCursors
-mkdir Packaged\WinIcons
 
-x64\Release\MiniRez.exe "GpApp2\Glider PRO.r" Packaged\ApplicationResources.gpr
+x64\Release\MiniRez.exe "GliderProData\Glider PRO.r" Packaged\ApplicationResources.gpr
+
+x64\Release\gpr2gpa.exe "Packaged\ApplicationResources.gpr" "DefaultTimestamp.timestamp" "Packaged\ApplicationResources.gpa" "ApplicationResourcePatches\manifest.json"
 
 x64\Release\ConvertColorCursors.exe
 
-x64\Release\hqx2gp.exe "GpApp2\Houses\Art Museum.binhex" "Packaged\Houses\Art Museum"
-x64\Release\hqx2gp.exe "GpApp2\Houses\California or Bust!.binhex" "Packaged\Houses\California or Bust!"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Castle o' the Air.binhex" "Packaged\Houses\Castle o' the Air"
-x64\Release\hqx2gp.exe "GpApp2\Houses\CD Demo House.binhex" "Packaged\Houses\CD Demo House"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Davis Station.binhex" "Packaged\Houses\Davis Station"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Demo House.binhex" "Packaged\Houses\Demo House"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Empty House.binhex" "Packaged\Houses\Empty House"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Fun House.binhex" "Packaged\Houses\Fun House"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Grand Prix.binhex" "Packaged\Houses\Grand Prix"
-x64\Release\hqx2gp.exe "GpApp2\Houses\ImagineHouse PRO II.binhex" "Packaged\Houses\ImagineHouse PRO II"
-x64\Release\hqx2gp.exe "GpApp2\Houses\In The Mirror.binhex" "Packaged\Houses\In The Mirror"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Land of Illusion.binhex" "Packaged\Houses\Land of Illusion"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Leviathan.binhex" "Packaged\Houses\Leviathan"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Metropolis.binhex" "Packaged\Houses\Metropolis"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Nemo's Market.binhex" "Packaged\Houses\Nemo's Market"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Rainbow's End.binhex" "Packaged\Houses\Rainbow's End"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Sampler.binhex" "Packaged\Houses\Sampler"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Slumberland.binhex" "Packaged\Houses\Slumberland"
-x64\Release\hqx2gp.exe "GpApp2\Houses\SpacePods.binhex" "Packaged\Houses\SpacePods"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Teddy World.binhex" "Packaged\Houses\Teddy World"
-x64\Release\hqx2gp.exe "GpApp2\Houses\The Asylum Pro.binhex" "Packaged\Houses\The Asylum Pro"
-x64\Release\hqx2gp.exe "GpApp2\Houses\Titanic.binhex" "Packaged\Houses\Titanic"
+attrib -R Packaged\Houses\*
 
-x64\Release\FTagData.exe "GpApp2\Houses\Art Museum.mov", "Packaged\Houses\Art Museum.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Castle o' the Air.mov", "Packaged\Houses\Castle o' the Air.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\CD Demo House.mov", "Packaged\Houses\CD Demo House.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Davis Station.mov", "Packaged\Houses\Davis Station.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Demo House.mov", "Packaged\Houses\Demo House.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Grand Prix.mov", "Packaged\Houses\Grand Prix.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\ImagineHouse PRO II.mov", "Packaged\Houses\ImagineHouse PRO II.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Land of Illusion.mov", "Packaged\Houses\Land of Illusion.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Leviathan.mov", "Packaged\Houses\Leviathan.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Nemo's Market.mov", "Packaged\Houses\Nemo's Market.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Rainbow's End.mov", "Packaged\Houses\Rainbow's End.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Slumberland.mov", "Packaged\Houses\Slumberland.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\SpacePods.mov", "Packaged\Houses\SpacePods.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Teddy World.mov", "Packaged\Houses\Teddy World.mov" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "GpApp2\Houses\Titanic.mov", "Packaged\Houses\Titanic.mov" MooV ozm5 0 0 locked
+x64\Release\hqx2gp.exe "GliderProData\Houses\Art Museum.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum"
+x64\Release\hqx2gp.exe "GliderProData\Houses\California or Bust!.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Castle o' the Air.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air"
+x64\Release\hqx2gp.exe "GliderProData\Houses\CD Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Davis Station.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Empty House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Empty House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Fun House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Grand Prix.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix"
+x64\Release\hqx2gp.exe "GliderProData\Houses\ImagineHouse PRO II.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II"
+x64\Release\hqx2gp.exe "GliderProData\Houses\In The Mirror.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Land of Illusion.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Leviathan.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Metropolis.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Nemo's Market.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Rainbow's End.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Sampler.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Sampler"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Slumberland.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland"
+x64\Release\hqx2gp.exe "GliderProData\Houses\SpacePods.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Teddy World.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World"
+x64\Release\hqx2gp.exe "GliderProData\Houses\The Asylum Pro.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Titanic.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic"
+
+x64\Release\gpr2gpa.exe "Packaged\Houses\Art Museum.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\California or Bust!.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Castle o' the Air.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\CD Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Davis Station.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Empty House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Empty House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Fun House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Grand Prix.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\ImagineHouse PRO II.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\In The Mirror.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Land of Illusion.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Leviathan.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Metropolis.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Nemo's Market.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Rainbow's End.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Sampler.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Sampler.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Slumberland.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\SpacePods.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Teddy World.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\The Asylum Pro.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Titanic.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.gpa"
+
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.mov.gpf" MooV ozm5 0 0 locked
+
+del /Q Packaged\Houses\*.gpr
+del /Q Packaged\ApplicationResources.gpr
+
+copy /Y GliderProData\ConvertedMovies\*.mov.gpa Packaged\Houses\
+
+attrib +R Packaged\Houses\*
 
 pause

Documentation/leveleditor.txt

@@ -0,0 +1,24 @@
+As with Glider PRO's Room Editor, custom backgrounds, sounds, and TV videos
+are supported.
+
+Since Glider PRO used formats that were very Mac-specific, Aerofoil has
+replaced most of them with more current formats.
+
+To add resources to a house, create a ZIP file with the extension ".gpa" with
+the same name as the .gpd and .gpf files that already exist for the house.
+
+You can add resources by adding them to a folder named as the resource type,
+with the appropriate extension.
+
+For example, for a "PICT" resource of ID "3000", create a file named "3000.bmp"
+and put it in the "PICT" directory in the .gpa archive.
+
+PICT resources, used for custom decorations and backgrounds, must be BMP files.
+
+Sounds should go in a directory named "snd$20"
+Sounds must be WAV format, monaural, 8-bit unsigned PCM, 22255 Hz.
+Sounds recorded at a different sample rate will play back at the wrong speed.
+Sounds that are not monaural or 8-bit unsigned PCM will fail to load.
+
+Resource IDs must be between -32768 and 32767.  Other resource IDs will fail
+to load.

Documentation/license_apache.txt

@@ -1,201 +1,202 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Documentation/license_lgplv2.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Documentation/license_rapidjson.txt

@@ -0,0 +1,57 @@
+Tencent is pleased to support the open source community by making RapidJSON available. 
+ 
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
+
+If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
+If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
+A copy of the MIT License is included in this file.
+
+Other dependencies and licenses:
+
+Open Source Software Licensed Under the BSD License:
+--------------------------------------------------------------------
+
+The msinttypes r29 
+Copyright (c) 2006-2013 Alexander Chemeris 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Open Source Software Licensed Under the JSON License:
+--------------------------------------------------------------------
+
+json.org 
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+JSON_checker
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+	
+Terms of the JSON License:
+---------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Terms of the MIT License:
+--------------------------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Documentation/picterrors.txt

@@ -0,0 +1,28 @@
+Many Glider PRO houses, including the bundled ones, contain images in QuickDraw
+PICT format in the game resource data.
+
+PICT is a very complex format, many of its features are not completely
+documented, and some PICT features are impossible to support because they
+require copyrighted pattern sets and fonts that are bundled with the
+operating system.
+
+My goal is to support as many community houses as possible, but there is a
+point where supporting the format is more work than just manually converting
+the resources on a Macintosh machine or emulator.
+
+All of the remaining known unsupported features necessary to decode the
+remaining cases are only used by one house that I'm aware of each.
+
+Known error codes:
+
+Code 5 subcode 25: Strange image channel layout
+Code 8 subcode 145: Unsupported BitsRgn opcode.
+Code 8 subcode 40960: Undocumented opcode, possibly a format parsing error.
+
+Code 8 subcode 34: Unsupported ShortLine opcode. (PICT contains vector graphics.)
+Code 8 subcode 35: Unsupported ShortLineFrom opcode. (PICT contains vector graphics.)
+Code 8 subcode 49: Unsupported PaintRect opcode. (PICT contains vector graphics.)
+Code 8 subcode 51: Unsupported PaintOval opcode. (PICT contains vector graphics.)
+Code 8 subcode 129: paintRgn opcode. (PICT contains vector graphics.)
+Code 8 subcode 33280: Unsupported CompressedQuickTime opcode.  (PICT contains a QuickTime frame.)
+Code 8 subcode 33281: Unsupported UncompressedQuickTime opcode.  (PICT contains a QuickTime frame.)

Documentation/readme.txt

@@ -0,0 +1,100 @@
+Thank you for trying Aerofoil!
+
+IMPORTANT: Aerofoil is not maintained by, supported by, endorsed by, or
+otherwise associated with the authors and publishers of Glider PRO.
+Please do not contact any of them regarding issues related to Aerofoil.
+
+If you have an issue with Aerofoil, please post an issue to the Aerofoil
+issue tracker on GitHub:
+https://github.com/elasota/Aerofoil/issues
+
+
+IN-GAME SHORTCUT COMMANDS
+-------------------------------------------------------------------------------
+- Ctrl-S saves the game.  You can reload a saved game from the main menu.
+- Ctrl-Q quits the game.
+- Alt-Enter toggles full screen.
+
+
+GAMEPAD SUPPORT
+-------------------------------------------------------------------------------
+XInput gamepads are supported.  Other gamepads may be supported via third-party
+software that maps them to XInput (i.e. PS4 gamepads are supported via DS4Windows)
+
+
+LEGAL NOTICES
+-------------------------------------------------------------------------------
+Aerofoil is (c)2019-2020 Eric Lasota
+Based on Glider PRO (c)1994-2000 Casady & Greene, Inc., written by John Calhoun
+Distributed under the terms of the GNU General Public License version 2 (see license_gplv2.txt)
+
+
+Aerofoil uses the following third-party software:
+
+Open Sans font:
+(c)2011 Google
+Distributed under the Apache License (see license_apache.txt)
+
+
+stb_image_write:
+Created by Sean Barrett
+
+
+LIBICONV:
+Copyright (C) 1999-2001, 2016 Free Software Foundation, Inc.
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)
+
+
+RapidJSON:
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
+
+Distributed under the MIT license (See license_rapidjson.txt)
+
+
+zlib:
+
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+FreeType:
+
+Portions of this software are copyright (c)2020 The FreeType Project (www.freetype.org).
+All rights reserved.
+
+Distributed under the GPLv2 license (see license_gplv2.txt)
+
+
+The Unarchiver:
+
+The "unpacktool" utility is heavily based on code from The Unarchiver.
+Copyright (C) 2006-2013 Dag Ågren
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)
+
+
+FFmpeg:
+
+The "gpr2gpa" tool uses MACE decompression code from FFmpeg.
+Copyright (c) 2002 Laszlo Torok <torokl@alpha.dfmk.hu>
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)

Documentation/userhouses.txt

@@ -0,0 +1,84 @@
+If you want to import an existing third-party Glider PRO house to Aerofoil,
+a few steps are required.
+
+You need to convert the file into Aerofoil's "triplet" format, which consists
+of a metadata file (extension .gpf), and file forks (.gpd for data, .gpr for
+resources).  How you get these depends on the input format:
+- For MacBinary files (.bin), use the "bin2gp" utility
+- For BinHex files (.hqx), use the "hqx2gp" utility
+- For StuffIt (.sit) and Compact Pro (.cpt) archives, use the "unpacktool"
+  utility to extract the contents in triplet format.  The "unpacktool"
+  utility should support most vintage StuffIt archives made with StuffIt
+  Deluxe 6 or lower.
+
+(NOTE: ".sea" files are self-extracting archives, typically StuffIt or Compact
+Pro archives with the self-extractor program in the resources.  These will
+always be distributed in a fork-grouping container like MacBinary or BinHex.
+For cases like these, you need to split the self-extracting archive using
+"bin2gp" or "hqx2gp" and then pass the ".sea.gpd" file (which contains the
+archive data) to "unpacktool" to decompress it.)
+
+Once you've done that, if the house has custom resources (i.e. a .gpr file),
+you need to convert it to an Aerofoil resource archive, which you can do using
+the "gpr2gpa" tool.
+
+gpr2gpa's PICT converter may not support all PICT encodings.  If you find a
+house with custom PICT resources that isn't supported, please submit a sample
+to Aerofoil's issue tracker.
+
+
+Converting QuickTime movies for displaying on in-game TVs is a bit more complex.
+First, you need to convert the movie to a sequence of BMP images, which you
+can do with third-party tools such as FFMPEG.  Second, you need to create a
+JSON file containing the movie metadata, which looks like this, for example:
+
+{
+	"frameRateNumerator" : 8,
+	"frameRateDenominator" : 1
+}
+
+Once you've done that, create a ZIP archive where the path of the JSON file is
+"muvi\0.json" and the frames are "PICT\<frame number>.bmp", where <frame
+number> is the frame number, starting with 1 as the first frame, and name that
+the same as the house name, but with a ".mov.gpa" extension.
+
+Next, you need to create a metadata file for the movie, which should have a
+".mov.gpf" extension.  You can create the metadata file using the "FTagData"
+utility, using a timestamp file created with the "MakeTimestamp" utility.
+I'd recommend using "MooV" as the file type and "ozm5" as the file creator.
+
+You do NOT need to keep the .mov.gpd file once you've done this - Aerofoil
+expects all of the movie data to be in the resource archive.
+
+
+Some old QuickTime movies contain movie tracking information in the movie
+resource fork, in which case you need to merge them into the data for modern
+utilities to read them.  You can use the "flattenmov" tool to do this: Pass
+it the data (.gpd) and resource (.gpr) data files for a movie, and it will
+merge them into a single .mov file.
+
+
+BATCH CONVERSION
+------------------------------------------------------------------------------
+To batch-convert house resource files, use gpr2gpa with a path that ends
+with an asterisk (*) and omit the output filename.
+
+
+SECURITY CONSIDERATIONS
+------------------------------------------------------------------------------
+Glider PRO didn't really do any validation of houses.  Currently, Aerofoil
+doesn't do any additional validation either, and it's possible that invalid
+house data may lead to crashes or even remote code execution.
+
+I will be doing a hardening pass on the loader for the 1.1 release.  Until
+then, please only load houses from trusted sources.
+
+Also, Glider PRO houses were able to take advantage of a resource overlaying
+feature of the Macintosh operating system, where a resource being present in
+the house file with the same ID as an application resource would cause the
+resource to override the application resource.
+
+Aerofoil's resource loader is much more restrictive: Currently, only
+backgrounds, audio triggers, and icons may load from the house data.  This
+restriction will be loosened in the 1.1 release to allow resources to be
+overrided if I can confirm that it's safe to override them.

EmitWiXVersion/EmitWiXVersion.cpp

@@ -0,0 +1,27 @@
+#include "GpBuildVersion.h"
+#include "WindowsUnicodeToolShim.h"
+
+
+int toolMain(int argc, const char **argv)
+{
+	if (argc != 2)
+	{
+		fprintf(stderr, "Usage: EmitWiXVersion <output>\n");
+		return -1;
+	}
+
+	FILE *f = fopen_utf8(argv[1], "wb");
+	if (!f)
+	{
+		fprintf(stderr, "EmitWiXVersion: Error opening output file\n");
+		return -1;
+	}
+
+	fprintf(f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+	fprintf(f, "<Include>\n");
+	fprintf(f, "  <?define AerofoilReleaseVersion=\"%i.%i.%i.0\" ?>\n", GP_BUILD_VERSION_MAJOR, GP_BUILD_VERSION_MINOR, GP_BUILD_VERSION_UPDATE);
+	fprintf(f, "</Include>\n");
+	fclose(f);
+
+	return 0;
+}

EmitWiXVersion/EmitWiXVersion.vcxproj

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{7EFF1E21-C375-45EA-A069-4E2232C8A72B}</ProjectGuid>
+    <RootNamespace>EmitWiXVersion</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.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" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="EmitWiXVersion.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <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">
+  </ImportGroup>
+</Project>

EmitWiXVersion/EmitWiXVersion.vcxproj.filters

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="EmitWiXVersion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

FTagData/FTagData.cpp

@@ -7,11 +7,11 @@ int main(int argc, const char **argv)
 {
 	if (argc < 7)
 	{
-		fprintf(stderr, "FTagData <input> <output> <file type ID> <file creator ID> <x pos> <y pos> [flags]");
+		fprintf(stderr, "FTagData <timestamp> <output.gpf> <file type ID> <file creator ID> <x pos> <y pos> [flags]");
 		return -1;
 	}
 
-	std::string inPath = argv[1];
+	std::string timestampPath = argv[1];
 	std::string outPath = argv[2];
 
 	if (strlen(argv[3]) != 4)
@@ -26,26 +26,24 @@ int main(int argc, const char **argv)
 		return -3;
 	}
 
-	FILETIME currentTime;
-	GetSystemTimeAsFileTime(&currentTime);
+	FILE *tsF = nullptr;
+	errno_t ferr = fopen_s(&tsF, timestampPath.c_str(), "rb");
+	int64_t timestamp = 0;
 
-	SYSTEMTIME epochStart;
-	epochStart.wYear = 1904;
-	epochStart.wMonth = 1;
-	epochStart.wDayOfWeek = 5;
-	epochStart.wDay = 1;
-	epochStart.wHour = 0;
-	epochStart.wMinute = 0;
-	epochStart.wSecond = 0;
-	epochStart.wMilliseconds = 0;
+	if (!ferr)
+	{
+		uint8_t encodedTimestamp[8];
+		if (fread(encodedTimestamp, 1, 8, tsF) != 8)
+		{
+			fprintf(stderr, "Error reading timestamp file");
+			return -1;
+		}
 
-	FILETIME epochStartFT;
-	SystemTimeToFileTime(&epochStart, &epochStartFT);
+		for (int i = 0; i < 8; i++)
+			timestamp |= static_cast<int64_t>(encodedTimestamp[i]) << (i * 8);
 
-	int64_t epochStart64 = (static_cast<int64_t>(epochStartFT.dwLowDateTime) & 0xffffffff) | (static_cast<int64_t>(epochStartFT.dwHighDateTime) << 32);
-	int64_t currentTime64 = (static_cast<int64_t>(currentTime.dwLowDateTime) & 0xffffffff) | (static_cast<int64_t>(currentTime.dwHighDateTime) << 32);
-
-	int64_t timeDelta = (currentTime64 - epochStart64) / 10000000;
+		fclose(tsF);
+	}
 
 	PortabilityLayer::MacFileProperties mfp;
 	memcpy(mfp.m_fileType, argv[3], 4);
@@ -54,7 +52,7 @@ int main(int argc, const char **argv)
 	mfp.m_yPos = atoi(argv[6]);
 	mfp.m_finderFlags = 0;
 	mfp.m_protected = 0;
-	mfp.m_modifiedDate = mfp.m_creationDate = static_cast<uint32_t>(timeDelta & 0xffffffff);
+	mfp.m_modifiedDate = mfp.m_creationDate = timestamp;
 
 	for (int i = 7; i < argc; i++)
 	{
@@ -77,15 +75,11 @@ int main(int argc, const char **argv)
 			mfp.m_finderFlags |= PortabilityLayer::FINDER_FILE_FLAG_INITED;
 	}
 
-	std::string gpdPath = outPath + ".gpd";
-	CopyFile(inPath.c_str(), gpdPath.c_str(), 0);
-
 	PortabilityLayer::MacFilePropertiesSerialized mps;
 	mps.Serialize(mfp);
 
-	std::string gpfPath = outPath + ".gpf";
 	FILE *file = nullptr;
-	errno_t err = fopen_s(&file, gpfPath.c_str(), "wb");
+	errno_t err = fopen_s(&file, outPath.c_str(), "wb");
 	if (!err)
 	{
 		fwrite(mps.m_data, PortabilityLayer::MacFilePropertiesSerialized::kSize, 1, file);

GliderProData/Glider PRO.r

@@ -126902,758 +126902,6 @@ data 'PICT' (10000) {
 	$"00A0 0083 00FF"                                     /* . .ƒ.ÿ */
 };
 
-data 'WDEF' (128, "Infinity Windoid 2.6", purgeable) {
-	$"4E56 FFFC 48E7 1708 3C2E 000C 2E2E 0008"            /* NVÿüHç..<....... */
-	$"286E 000E 7600 4A46 6712 0C46 0001 670C"            /* (n..v.JFg..F..g. */
-	$"0C46 0005 6706 0C46 0006 660E 2F03 4EBA"            /* .F..g..F..f./.Nº */
-	$"0E4A 261F 4A00 6702 7601 1A03 670A 486E"            /* .J&.J.g.v...gÂHn */
-	$"FFFC A874 4EBA 0E5E 3006 6B00 0086 0C40"            /* ÿü¨tNº.^0.k..†.@ */
-	$"0006 6E7E D040 303B 0006 4EFB 0000 0032"            /* ..n~Ð@0;..Nû...2 */
-	$"0046 0054 0010 0026 0060 006C 302E 0012"            /* .F.T...&.`.l0... */
-	$"48C0 2F00 2F07 2F0C 4EBA 08BA 4FEF 000C"            /* HÀ/././.Nº.ºOï.. */
-	$"6050 2F07 2F0C 4EBA 091A 504F 6044 203C"            /* `P/./.NºÆ.PO`D < */
-	$"0000 FFFF C087 2F00 2F0C 4EBA 0C96 504F"            /* ..ÿÿÀ‡/./.Nº.–PO */
-	$"6030 2F07 2F0C 4EBA 0918 2C00 504F 6022"            /* `0/./.NºÆ.,.PO`" */
-	$"2F07 2F0C 4EBA 0CF8 504F 6016 2F07 2F0C"            /* /./.Nº.øPO`././. */
-	$"4EBA 0D7C 504F 600A 2F07 2F0C 4EBA 0D78"            /* Nº.|PO`Â/./.Nº.x */
-	$"504F 4A05 6706 2F2E FFFC A873 2D46 0014"            /* POJ.g./.ÿü¨s-F.. */
-	$"4CEE 10E8 FFE8 4E5E 205F 4FEF 000C 4ED0"            /* Lî.èÿèN^ _Oï..NÐ */
-	$"4E56 0000 48E7 0018 266E 0008 286E 000C"            /* NV..Hç..&n..(n.. */
-	$"206B 0072 2050 5488 224C 22D8 22D8 206B"            /*  k.r PTˆ"L"Ø"Ø k */
-	$"0082 2050 4A28 0012 6710 3014 D07C 000D"            /* .‚ PJ(..g.0.Ð|.. */
-	$"3940 0004 536C 0006 6010 302C 0002 D07C"            /* 9@..Sl..`.0,..Ð| */
-	$"000D 3940 0006 536C 0004 4CEE 1800 FFF8"            /* ..9@..Sl..Lî..ÿø */
-	$"4E5E 4E75 4E56 0000 2F0C 286E 0010 206E"            /* N^NuNV../.(n.. n */
-	$"000C 224C 22D8 22D8 206E 0008 2068 0082"            /* .."L"Ø"Ø n.. h.‚ */
-	$"2050 4A28 0012 670E 2F0C 7008 3F00 7203"            /*  PJ(..g./.p.?.r. */
-	$"3F01 A8A9 600C 2F0C 7003 3F00 7208 3F01"            /* ?.¨©`./.p.?.r.?. */
-	$"A8A9 3014 5E40 3940 0004 302C 0002 5E40"            /* ¨©0.^@9@..0,..^@ */
-	$"3940 0006 286E FFFC 4E5E 4E75 4E56 0000"            /* 9@..(nÿüN^NuNV.. */
-	$"48E7 0018 266E 000C 286E 0010 204C 224B"            /* Hç..&n..(n.. L"K */
-	$"20D9 20D9 206E 0008 2068 0082 2050 4A28"            /*  Ù Ù n.. h.‚ PJ( */
-	$"0012 672E 2F0C 7008 3F00 7203 3F01 A8A9"            /* ..g./.p.?.r.?.¨© */
-	$"302B 0006 48C0 322B 0002 48C1 9081 7201"            /* 0+..HÀ2+..HÁ<EFBFBD><EFBFBD>r. */
-	$"C280 6638 2F0C 70FF 3F00 7200 3F01 A8A8"            /* €f8/.pÿ?.r.?.¨¨ */
-	$"602A 2F0C 7003 3F00 7208 3F01 A8A9 302B"            /* `*..p.?.r.?.¨©0+ */
-	$"0004 48C0 3213 48C1 9081 7201 C280 660C"            /* ..HÀ2.HÁ<EFBFBD><EFBFBD>r.€f. */
-	$"2F0C 7000 3F00 72FF 3F01 A8A8 302C 0004"            /* /.p.?.rÿ?.¨¨0,.. */
-	$"5F40 3880 302C 0006 5F40 3940 0002 4CEE"            /* _@8€0,.._@9@..Lî */
-	$"1800 FFF8 4E5E 4E75 4E56 0000 2F0C 286E"            /* ..ÿøN^NuNV../.(n */
-	$"0008 302E 000E 670A 5340 670E 5340 6718"            /* ..0...gÂS@g.S@g. */
-	$"604C 7021 2F00 A862 6044 7001 2F00 2F0C"            /* `Lp!/.¨b`Dp././. */
-	$"4EBA 0E94 504F 6036 206C 0082 2050 4A28"            /* Nº.”PO`6 l.‚ PJ( */
-	$"0013 6606 4A2C 006F 670E 7001 2F00 2F0C"            /* ..f.J,.og.p././. */
-	$"4EBA 0E74 504F 6016 700A 2F00 7206 2F01"            /* Nº.tPO`.pÂ/.r./. */
-	$"7005 2F00 2F0C 4EBA 0F88 4FEF 0010 286E"            /* p././.Nº.ˆOï..(n */
-	$"FFFC 4E5E 4E75 4E56 0000 48E7 0108 1E2E"            /* ÿüN^NuNV..Hç.... */
-	$"0013 286E 0008 302E 000E 670A 5340 670C"            /* ..(n..0...gÂS@g. */
-	$"5340 6734 6078 4EBA 1172 6072 7003 2F00"            /* S@g4`xNº.r`rp./. */
-	$"2F0C 4EBA 0E22 4A07 504F 670E 7004 2F00"            /* /.Nº."J.POg.p./. */
-	$"2F0C 4EBA 0E34 504F 6054 7000 2F00 2F0C"            /* /.Nº.4PO`Tp././. */
-	$"4EBA 0E26 504F 6046 4A07 672A 7008 2F00"            /* Nº.&PO`FJ.g*p./. */
-	$"7206 2F01 7005 2F00 2F0C 4EBA 0F14 7001"            /* r./.p././.Nº..p. */
-	$"2F00 7206 2F01 7005 2F00 2F0C 4EBA 0F34"            /* /.r./.p././.Nº.4 */
-	$"4FEF 0020 6018 7000 2F00 2F0C 4EBA 0DC8"            /* Oï. `.p././.Nº.È */
-	$"7000 2F00 2F0C 4EBA 0DE0 4FEF 0010 4CEE"            /* p././.Nº.àOï..Lî */
-	$"1080 FFF8 4E5E 4E75 4E56 0000 2F0C 286E"            /* .€ÿøN^NuNV../.(n */
-	$"0008 302E 000E 670A 5340 6714 5340 672A"            /* ..0...gÂS@g.S@g* */
-	$"6050 701E 2F00 A862 7021 2F00 A863 6042"            /* `Pp./.¨bp!/.¨c`B */
-	$"7004 2F00 2F0C 4EBA 0D7E 7003 2F00 2F0C"            /* p././.Nº.~p././. */
-	$"4EBA 0D96 4FEF 0010 6028 7008 2F00 7206"            /* Nº.–Oï..`(p./.r. */
-	$"2F01 7005 2F00 2F0C 4EBA 0EB8 7001 2F00"            /* /.p././.Nº.¸p./. */
-	$"7206 2F01 7005 2F00 2F0C 4EBA 0E74 4FEF"            /* r./.p././.Nº.tOï */
-	$"0020 286E FFFC 4E5E 4E75 4E56 FFF8 2F0C"            /* . (nÿüN^NuNVÿø/. */
-	$"286E 0008 206E 0010 43EE FFF8 22D8 22D8"            /* (n.. n..Cîÿø"Ø"Ø */
-	$"486E FFF8 7001 3F00 3F00 A8A9 302E 000E"            /* Hnÿøp.?.?.¨©0... */
-	$"670A 5340 671A 5340 672A 6070 701E 2F00"            /* gÂS@g.S@g*`pp./. */
-	$"A862 7021 2F00 A863 486E FFF8 A8A1 605C"            /* ¨bp!/.¨cHnÿø¨¡`\ */
-	$"7004 2F00 2F0C 4EBA 0CEE 486E FFF8 A8A1"            /* p././.Nº.îHnÿø¨¡ */
-	$"504F 6048 7004 2F00 720C 2F01 700B 2F00"            /* PO`Hp./.r./.p./. */
-	$"2F0C 4EBA 0DFC 41EE 0000 2F20 2F20 4EBA"            /* /.Nº.üAî../ / Nº */
-	$"1082 700B 2F00 2F0C 4EBA 0CBC 302E FFFE"            /* .‚p././.Nº.¼0.ÿþ */
-	$"536E FFFE 302E FFFC 536E FFFC 41EE 0000"            /* Snÿþ0.ÿüSnÿüAî.. */
-	$"2F20 2F20 4EBA 102A 4FEF 0028 286E FFF4"            /* / / Nº.*Oï.((nÿô */
-	$"4E5E 4E75 4E56 FFF8 48E7 0118 3E2E 000E"            /* N^NuNVÿøHç..>... */
-	$"266E 0010 286E 0008 48C7 2F07 2F0C 4EBA"            /* &n..(n..HÇ/./.Nº */
-	$"FEC8 2F0B 70FF 3F00 3F00 A8A9 2F0B A8A1"            /* þÈ/.pÿ?.?.¨©/.¨¡ */
-	$"2F0B 7001 3F00 3F00 A8A9 3007 504F 670C"            /* /.p.?.?.¨©0.POg. */
-	$"5340 6718 5340 6736 6000 00C8 4EBA 0F8C"            /* S@g.S@g6`..ÈNº.Œ */
-	$"2F0B 4EBA 0F9A 584F 6000 00B8 7003 2F00"            /* /.Nº.šXO`..¸p./. */
-	$"2F0C 4EBA 0C32 7004 2F00 2F0C 4EBA 0C4A"            /* /.Nº.2p././.Nº.J */
-	$"2F0B 4EBA 0F7A 4FEF 0014 6000 0096 700C"            /* /.Nº.zOï..`..–p. */
-	$"2F00 2F0C 4EBA 0C10 701E 2F00 A863 204B"            /* /./.Nº..p./.¨c K */
-	$"5088 2F20 2F20 4EBA 0F88 41EE FFF8 224B"            /* Pˆ/ / Nº.ˆAîÿø"K */
-	$"20D9 20D9 302E FFF8 526E FFF8 302E FFFA"            /*  Ù Ù0.ÿøRnÿø0.ÿú */
-	$"526E FFFA 700B 2F00 2F0C 4EBA 0BDA 486E"            /* Rnÿúp././.Nº.ÚHn */
-	$"FFF8 A8A1 486E FFF8 7001 3F00 3F00 A8A9"            /* ÿø¨¡Hnÿøp.?.?.¨© */
-	$"700C 2F00 2F0C 4EBA 0BBE 41EE 0000 2F20"            /* p././.Nº.¾Aî../  */
-	$"2F20 4EBA 0F6E 302E FFFE 536E FFFE 302E"            /* / Nº.n0.ÿþSnÿþ0. */
-	$"FFFC 536E FFFC 7005 2F00 7208 2F01 7007"            /* ÿüSnÿüp./.r./.p. */
-	$"2F00 2F0C 4EBA 0CBA 486E FFF8 A8A2 4FEF"            /* /./.Nº.ºHnÿø¨¢Oï */
-	$"0038 4CEE 1880 FFEC 4E5E 4E75 4E56 FFF8"            /* .8Lî.€ÿìN^NuNVÿø */
-	$"48E7 0118 266E 0010 3E2E 000E 286E 0008"            /* Hç..&n..>...(n.. */
-	$"2F0B 48C7 2F07 2F0C 4EBA FECA 41EE FFF8"            /* /.HÇ/./.NºþÊAîÿø */
-	$"224B 20D9 20D9 576E FFFC 576E FFFE 3007"            /* "K Ù ÙWnÿüWnÿþ0. */
-	$"4FEF 000C 670A 5340 6706 5340 670A 602A"            /* Oï..gÂS@g.S@gÂ`* */
-	$"486E FFF8 A8A1 6022 700C 2F00 2F0C 4EBA"            /* Hnÿø¨¡`"p././.Nº */
-	$"0B26 546E FFFA 546E FFF8 41EE 0000 2F20"            /* .&TnÿúTnÿøAî../  */
-	$"2F20 4EBA 0ECE 4FEF 0010 4CEE 1880 FFEC"            /* / Nº.ÎOï..Lî.€ÿì */
-	$"4E5E 4E75 4E56 0000 48E7 0018 266E 0008"            /* N^NuNV..Hç..&n.. */
-	$"286E 0010 302E 000E 670A 5340 670C 5340"            /* (n..0...gÂS@g.S@ */
-	$"671A 6074 2F0C A8A2 606E 7003 2F00 2F0B"            /* g.`t/.¨¢`np././. */
-	$"4EBA 0AD4 2F0C A8A2 504F 605C 7008 2F00"            /* NºÂÔ/.¨¢PO`\p./. */
-	$"720C 2F01 700B 2F00 2F0B 4EBA 0BE4 2F0C"            /* r./.p././.Nº.ä/. */
-	$"A8A2 7008 2F00 2F0B 4EBA 0AAC 2F0C A8A1"            /* ¨¢p././.NºÂ¬/.¨¡ */
-	$"3F2C 0002 3F14 A893 302C 0006 5340 3F00"            /* ?,..?.¨“0,..S@?. */
-	$"302C 0004 5340 3F00 A891 302C 0006 5340"            /* 0,..S@?.¨‘0,..S@ */
-	$"3F00 3F14 A893 3F2C 0002 302C 0004 5340"            /* ?.?.¨“?,..0,..S@ */
-	$"3F00 A891 4FEF 0018 4CEE 1800 FFF8 4E5E"            /* ?.¨‘Oï..Lî..ÿøN^ */
-	$"4E75 4E56 0000 2F0B 266E 0010 226E 000C"            /* NuNV../.&n.."n.. */
-	$"4A2E 000B 6708 223C 0055 0055 6002 7200"            /* J...g."<.U.U`.r. */
-	$"3029 0002 0800 0000 6702 E389 3011 0800"            /* 0)......g.ã‰0... */
-	$"0000 6702 E189 2681 2741 0004 266E FFFC"            /* ..g.á‰&<EFBFBD>'A..&nÿü */
-	$"4E5E 4E75 4E56 FFF8 48E7 0018 266E 0008"            /* N^NuNVÿøHç..&n.. */
-	$"206E 000C 43EE FFF8 22D8 22D8 598F A8D8"            /*  n..Cîÿø"Ø"ØY<EFBFBD>¨Ø */
-	$"285F 486E FFF8 70FF 3F00 3F00 A8A9 2F0C"            /* (_Hnÿøpÿ?.?.¨©/. */
-	$"486E FFF8 A8DF 2F0B 2F0C 2F0B A8E6 2F0C"            /* Hnÿø¨ß/././.¨æ/. */
-	$"A8D9 4CEE 1800 FFF0 4E5E 4E75 4E56 0000"            /* ¨ÙLî..ÿðN^NuNV.. */
-	$"4E5E 4E75 4E56 FFDC 48E7 0338 3C2E 000E"            /* N^NuNVÿÜHç.8<... */
-	$"246E 0010 1E2E 0017 266E 0008 598F A8D8"            /* $n......&n..Y<EFBFBD>¨Ø */
-	$"285F 486E FFF0 7000 3F00 3F00 3F00 3F00"            /* (_Hnÿðp.?.?.?.?. */
-	$"A8A7 4A07 6710 2F0A 48C6 2F06 2F0B 4EBA"            /* ¨§J.g./ÂHÆ/./.Nº */
-	$"FC5A 4FEF 000C 7000 1007 2F00 48C6 2F06"            /* üZOï..p.../.HÆ/. */
-	$"2F0B 4EBA FB32 41EE FFE8 224A 20D9 20D9"            /* /.Nºû2Aîÿè"J Ù Ù */
-	$"486E FFE8 7001 3F00 3F00 A8A9 4A07 4FEF"            /* Hnÿèp.?.?.¨©J.Oï */
-	$"000C 670C 486E FFE8 7001 3F00 3F00 A8A9"            /* ..g.Hnÿèp.?.?.¨© */
-	$"2F0C 486E FFE8 A8DF 486E FFF0 7000 1007"            /* /.Hnÿè¨ßHnÿðp... */
-	$"2F00 2F0A 48C6 2F06 2F0B 4EBA FF60 558F"            /* /./ÂHÆ/./.Nºÿ`U<EFBFBD> */
-	$"486E FFF0 A8AE 4A1F 4FEF 0014 661E 598F"            /* Hnÿð¨®J.Oï..f.Y<EFBFBD> */
-	$"A8D8 2D57 FFDC 486E FFF0 A8DF 2F0C 2F2E"            /* ¨Ø-WÿÜHnÿð¨ß/./. */
-	$"FFDC 2F0C A8E6 2F2E FFDC A8D9 4A07 6720"            /* ÿÜ/.¨æ/.ÿܨÙJ.g  */
-	$"4A2B 0070 671A 486E FFE0 2F0A 2F0B 4EBA"            /* J+.pg.Hnÿà/Â/.Nº */
-	$"F944 486E FFE0 2F0C 4EBA FECA 4FEF 0014"            /* ùDHnÿà/.NºþÊOï.. */
-	$"4A07 6720 4A2B 0071 671A 486E FFE0 2F0A"            /* J.g J+.qg.Hnÿà/Â */
-	$"2F0B 4EBA F978 486E FFE0 2F0C 4EBA FEA6"            /* /.NºùxHnÿà/.Nºþ¦ */
-	$"4FEF 0014 486E FFF8 2F0A 7000 1007 2F00"            /* Oï..Hnÿø/Âp.../. */
-	$"4EBA FE50 2F0C 486E FFF8 A8D6 2F0C A8D9"            /* NºþP/.Hnÿø¨Ö/.¨Ù */
-	$"4FEF 000C 4CEE 1CC0 FFC8 4E5E 4E75 4E56"            /* Oï..Lî.ÀÿÈN^NuNV */
-	$"FFF8 2F0C 286E 0008 4A2C 0071 6750 486E"            /* ÿø/.(n..J,.qgPHn */
-	$"FFF8 2F0C 4EBA 0CA0 206C 0082 2050 5088"            /* ÿø/.Nº.  l.‚ PPˆ */
-	$"43EE FFF8 20D9 20D9 206C 0082 2050 4A28"            /* Cîÿø Ù Ù l.‚ PJ( */
-	$"0012 504F 670E 302E FFF8 D07C 000C 3D40"            /* ..POg.0.ÿøÐ|..=@ */
-	$"FFFC 600C 302E FFFA D07C 000C 3D40 FFFE"            /* ÿü`.0.ÿúÐ|..=@ÿþ */
-	$"206C 0082 2050 43EE FFF8 20D9 20D9 286E"            /*  l.‚ PCîÿø Ù Ù(n */
-	$"FFF4 4E5E 4E75 4E56 FFF0 2F0C 286E 0008"            /* ÿôN^NuNVÿð/.(n.. */
-	$"206C 0076 2050 43EE FFF0 5488 22D8 22D8"            /*  l.v PCîÿðTˆ"Ø"Ø */
-	$"206C 0082 2050 43EE FFF8 5088 22D8 22D8"            /*  l.‚ PCîÿøPˆ"Ø"Ø */
-	$"486E FFF8 302E FFFA 48C0 4480 322E FFF2"            /* Hnÿø0.ÿúHÀD€2.ÿò */
-	$"D240 3F01 302E FFF8 48C0 4480 322E FFF0"            /* Ò@?.0.ÿøHÀD€2.ÿð */
-	$"D240 3F01 A8A8 558F 486E FFF0 486E FFF8"            /* Ò@?.¨¨U<EFBFBD>HnÿðHnÿø */
-	$"A8A6 4A1F 6704 7005 6002 7006 286E FFEC"            /* ¨¦J.g.p.`.p.(nÿì */
-	$"4E5E 4E75 4E56 FFFC 48E7 1118 3E2E 0012"            /* N^NuNVÿüHç..>... */
-	$"266E 0008 422B 0071 7016 A122 2D48 FFFC"            /* &n..B+.qp.¡"-Hÿü */
-	$"6746 2850 422C 0010 197C 0001 0014 422C"            /* gF(PB,...|....B, */
-	$"0013 7601 7001 C047 6608 7002 C047 6602"            /* ..v.p.ÀGf.p.ÀGf. */
-	$"7600 4A03 57C3 4403 1943 0012 276E FFFC"            /* v.J.WÃD..C..'nÿü */
-	$"0082 422C 0011 3007 C07C 0008 1740 0071"            /* .‚B,..0.À|...@.q */
-	$"2F0B 4EBA FECA 584F 4CEE 1888 FFEC 4E5E"            /* /.NºþÊXOLî.ˆÿìN^ */
-	$"4E75 4E56 0000 2F0C 286E 0008 4AAC 0082"            /* NuNV../.(n..J¬.‚ */
-	$"6706 206C 0082 A023 286E FFFC 4E5E 4E75"            /* g. l.‚ #(nÿüN^Nu */
-	$"4E56 FFD4 48E7 0118 2E2E 000C 286E 0008"            /* NVÿÔHç......(n.. */
-	$"2007 4840 48C0 3D40 FFE4 3D47 FFE6 7E00"            /*  .H@HÀ=@ÿä=Gÿæ~. */
-	$"558F 2F2E FFE4 2F2C 0076 A8E8 4A1F 6706"            /* U<EFBFBD>/.ÿä/,.v¨èJ.g. */
-	$"7E01 6000 0124 486E FFD4 2F0C 4EBA F6F2"            /* ~.`..$HnÿÔ/.Nºöò */
-	$"206C 0082 2050 4A28 0014 504F 6700 010A"            /*  l.‚ PJ(..POg.. */
-	$"558F 2F2E FFE4 486E FFD4 A8AD 4A1F 6700"            /* U<EFBFBD>/.ÿäHnÿÔ¨­J.g. */
-	$"00F8 7E02 206C 0082 2050 4A28 0013 6608"            /* .ø~. l.‚ PJ(..f. */
-	$"4A2C 006F 6700 00E2 4A2C 0070 6730 486E"            /* J,.og..âJ,.pg0Hn */
-	$"FFDC 486E FFD4 2F0C 4EBA F6FA 486E FFDC"            /* ÿÜHnÿÔ/.NºöúHnÿÜ */
-	$"70FF 3F00 3F00 A8A9 558F 2F2E FFE4 486E"            /* pÿ?.?.¨©U<EFBFBD>/.ÿäHn */
-	$"FFDC A8AD 4A1F 4FEF 000C 6702 7E04 4A2C"            /* ÿܨ­J.Oï..g.~.J, */
-	$"0071 6700 00A4 486E FFDC 486E FFD4 2F0C"            /* .qg..¤HnÿÜHnÿÔ/. */
-	$"4EBA F71A 486E FFDC 70FF 3F00 3F00 A8A9"            /* Nº÷.HnÿÜpÿ?.?.¨© */
-	$"558F 2F2E FFE4 486E FFDC A8AD 4A1F 4FEF"            /* U<EFBFBD>/.ÿäHnÿܨ­J.Oï */
-	$"000C 6774 2F0C 4EBA FE1E 2E00 206C 0076"            /* ..gt/.Nºþ... l.v */
-	$"2050 43EE FFF8 5488 22D8 22D8 206C 0082"            /*  PCîÿøTˆ"Ø"Ø l.‚ */
-	$"2650 204B 5088 43EE FFE8 22D8 22D8 41EE"            /* &P KPˆCîÿè"Ø"ØAî */
-	$"FFF0 224B 20D9 20D9 206C 0082 2050 4868"            /* ÿð"K Ù Ù l.‚ PHh */
-	$"0008 302E FFFA 906E FFEA 3F00 302E FFF8"            /* ..0.ÿú<EFBFBD>nÿê?.0.ÿø */
-	$"906E FFE8 3F00 A8A8 206C 0082 2050 2F08"            /* <20>nÿè?.¨¨ l.‚ P/. */
-	$"302E FFFA 906E FFF2 3F00 302E FFF8 906E"            /* 0.ÿú<EFBFBD>nÿò?.0.ÿø<EFBFBD>n */
-	$"FFF0 3F00 A8A8 584F 2007 4CEE 1880 FFC8"            /* ÿð?.¨¨XO .Lî.€ÿÈ */
-	$"4E5E 4E75 4E56 FFF0 48E7 0118 266E 0008"            /* N^NuNVÿðHç..&n.. */
-	$"2853 2F0C 2F2E 000C 302E 0010 48C0 2F00"            /* (S/./...0...HÀ/. */
-	$"302E 0012 48C0 2F00 4EBA 07AC 3E00 202B"            /* 0...HÀ/.Nº.¬>. + */
-	$"0004 4FEF 0010 670A 5980 6700 011E 6000"            /* ..Oï..gÂY€g...`. */
-	$"016A 701E 2F00 A863 206C 0082 2050 4A28"            /* .jp./.¨c l.‚ PJ( */
-	$"0014 671E 486E FFF0 2F0C 4EBA F574 48C7"            /* ..g.Hnÿð/.NºõtHÇ */
-	$"2F07 2F0C 4EBA F6B2 486E FFF0 A8A1 4FEF"            /* /./.Nºö²Hnÿð¨¡Oï */
-	$"0010 206C 0082 2050 4A28 0013 6606 4A2C"            /* .. l.‚ PJ(..f.J, */
-	$"006F 6770 206C 0082 2050 4A28 0014 6716"            /* .ogp l.‚ PJ(..g. */
-	$"7001 2F00 486E FFF0 48C7 2F07 2F0C 4EBA"            /* p./.HnÿðHÇ/./.Nº */
-	$"FB64 4FEF 0010 4A2C 0070 6720 486E FFF8"            /* ûdOï..J,.pg Hnÿø */
-	$"486E FFF0 2F0C 4EBA F56C 486E FFF8 48C7"            /* Hnÿð/.NºõlHnÿøHÇ */
-	$"2F07 2F0C 4EBA F87E 4FEF 0018 4A2C 0071"            /* /./.Nºø~Oï..J,.q */
-	$"6738 486E FFF8 486E FFF0 2F0C 4EBA F59E"            /* g8HnÿøHnÿð/.Nºõž */
-	$"486E FFF8 48C7 2F07 2F0C 4EBA F970 4FEF"            /* HnÿøHÇ/./.NºùpOï */
-	$"0018 6016 7000 2F00 486E FFF0 48C7 2F07"            /* ..`.p./.HnÿðHÇ/. */
-	$"2F0C 4EBA FB00 4FEF 0010 206C 0072 2050"            /* /.Nºû.Oï.. l.r P */
-	$"43EE FFF8 5488 22D8 22D8 302E FFFC 536E"            /* CîÿøTˆ"Ø"Ø0.ÿüSn */
-	$"FFFC 302E FFFE 536E FFFE 48C7 2F07 2F0C"            /* ÿü0.ÿþSnÿþHÇ/./. */
-	$"4EBA F5E6 486E FFF8 A8A1 486E FFF8 7001"            /* NºõæHnÿø¨¡Hnÿøp. */
-	$"3F00 3F00 A8A8 41EE 0000 2F20 2F20 4EBA"            /* ?.?.¨¨Aî../ / Nº */
-	$"0842 4FEF 0010 6000 00A6 486E FFF0 2F0C"            /* .BOï..`..¦Hnÿð/. */
-	$"4EBA F46E 486E FFF8 486E FFF0 2F0C 4EBA"            /* NºônHnÿøHnÿð/.Nº */
-	$"F4B4 206C 0082 2050 4A28 0010 4FEF 0014"            /* ô´ l.‚ PJ(..Oï.. */
-	$"6714 486E FFF8 48C7 2F07 2F0C 4EBA F7B6"            /* g.HnÿøHÇ/./.Nº÷¶ */
-	$"4FEF 000C 6068 486E FFF8 48C7 2F07 2F0C"            /* Oï..`hHnÿøHÇ/./. */
-	$"4EBA F932 4FEF 000C 6054 4A2C 0071 674E"            /* Nºù2Oï..`TJ,.qgN */
-	$"486E FFF0 2F0C 4EBA F418 486E FFF8 486E"            /* Hnÿð/.Nºô.HnÿøHn */
-	$"FFF0 2F0C 4EBA F4B6 206C 0082 2050 4A28"            /* ÿð/.Nºô¶ l.‚ PJ( */
-	$"0011 4FEF 0014 6714 486E FFF8 48C7 2F07"            /* ..Oï..g.HnÿøHÇ/. */
-	$"2F0C 4EBA F878 4FEF 000C 6012 486E FFF8"            /* /.NºøxOï..`.Hnÿø */
-	$"48C7 2F07 2F0C 4EBA F8DC 4FEF 000C 4EBA"            /* HÇ/./.NºøÜOï..Nº */
-	$"071A 4CEE 1880 FFE4 4E5E 205F 4FEF 000C"            /* ..Lî.€ÿäN^ _Oï.. */
-	$"4ED0 4E56 FFF8 48E7 1108 2E2E 000C 286E"            /* NÐNVÿøHç......(n */
-	$"0008 4A2C 006E 675C 2D4C FFF8 2D47 FFFC"            /* ..J,.ng\-Lÿø-Gÿü */
-	$"7000 2F00 486E FFF8 487A FDCA 2F2C 0072"            /* p./.HnÿøHzýÊ/,.r */
-	$"4EBA 0198 2007 4FEF 0010 6738 5980 6702"            /* Nº.˜ .Oï..g8Y€g. */
-	$"601A 206C 0082 2050 4A28 0010 57C3 4403"            /* `. l.‚ PJ(..WÃD. */
-	$"206C 0082 2050 1143 0010 6018 206C 0082"            /*  l.‚ P.C..`. l.‚ */
-	$"2050 4A28 0011 57C3 4403 206C 0082 2050"            /*  PJ(..WÃD. l.‚ P */
-	$"1143 0011 4CEE 1088 FFEC 4E5E 4E75 4E56"            /* .C..Lî.ˆÿìN^NuNV */
-	$"FFF8 48E7 0018 286E 0008 598F A8D8 265F"            /* ÿøHç..(n..Y<EFBFBD>¨Ø&_ */
-	$"486E FFF8 2F0C 4EBA 074E 2F2C 0076 486E"            /* Hnÿø/.Nº.N/,.vHn */
-	$"FFF8 A8DF 486E FFF8 70FF 3F00 3F00 A8A9"            /* ÿø¨ßHnÿøpÿ?.?.¨© */
-	$"206C 0082 2050 4A28 0014 671A 206C 0082"            /*  l.‚ PJ(..g. l.‚ */
-	$"2050 4A28 0012 6708 046E 000C FFF8 6006"            /*  PJ(..g..n..ÿø`. */
-	$"046E 000C FFFA 2F2C 0072 486E FFF8 A8DF"            /* .n..ÿú/,.rHnÿø¨ß */
-	$"486E FFF8 7001 3F00 3F00 A8A8 2F0B 486E"            /* Hnÿøp.?.?.¨¨/.Hn */
-	$"FFF8 A8DF 2F0B 2F2C 0072 2F2C 0072 A8E5"            /* ÿø¨ß/./,.r/,.r¨å */
-	$"2F0B A8D9 4CEE 1800 FFF0 4E5E 4E75 4E56"            /* /.¨ÙLî..ÿðN^NuNV */
-	$"0000 4E5E 4E75 4E56 0000 4E5E 4E75 4E56"            /* ..N^NuNV..N^NuNV */
-	$"FFF0 2F03 7600 2F03 7001 41EE FFF0 A090"            /* ÿð/.v./.p.Aîÿð <EFBFBD> */
-	$"261F 4A40 660A 0C6E 0700 FFF4 6D02 7601"            /* &.J@fÂ.n..ÿôm.v. */
-	$"1003 262E FFEC 4E5E 4E75 4E56 FFF0 2F03"            /* ..&.ÿìN^NuNVÿð/. */
-	$"7600 2F03 7001 41EE FFF0 A090 261F 4A40"            /* v./.p.Aîÿð <EFBFBD>&.J@ */
-	$"6608 4A2E FFF9 6702 7601 1003 262E FFEC"            /* f.J.ÿùg.v...&.ÿì */
-	$"4E5E 4E75 4E56 FFF8 486E FFF8 A910 486E"            /* N^NuNVÿøHnÿø©.Hn */
-	$"FFFC AA48 2F2E FFFC A873 206E FFF8 41E8"            /* ÿüªH/.ÿü¨s nÿøAè */
-	$"0030 226E FFFC 43E9 0030 700A A02E 206E"            /* .0"nÿüCé.0p . n */
-	$"FFF8 41E8 0042 226E FFFC 43E9 0042 700E"            /* ÿøAè.B"nÿüCé.Bp. */
-	$"A02E 206E FFF8 4868 003A A89D 206E FFF8"            /*  . nÿøHh.:¨<EFBFBD> nÿø */
-	$"4868 0020 A87C 4E5E 4E75 4E56 FFEC 48E7"            /* Hh. ¨|N^NuNVÿìHç */
-	$"0338 2C2E 0010 4EBA FF46 4A00 6714 2F2E"            /* .8,...NºÿFJ.g./. */
-	$"0008 2F2E 000C 2F06 2F2E 0014 ABCA 6000"            /* ../..././...«Ê`. */
-	$"00CC 4EBA FF56 4A00 6700 00AE 598F A8D8"            /* .ÌNºÿVJ.g..®Y<EFBFBD>¨Ø */
-	$"2D5F FFF8 598F A8D8 245F 598F A8D8 265F"            /* -_ÿøY<EFBFBD>¨Ø$_Y<EFBFBD>¨Ø&_ */
-	$"2F2E FFF8 A87A 598F AA29 285F 6070 2054"            /* /.ÿø¨zY<EFBFBD>ª)(_`p T */
-	$"2D48 FFEC 41E8 0022 43EE FFF0 22D8 22D8"            /* -HÿìAè."Cîÿð"Ø"Ø */
-	$"206E FFEC 2068 0016 2050 3E28 0020 486E"            /*  nÿì h.. P>(. Hn */
-	$"FFF0 A871 486E FFF4 A871 2F0A 486E FFF0"            /* ÿð¨qHnÿô¨q/ÂHnÿð */
-	$"A8DF 2F2E 0008 2F0A 2F0B A8E4 2F0B 2F2E"            /* ¨ß/.../Â/.¨ä/./. */
-	$"FFF8 2F0B A8E4 558F 2F0B A8E2 4A1F 6616"            /* ÿø/.¨äU<EFBFBD>/.¨âJ.f. */
-	$"2F0B A879 3F07 2054 3F28 0014 2F0C 2F06"            /* /.¨y?. T?(.././. */
-	$"206E 000C 4E90 598F 2F0C AA2B 285F 200C"            /*  n..N<EFBFBD>Y<EFBFBD>/.ª+(_ . */
-	$"668C 2F2E FFF8 A879 2F2E FFF8 A8D9 2F0A"            /* fŒ/.ÿø¨y/.ÿø¨Ù/ */
-	$"A8D9 2F0B A8D9 6014 7001 3F00 7200 3F01"            /* ¨Ù/.¨Ù`.p.?.r.?. */
-	$"7000 2F00 2F06 206E 000C 4E90 4CEE 1CC0"            /* p././. n..N<EFBFBD>Lî.À */
-	$"FFD8 4E5E 4E75 4E56 0000 226E 000C 302E"            /* ÿØN^NuNV.."n..0. */
-	$"000A 6B60 0C40 000C 6E5A D040 303B 0006"            /* .Âk`.@..nZÐ@0;.. */
-	$"4EFB 0000 001C 0052 0052 0052 001C 001C"            /* Nû.....R.R.R.... */
-	$"0052 001C 0052 002E 0052 002E 0040 337C"            /* .R...R...R...@3| */
-	$"FFFF 0004 337C FFFF 0002 32BC FFFF 602A"            /* ÿÿ..3|ÿÿ..2¼ÿÿ`* */
-	$"337C CCCC 0002 32BC CCCC 337C FFFF 0004"            /* 3|ÌÌ..2¼ÌÌ3|ÿÿ.. */
-	$"6018 337C 3333 0002 32BC 3333 337C 6666"            /* `.3|33..2¼333|ff */
-	$"0004 6006 42A9 0002 4251 4E5E 4E75 4E56"            /* ..`.B©..BQN^NuNV */
-	$"FFFC 48E7 0308 286E 0010 3E2E 000E 558F"            /* ÿüHç..(n..>...U<EFBFBD> */
-	$"2F2E 0008 486E FFFC AA42 206E FFFC 2050"            /* /...HnÿüªB nÿü P */
-	$"2068 0008 2050 3C28 0006 BE46 544F 6F1E"            /*  h.. P<(..¾FTOo. */
-	$"558F 7000 2F00 486E FFFC AA42 206E FFFC"            /* U<EFBFBD>p./.HnÿüªB nÿü */
-	$"2050 2068 0008 2050 3C28 0006 544F BE46"            /*  P h.. P<(..TO¾F */
-	$"6F0E 2F0C 48C7 2F07 4EBA FF2C 504F 601C"            /* o./.HÇ/.Nºÿ,PO`. */
-	$"48C7 206E FFFC 2050 2068 0008 2050 2007"            /* HÇ nÿü P h.. P . */
-	$"E780 41F0 080A 224C 22D8 32D8 4CEE 10C0"            /* ç€Að.Â"L"Ø2ØLî.À */
-	$"FFF0 4E5E 4E75 4E56 FFFA 486E FFFA 302E"            /* ÿðN^NuNVÿúHnÿú0. */
-	$"000E 48C0 2F00 2F2E 0008 4EBA FF62 486E"            /* ..HÀ/./...NºÿbHn */
-	$"FFFA AA14 4E5E 4E75 4E56 FFFA 486E FFFA"            /* ÿúª.N^NuNVÿúHnÿú */
-	$"302E 000E 48C0 2F00 2F2E 0008 4EBA FF40"            /* 0...HÀ/./...Nºÿ@ */
-	$"486E FFFA AA15 4E5E 4E75 4E56 0000 48E7"            /* Hnÿúª.N^NuNV..Hç */
-	$"0038 246E 0014 266E 0008 342E 0012 286E"            /* .8$n..&n..4...(n */
-	$"000C 700F 9042 3400 7000 3013 7200 3214"            /* ..p.<EFBFBD>B4.p.0.r.2. */
-	$"9081 48C2 4C02 0800 4C7C 0800 0000 000F"            /* <20><>HÂL...L|...... */
-	$"7200 3214 D280 3481 7000 302B 0002 7200"            /* r.2.Ò€4<EFBFBD>p.0+..r. */
-	$"322C 0002 9081 48C2 4C02 0800 4C7C 0800"            /* 2,..<EFBFBD><EFBFBD>HÂL...L|.. */
-	$"0000 000F 7200 322C 0002 D280 3541 0002"            /* ....r.2,..Ò€5A.. */
-	$"7000 302B 0004 7200 322C 0004 9081 48C2"            /* p.0+..r.2,..<EFBFBD><EFBFBD>HÂ */
-	$"4C02 0800 4C7C 0800 0000 000F 7200 322C"            /* L...L|......r.2, */
-	$"0004 D280 3541 0004 4CEE 1C00 FFF4 4E5E"            /* ..Ò€5A..Lî..ÿôN^ */
-	$"4E75 4E56 FFF4 2F0C 286E 0008 486E FFF4"            /* NuNVÿô/.(n..Hnÿô */
-	$"302E 000E 48C0 2F00 2F0C 4EBA FE82 486E"            /* 0...HÀ/./.Nºþ‚Hn */
-	$"FFFA 302E 0012 48C0 2F00 2F0C 4EBA FE70"            /* ÿú0...HÀ/./.Nºþp */
-	$"2F2E 0018 302E 0016 48C0 2F00 486E FFFA"            /* /...0...HÀ/.Hnÿú */
-	$"486E FFF4 4EBA FF24 286E FFF0 4E5E 4E75"            /* HnÿôNºÿ$(nÿðN^Nu */
-	$"4E56 FFFA 486E FFFA 302E 0016 48C0 2F00"            /* NVÿúHnÿú0...HÀ/. */
-	$"302E 0012 48C0 2F00 302E 000E 48C0 2F00"            /* 0...HÀ/.0...HÀ/. */
-	$"2F2E 0008 4EBA FF8C 486E FFFA AA14 4E5E"            /* /...NºÿŒHnÿúª.N^ */
-	$"4E75 4E56 FFFA 486E FFFA 302E 0016 48C0"            /* NuNVÿúHnÿú0...HÀ */
-	$"2F00 302E 0012 48C0 2F00 302E 000E 48C0"            /* /.0...HÀ/.0...HÀ */
-	$"2F00 2F2E 0008 4EBA FF5A 486E FFFA AA15"            /* /./...NºÿZHnÿúª. */
-	$"4E5E 4E75 4E56 FFFA 48E7 0F18 266E 0018"            /* N^NuNVÿúHç..&n.. */
-	$"382E 000E 286E 0008 4246 4247 6046 486E"            /* 8...(n..BFBG`FHn */
-	$"FFFA 48C7 2007 D080 3033 0800 48C0 2F00"            /* ÿúHÇ .Ѐ03..HÀ/. */
-	$"302E 0012 48C0 2F00 48C4 2F04 2F0C 4EBA"            /* 0...HÀ/.HÄ/./.Nº */
-	$"FF12 3A06 598F 486E FFFA AA33 201F 3C00"            /* ÿ.:.Y<EFBFBD>Hnÿúª3 .<. */
-	$"4A47 4FEF 0014 6F08 BA46 6604 7000 600C"            /* JGOï..o.ºFf.p.`. */
-	$"3007 5247 BE6E 0016 6DB4 7001 4CEE 18F0"            /* 0.RG¾n..m´p.Lî.ð */
-	$"FFE2 4E5E 4E75 4E56 FFEC 48E7 1718 3C2E"            /* ÿâN^NuNVÿìHç..<. */
-	$"000A 266E 0014 49EE FFEC 7600 2F03 4EBA"            /* .Â&n..Iîÿìv./.Nº */
-	$"FB6A 261F 4A00 670A 7001 C06E 000E 6702"            /* ûj&.J.gÂp.Àn..g. */
-	$"7601 1A03 4247 0C46 0004 6D4C 206E 0010"            /* v...BG.F..mL n.. */
-	$"2050 7001 B068 0004 673E 4EBA FB12 4A00"            /*  Pp.°h..g>Nºû.J. */
-	$"6604 7E01 6032 486E FFF6 700B 2F00 2F0B"            /* f.~.`2Hnÿöp././. */
-	$"4EBA FD1C 7000 302E FFF6 4A80 4FEF 000C"            /* Nºý.p.0.ÿöJ€Oï.. */
-	$"6614 7000 302E FFF8 4A80 660A 7000 302E"            /* f.p.0.ÿøJ€fÂp.0. */
-	$"FFFA 4A80 6702 7E02 0C47 0002 6600 00B0"            /* ÿúJ€g.~..G..f..° */
-	$"4A05 6700 00AA 0C46 0008 6E00 00A2 4247"            /* J.g..ª.F..n..¢BG */
-	$"598F AA32 2D5F FFFC 2F2E 0010 AA31 4254"            /* Y<EFBFBD>ª2-_ÿü/...ª1BT */
-	$"397C 0007 0002 397C 0008 0004 397C 000A"            /* 9|....9|....9|. */
-	$"0006 397C 000D 0008 2F0C 7005 2F00 7206"            /* ..9|..../.p./.r. */
-	$"2F01 2F00 2F0B 4EBA FEBC 4A00 4FEF 0014"            /* /././.Nºþ¼J.Oï.. */
-	$"6756 4254 397C 0001 0002 397C 0004 0004"            /* gVBT9|....9|.... */
-	$"2F0C 7003 2F00 7208 2F01 7007 2F00 2F0B"            /* /.p./.r./.p././. */
-	$"4EBA FE92 4A00 4FEF 0014 672C 4254 397C"            /* Nºþ’J.Oï..g,BT9| */
-	$"0004 0002 397C 000F 0004 2F0C 7003 2F00"            /* ....9|..../.p./. */
-	$"720C 2F01 700B 2F00 2F0B 4EBA FE68 4A00"            /* r./.p././.NºþhJ. */
-	$"4FEF 0014 6702 7E02 2F2E FFFC AA31 3007"            /* Oï..g.~./.ÿüª10. */
-	$"4CEE 18E8 FFD4 4E5E 4E75 4E56 0000 7021"            /* Lî.èÿÔN^NuNV..p! */
-	$"2F00 A862 701E 2F00 A863 4E5E 4E75 4E56"            /* /.¨bp./.¨cN^NuNV */
-	$"FFF8 2F0C 286E 0008 41EE FFF8 224C 20D9"            /* ÿø/.(n..Aîÿø"L Ù */
-	$"20D9 2F0C A8A1 486E FFF8 7001 3F00 3F00"            /*  Ù/.¨¡Hnÿøp.?.?. */
-	$"A8A9 486E FFF8 A8A3 286E FFF4 4E5E 4E75"            /* ¨©Hnÿø¨£(nÿôN^Nu */
-	$"4E56 0000 302E 000E 536E 000E 302E 000C"            /* NV..0...Sn..0... */
-	$"536E 000C 3F2E 000A 3F2E 000C A893 2F2E"            /* Sn..?..Â?...¨“/. */
-	$"0008 A891 3F2E 000E 3F2E 0008 A891 4E5E"            /* ..¨‘?...?...¨‘N^ */
-	$"4E75 4E56 0000 302E 000E 536E 000E 302E"            /* NuNV..0...Sn..0. */
-	$"000C 536E 000C 3F2E 000A 3F2E 000C A893"            /* ..Sn..?..Â?...¨“ */
-	$"2F2E 000C A891 3F2E 000E 3F2E 0008 A891"            /* /...¨‘?...?...¨‘ */
-	$"4E5E 4E75 4E56 FFFC 2F0C 286E 000C 486E"            /* N^NuNVÿü/.(n..Hn */
-	$"FFFC A874 2F2E 0008 A873 2F0C 7000 3F00"            /* ÿü¨t/...¨s/.p.?. */
-	$"3F00 A880 2F0C A870 2F2E FFFC A873 286E"            /* ?.¨€/.¨p/.ÿü¨s(n */
-	$"FFF8 4E5E 4E75 4E56 FFFC 48E7 0018 266E"            /* ÿøN^NuNVÿüHç..&n */
-	$"000C 286E 0008 41EC 0010 224B 22D8 22D8"            /* ..(n..Aì.."K"Ø"Ø */
-	$"486E FFFC 2F0C 4EBA FFAC 2F0B 2F2E FFFC"            /* Hnÿü/.Nºÿ¬/./.ÿü */
-	$"A8A8 4CEE 1800 FFF4 4E5E 4E75"                      /* ¨¨Lî..ÿôN^Nu */
-};
-
-data 'WDEF' (129, "Infinity Windoid 2.6 (grow)", purgeable) {
-	$"4E56 FFFC 48E7 1708 3C2E 000C 2E2E 0008"            /* NVÿüHç..<....... */
-	$"286E 000E 7600 4A46 6712 0C46 0001 670C"            /* (n..v.JFg..F..g. */
-	$"0C46 0005 6706 0C46 0006 660E 2F03 4EBA"            /* .F..g..F..f./.Nº */
-	$"124A 261F 4A00 6702 7601 1A03 670A 486E"            /* .J&.J.g.v...gÂHn */
-	$"FFFC A874 4EBA 125E 3006 6B00 0086 0C40"            /* ÿü¨tNº.^0.k..†.@ */
-	$"0006 6E7E D040 303B 0006 4EFB 0000 0032"            /* ..n~Ð@0;..Nû...2 */
-	$"0046 0054 0010 0026 0060 006C 302E 0012"            /* .F.T...&.`.l0... */
-	$"48C0 2F00 2F07 2F0C 4EBA 0AC6 4FEF 000C"            /* HÀ/././.NºÂÆOï.. */
-	$"6050 2F07 2F0C 4EBA 0B38 504F 6044 203C"            /* `P/./.Nº.8PO`D < */
-	$"0000 FFFF C087 2F00 2F0C 4EBA 0EEE 504F"            /* ..ÿÿÀ‡/./.Nº.îPO */
-	$"6030 2F07 2F0C 4EBA 0B36 2C00 504F 6022"            /* `0/./.Nº.6,.PO`" */
-	$"2F07 2F0C 4EBA 0F50 504F 6016 2F07 2F0C"            /* /./.Nº.PPO`././. */
-	$"4EBA 0FD4 504F 600A 2F07 2F0C 4EBA 10FE"            /* Nº.ÔPO`Â/./.Nº.þ */
-	$"504F 4A05 6706 2F2E FFFC A873 2D46 0014"            /* POJ.g./.ÿü¨s-F.. */
-	$"4CEE 10E8 FFE8 4E5E 205F 4FEF 000C 4ED0"            /* Lî.èÿèN^ _Oï..NÐ */
-	$"4E56 0000 48E7 0018 266E 0008 286E 000C"            /* NV..Hç..&n..(n.. */
-	$"206B 0072 2050 5488 224C 22D8 22D8 206B"            /*  k.r PTˆ"L"Ø"Ø k */
-	$"0082 2050 4A28 0012 6710 3014 D07C 000D"            /* .‚ PJ(..g.0.Ð|.. */
-	$"3940 0004 536C 0006 6010 302C 0002 D07C"            /* 9@..Sl..`.0,..Ð| */
-	$"000D 3940 0006 536C 0004 4CEE 1800 FFF8"            /* ..9@..Sl..Lî..ÿø */
-	$"4E5E 4E75 4E56 0000 2F0C 286E 0010 206E"            /* N^NuNV../.(n.. n */
-	$"000C 224C 22D8 22D8 206E 0008 2068 0082"            /* .."L"Ø"Ø n.. h.‚ */
-	$"2050 4A28 0012 670E 2F0C 7008 3F00 7203"            /*  PJ(..g./.p.?.r. */
-	$"3F01 A8A9 600C 2F0C 7003 3F00 7208 3F01"            /* ?.¨©`./.p.?.r.?. */
-	$"A8A9 3014 5E40 3940 0004 302C 0002 5E40"            /* ¨©0.^@9@..0,..^@ */
-	$"3940 0006 286E FFFC 4E5E 4E75 4E56 0000"            /* 9@..(nÿüN^NuNV.. */
-	$"48E7 0018 266E 000C 286E 0010 204C 224B"            /* Hç..&n..(n.. L"K */
-	$"20D9 20D9 206E 0008 2068 0082 2050 4A28"            /*  Ù Ù n.. h.‚ PJ( */
-	$"0012 672E 2F0C 7008 3F00 7203 3F01 A8A9"            /* ..g./.p.?.r.?.¨© */
-	$"302B 0006 48C0 322B 0002 48C1 9081 7201"            /* 0+..HÀ2+..HÁ<EFBFBD><EFBFBD>r. */
-	$"C280 6638 2F0C 70FF 3F00 7200 3F01 A8A8"            /* €f8/.pÿ?.r.?.¨¨ */
-	$"602A 2F0C 7003 3F00 7208 3F01 A8A9 302B"            /* `*..p.?.r.?.¨©0+ */
-	$"0004 48C0 3213 48C1 9081 7201 C280 660C"            /* ..HÀ2.HÁ<EFBFBD><EFBFBD>r.€f. */
-	$"2F0C 7000 3F00 72FF 3F01 A8A8 302C 0004"            /* /.p.?.rÿ?.¨¨0,.. */
-	$"5F40 3880 302C 0006 5F40 3940 0002 4CEE"            /* _@8€0,.._@9@..Lî */
-	$"1800 FFF8 4E5E 4E75 4E56 0000 2F0C 286E"            /* ..ÿøN^NuNV../.(n */
-	$"000C 2F0C 2F2E 0008 4EBA 16CC 526C 0006"            /* .././...Nº.ÌRl.. */
-	$"302C 0006 907C 0010 3940 0002 526C 0004"            /* 0,..<EFBFBD>|..9@..Rl.. */
-	$"302C 0004 907C 0010 3880 286E FFFC 4E5E"            /* 0,..<EFBFBD>|..8€(nÿüN^ */
-	$"4E75 4E56 0000 2F0C 286E 0008 302E 000E"            /* NuNV../.(n..0... */
-	$"670A 5340 670E 5340 6718 604C 7021 2F00"            /* gÂS@g.S@g.`Lp!/. */
-	$"A862 6044 7001 2F00 2F0C 4EBA 125A 504F"            /* ¨b`Dp././.Nº.ZPO */
-	$"6036 206C 0082 2050 4A28 0013 6606 4A2C"            /* `6 l.‚ PJ(..f.J, */
-	$"006F 670E 7001 2F00 2F0C 4EBA 123A 504F"            /* .og.p././.Nº.:PO */
-	$"6016 700A 2F00 7206 2F01 7005 2F00 2F0C"            /* `.pÂ/.r./.p././. */
-	$"4EBA 134E 4FEF 0010 286E FFFC 4E5E 4E75"            /* Nº.NOï..(nÿüN^Nu */
-	$"4E56 0000 48E7 0108 1E2E 0013 286E 0008"            /* NV..Hç......(n.. */
-	$"302E 000E 670A 5340 670C 5340 6734 6078"            /* 0...gÂS@g.S@g4`x */
-	$"4EBA 1538 6072 7003 2F00 2F0C 4EBA 11E8"            /* Nº.8`rp././.Nº.è */
-	$"4A07 504F 670E 7004 2F00 2F0C 4EBA 11FA"            /* J.POg.p././.Nº.ú */
-	$"504F 6054 7000 2F00 2F0C 4EBA 11EC 504F"            /* PO`Tp././.Nº.ìPO */
-	$"6046 4A07 672A 7008 2F00 7206 2F01 7005"            /* `FJ.g*p./.r./.p. */
-	$"2F00 2F0C 4EBA 12DA 7001 2F00 7206 2F01"            /* /./.Nº.Úp./.r./. */
-	$"7005 2F00 2F0C 4EBA 12FA 4FEF 0020 6018"            /* p././.Nº.úOï. `. */
-	$"7000 2F00 2F0C 4EBA 118E 7000 2F00 2F0C"            /* p././.Nº.Žp././. */
-	$"4EBA 11A6 4FEF 0010 4CEE 1080 FFF8 4E5E"            /* Nº.¦Oï..Lî.€ÿøN^ */
-	$"4E75 4E56 0000 2F0C 286E 0008 302E 000E"            /* NuNV../.(n..0... */
-	$"670A 5340 6714 5340 672A 6050 701E 2F00"            /* gÂS@g.S@g*`Pp./. */
-	$"A862 7021 2F00 A863 6042 7004 2F00 2F0C"            /* ¨bp!/.¨c`Bp././. */
-	$"4EBA 1144 7003 2F00 2F0C 4EBA 115C 4FEF"            /* Nº.Dp././.Nº.\Oï */
-	$"0010 6028 7008 2F00 7206 2F01 7005 2F00"            /* ..`(p./.r./.p./. */
-	$"2F0C 4EBA 127E 7001 2F00 7206 2F01 7005"            /* /.Nº.~p./.r./.p. */
-	$"2F00 2F0C 4EBA 123A 4FEF 0020 286E FFFC"            /* /./.Nº.:Oï. (nÿü */
-	$"4E5E 4E75 4E56 FFF8 2F0C 286E 0008 206E"            /* N^NuNVÿø/.(n.. n */
-	$"0010 43EE FFF8 22D8 22D8 486E FFF8 7001"            /* ..Cîÿø"Ø"ØHnÿøp. */
-	$"3F00 3F00 A8A9 302E 000E 670A 5340 671A"            /* ?.?.¨©0...gÂS@g. */
-	$"5340 672A 6070 701E 2F00 A862 7021 2F00"            /* S@g*`pp./.¨bp!/. */
-	$"A863 486E FFF8 A8A1 605C 7004 2F00 2F0C"            /* ¨cHnÿø¨¡`\p././. */
-	$"4EBA 10B4 486E FFF8 A8A1 504F 6048 7004"            /* Nº.´Hnÿø¨¡PO`Hp. */
-	$"2F00 720C 2F01 700B 2F00 2F0C 4EBA 11C2"            /* /.r./.p././.Nº. */
-	$"41EE 0000 2F20 2F20 4EBA 1448 700B 2F00"            /* Aî../ / Nº.Hp./. */
-	$"2F0C 4EBA 1082 302E FFFE 536E FFFE 302E"            /* /.Nº.‚0.ÿþSnÿþ0. */
-	$"FFFC 536E FFFC 41EE 0000 2F20 2F20 4EBA"            /* ÿüSnÿüAî../ / Nº */
-	$"13F0 4FEF 0028 286E FFF4 4E5E 4E75 4E56"            /* .ðOï.((nÿôN^NuNV */
-	$"FFF8 48E7 0118 3E2E 000E 266E 0010 286E"            /* ÿøHç..>...&n..(n */
-	$"0008 48C7 2F07 2F0C 4EBA FEC8 2F0B 70FF"            /* ..HÇ/./.NºþÈ/.pÿ */
-	$"3F00 3F00 A8A9 2F0B A8A1 2F0B 7001 3F00"            /* ?.?.¨©/.¨¡/.p.?. */
-	$"3F00 A8A9 3007 504F 670C 5340 6718 5340"            /* ?.¨©0.POg.S@g.S@ */
-	$"6736 6000 00C8 4EBA 1352 2F0B 4EBA 1360"            /* g6`..ÈNº.R/.Nº.` */
-	$"584F 6000 00B8 7003 2F00 2F0C 4EBA 0FF8"            /* XO`..¸p././.Nº.ø */
-	$"7004 2F00 2F0C 4EBA 1010 2F0B 4EBA 1340"            /* p././.Nº../.Nº.@ */
-	$"4FEF 0014 6000 0096 700C 2F00 2F0C 4EBA"            /* Oï..`..–p././.Nº */
-	$"0FD6 701E 2F00 A863 204B 5088 2F20 2F20"            /* .Öp./.¨c KPˆ/ /  */
-	$"4EBA 134E 41EE FFF8 224B 20D9 20D9 302E"            /* Nº.NAîÿø"K Ù Ù0. */
-	$"FFF8 526E FFF8 302E FFFA 526E FFFA 700B"            /* ÿøRnÿø0.ÿúRnÿúp. */
-	$"2F00 2F0C 4EBA 0FA0 486E FFF8 A8A1 486E"            /* /./.Nº. Hnÿø¨¡Hn */
-	$"FFF8 7001 3F00 3F00 A8A9 700C 2F00 2F0C"            /* ÿøp.?.?.¨©p././. */
-	$"4EBA 0F84 41EE 0000 2F20 2F20 4EBA 1334"            /* Nº.„Aî../ / Nº.4 */
-	$"302E FFFE 536E FFFE 302E FFFC 536E FFFC"            /* 0.ÿþSnÿþ0.ÿüSnÿü */
-	$"7005 2F00 7208 2F01 7007 2F00 2F0C 4EBA"            /* p./.r./.p././.Nº */
-	$"1080 486E FFF8 A8A2 4FEF 0038 4CEE 1880"            /* .€Hnÿø¨¢Oï.8Lî.€ */
-	$"FFEC 4E5E 4E75 4E56 FFF8 48E7 0118 266E"            /* ÿìN^NuNVÿøHç..&n */
-	$"0010 3E2E 000E 286E 0008 2F0B 48C7 2F07"            /* ..>...(n../.HÇ/. */
-	$"2F0C 4EBA FECA 41EE FFF8 224B 20D9 20D9"            /* /.NºþÊAîÿø"K Ù Ù */
-	$"576E FFFC 576E FFFE 3007 4FEF 000C 670A"            /* WnÿüWnÿþ0.Oï..g */
-	$"5340 6706 5340 670A 602A 486E FFF8 A8A1"            /* S@g.S@gÂ`*Hnÿø¨¡ */
-	$"6022 700C 2F00 2F0C 4EBA 0EEC 546E FFFA"            /* `"p././.Nº.ìTnÿú */
-	$"546E FFF8 41EE 0000 2F20 2F20 4EBA 1294"            /* TnÿøAî../ / Nº.” */
-	$"4FEF 0010 4CEE 1880 FFEC 4E5E 4E75 4E56"            /* Oï..Lî.€ÿìN^NuNV */
-	$"0000 48E7 0018 266E 0008 286E 0010 302E"            /* ..Hç..&n..(n..0. */
-	$"000E 670A 5340 670C 5340 671A 6074 2F0C"            /* ..gÂS@g.S@g.`t/. */
-	$"A8A2 606E 7003 2F00 2F0B 4EBA 0E9A 2F0C"            /* ¨¢`np././.Nº.š/. */
-	$"A8A2 504F 605C 7008 2F00 720C 2F01 700B"            /* ¨¢PO`\p./.r./.p. */
-	$"2F00 2F0B 4EBA 0FAA 2F0C A8A2 7008 2F00"            /* /./.Nº.ª/.¨¢p./. */
-	$"2F0B 4EBA 0E72 2F0C A8A1 3F2C 0002 3F14"            /* /.Nº.r/.¨¡?,..?. */
-	$"A893 302C 0006 5340 3F00 302C 0004 5340"            /* ¨“0,..S@?.0,..S@ */
-	$"3F00 A891 302C 0006 5340 3F00 3F14 A893"            /* ?.¨‘0,..S@?.?.¨“ */
-	$"3F2C 0002 302C 0004 5340 3F00 A891 4FEF"            /* ?,..0,..S@?.¨‘Oï */
-	$"0018 4CEE 1800 FFF8 4E5E 4E75 4E56 FFF8"            /* ..Lî..ÿøN^NuNVÿø */
-	$"48E7 0018 266E 000C 286E 0008 41EE FFF8"            /* Hç..&n..(n..Aîÿø */
-	$"224B 20D9 20D9 700C 2F00 2F0C 4EBA 0E08"            /* "K Ù Ùp././.Nº.. */
-	$"2F0B A8A1 302E FFFA 526E FFFA 302E FFF8"            /* /.¨¡0.ÿúRnÿú0.ÿø */
-	$"526E FFF8 700B 2F00 2F0C 4EBA 0DEA 41EE"            /* Rnÿøp././.Nº.êAî */
-	$"0000 2F20 2F20 4EBA 1168 486E FFF8 7001"            /* ../ / Nº.hHnÿøp. */
-	$"3F00 3F00 A8A9 4A2E 0013 6704 7004 6002"            /* ?.?.¨©J...g.p.`. */
-	$"7005 2F00 7008 2F00 7207 2F01 2F0C 4EBA"            /* p./.p./.r././.Nº */
-	$"0EE0 486E FFF8 A8A2 4FEF 0028 4CEE 1800"            /* .àHnÿø¨¢Oï.(Lî.. */
-	$"FFF0 4E5E 4E75 4E56 FFF0 48E7 0118 3E2E"            /* ÿðN^NuNVÿðHç..>. */
-	$"000E 266E 0010 286E 0008 206C 0082 2050"            /* ..&n..(n.. l.‚ P */
-	$"4A28 0013 6634 4A2C 006F 662E 3007 5340"            /* J(..f4J,.of.0.S@ */
-	$"6704 5340 6618 7001 2F00 2F0C 4EBA 0D68"            /* g.S@f.p././.Nº.h */
-	$"7000 2F00 2F0C 4EBA 0D80 4FEF 0010 2F0B"            /* p././.Nº.€Oï../. */
-	$"4EBA 10AC 584F 6000 00EC 486E FFF0 302B"            /* Nº.¬XO`..ìHnÿð0+ */
-	$"0002 5640 3F00 3013 5640 3F00 302B 0002"            /* ..V@?.0.V@?.0+.. */
-	$"D07C 000A 3F00 3013 D07C 000A 3F00 A8A7"            /* Ð|.Â?.0.Ð|.Â?.¨§ */
-	$"486E FFF8 302E FFF2 5440 3F00 302E FFF0"            /* Hnÿø0.ÿòT@?.0.ÿð */
-	$"5440 3F00 302B 0006 5540 3F00 302B 0004"            /* T@?.0+..U@?.0+.. */
-	$"5540 3F00 A8A7 3007 670C 5340 6708 5340"            /* U@?.¨§0.g.S@g.S@ */
-	$"6734 6000 0090 0C47 0001 660E 7001 2F00"            /* g4`..<EFBFBD>.G..f.p./. */
-	$"2F0C 4EBA 0CE2 504F 6004 4EBA 101E 2F0B"            /* /.Nº.âPO`.Nº../. */
-	$"4EBA 102C 486E FFF8 A8A1 486E FFF0 4EBA"            /* Nº.,Hnÿø¨¡HnÿðNº */
-	$"101E 504F 605E 7001 2F00 2F0C 4EBA 0CB8"            /* ..PO`^p././.Nº.¸ */
-	$"7001 2F00 7206 2F01 7005 2F00 2F0C 4EBA"            /* p./.r./.p././.Nº */
-	$"0E02 2F0B 4EBA 0FF8 486E FFF8 70FF 3F00"            /* ../.Nº.øHnÿøpÿ?. */
-	$"3F00 A8A8 7000 2F00 486E FFF8 2F0C 4EBA"            /* ?.¨¨p./.Hnÿø/.Nº */
-	$"FE5C 302E FFF6 536E FFF6 302E FFF4 536E"            /* þ\0.ÿöSnÿö0.ÿôSn */
-	$"FFF4 7001 2F00 486E FFF0 2F0C 4EBA FE3E"            /* ÿôp./.Hnÿð/.Nºþ> */
-	$"4FEF 0034 4CEE 1880 FFE4 4E5E 4E75 4E56"            /* Oï.4Lî.€ÿäN^NuNV */
-	$"0000 2F0B 266E 0010 226E 000C 4A2E 000B"            /* ../.&n.."n..J... */
-	$"6708 223C 0055 0055 6002 7200 3029 0002"            /* g."<.U.U`.r.0).. */
-	$"0800 0000 6702 E389 3011 0800 0000 6702"            /* ....g.ã‰0.....g. */
-	$"E189 2681 2741 0004 266E FFFC 4E5E 4E75"            /* á‰&<EFBFBD>'A..&nÿüN^Nu */
-	$"4E56 FFF8 48E7 0018 266E 0008 206E 000C"            /* NVÿøHç..&n.. n.. */
-	$"43EE FFF8 22D8 22D8 598F A8D8 285F 486E"            /* Cîÿø"Ø"ØY<EFBFBD>¨Ø(_Hn */
-	$"FFF8 70FF 3F00 3F00 A8A9 2F0C 486E FFF8"            /* ÿøpÿ?.?.¨©/.Hnÿø */
-	$"A8DF 2F0B 2F0C 2F0B A8E6 2F0C A8D9 4CEE"            /* ¨ß/././.¨æ/.¨ÙLî */
-	$"1800 FFF0 4E5E 4E75 4E56 0000 4E5E 4E75"            /* ..ÿðN^NuNV..N^Nu */
-	$"4E56 FFDC 48E7 0338 3C2E 000E 246E 0010"            /* NVÿÜHç.8<...$n.. */
-	$"1E2E 0017 266E 0008 598F A8D8 285F 486E"            /* ....&n..Y<EFBFBD>¨Ø(_Hn */
-	$"FFF0 7000 3F00 3F00 3F00 3F00 A8A7 4A07"            /* ÿðp.?.?.?.?.¨§J. */
-	$"6710 2F0A 48C6 2F06 2F0B 4EBA FA88 4FEF"            /* g./ÂHÆ/./.NºúˆOï */
-	$"000C 7000 1007 2F00 48C6 2F06 2F0B 4EBA"            /* ..p.../.HÆ/./.Nº */
-	$"F960 41EE FFE8 224A 20D9 20D9 486E FFE8"            /* ù`Aîÿè"J Ù ÙHnÿè */
-	$"7001 3F00 3F00 A8A9 4A07 4FEF 000C 670C"            /* p.?.?.¨©J.Oï..g. */
-	$"486E FFE8 7001 3F00 3F00 A8A9 2F0C 486E"            /* Hnÿèp.?.?.¨©/.Hn */
-	$"FFE8 A8DF 486E FFF0 7000 1007 2F00 2F0A"            /* ÿè¨ßHnÿðp..././ */
-	$"48C6 2F06 2F0B 4EBA FF60 558F 486E FFF0"            /* HÆ/./.Nºÿ`U<EFBFBD>Hnÿð */
-	$"A8AE 4A1F 4FEF 0014 661E 598F A8D8 2D57"            /* ¨®J.Oï..f.Y<EFBFBD>¨Ø-W */
-	$"FFDC 486E FFF0 A8DF 2F0C 2F2E FFDC 2F0C"            /* ÿÜHnÿð¨ß/./.ÿÜ/. */
-	$"A8E6 2F2E FFDC A8D9 4A07 6720 4A2B 0070"            /* ¨æ/.ÿܨÙJ.g J+.p */
-	$"671A 486E FFE0 2F0A 2F0B 4EBA F738 486E"            /* g.Hnÿà/Â/.Nº÷8Hn */
-	$"FFE0 2F0C 4EBA FECA 4FEF 0014 4A07 6720"            /* ÿà/.NºþÊOï..J.g  */
-	$"4A2B 0071 671A 486E FFE0 2F0A 2F0B 4EBA"            /* J+.qg.Hnÿà/Â/.Nº */
-	$"F76C 486E FFE0 2F0C 4EBA FEA6 4FEF 0014"            /* ÷lHnÿà/.Nºþ¦Oï.. */
-	$"486E FFF8 2F0A 7000 1007 2F00 4EBA FE50"            /* Hnÿø/Âp.../.NºþP */
-	$"2F0C 486E FFF8 A8D6 2F0C A8D9 4FEF 000C"            /* /.Hnÿø¨Ö/.¨ÙOï.. */
-	$"4CEE 1CC0 FFC8 4E5E 4E75 4E56 FFF8 2F0C"            /* Lî.ÀÿÈN^NuNVÿø/. */
-	$"286E 0008 4A2C 0071 6750 486E FFF8 2F0C"            /* (n..J,.qgPHnÿø/. */
-	$"4EBA 0E94 206C 0082 2050 5088 43EE FFF8"            /* Nº.” l.‚ PPˆCîÿø */
-	$"20D9 20D9 206C 0082 2050 4A28 0012 504F"            /*  Ù Ù l.‚ PJ(..PO */
-	$"670E 302E FFF8 D07C 000C 3D40 FFFC 600C"            /* g.0.ÿøÐ|..=@ÿü`. */
-	$"302E FFFA D07C 000C 3D40 FFFE 206C 0082"            /* 0.ÿúÐ|..=@ÿþ l.‚ */
-	$"2050 43EE FFF8 20D9 20D9 286E FFF4 4E5E"            /*  PCîÿø Ù Ù(nÿôN^ */
-	$"4E75 4E56 FFF0 2F0C 286E 0008 206C 0076"            /* NuNVÿð/.(n.. l.v */
-	$"2050 43EE FFF0 5488 22D8 22D8 206C 0082"            /*  PCîÿðTˆ"Ø"Ø l.‚ */
-	$"2050 43EE FFF8 5088 22D8 22D8 486E FFF8"            /*  PCîÿøPˆ"Ø"ØHnÿø */
-	$"302E FFFA 48C0 4480 322E FFF2 D240 3F01"            /* 0.ÿúHÀD€2.ÿòÒ@?. */
-	$"302E FFF8 48C0 4480 322E FFF0 D240 3F01"            /* 0.ÿøHÀD€2.ÿðÒ@?. */
-	$"A8A8 558F 486E FFF0 486E FFF8 A8A6 4A1F"            /* ¨¨U<EFBFBD>HnÿðHnÿø¨¦J. */
-	$"6704 7005 6002 7006 286E FFEC 4E5E 4E75"            /* g.p.`.p.(nÿìN^Nu */
-	$"4E56 FFFC 48E7 1118 3E2E 0012 266E 0008"            /* NVÿüHç..>...&n.. */
-	$"422B 0071 7016 A122 2D48 FFFC 6758 2850"            /* B+.qp.¡"-HÿügX(P */
-	$"422C 0010 197C 0001 0014 422C 0013 7004"            /* B,...|....B,..p. */
-	$"C047 7200 3200 4A81 57C3 4403 1943 0015"            /* ÀGr.2.J<EFBFBD>WÃD..C.. */
-	$"7601 7001 C047 6608 7002 C047 6602 7600"            /* v.p.ÀGf.p.ÀGf.v. */
-	$"4A03 57C3 4403 1943 0012 276E FFFC 0082"            /* J.WÃD..C..'nÿü.‚ */
-	$"422C 0011 3007 C07C 0008 1740 0071 2F0B"            /* B,..0.À|...@.q/. */
-	$"4EBA FEB8 584F 4CEE 1888 FFEC 4E5E 4E75"            /* Nºþ¸XOLî.ˆÿìN^Nu */
-	$"4E56 0000 2F0C 286E 0008 4AAC 0082 6706"            /* NV../.(n..J¬.‚g. */
-	$"206C 0082 A023 286E FFFC 4E5E 4E75 4E56"            /*  l.‚ #(nÿüN^NuNV */
-	$"FFD4 48E7 0118 2E2E 000C 286E 0008 2007"            /* ÿÔHç......(n.. . */
-	$"4840 48C0 3D40 FFE4 3D47 FFE6 7E00 558F"            /* H@HÀ=@ÿä=Gÿæ~.U<EFBFBD> */
-	$"2F2E FFE4 2F2C 0076 A8E8 4A1F 6740 7E01"            /* /.ÿä/,.v¨èJ.g@~. */
-	$"206C 0082 2050 4A28 0015 6700 0154 486E"            /*  l.‚ PJ(..g..THn */
-	$"FFDC 2F0C 4EBA F612 486E FFDC 70FF 3F00"            /* ÿÜ/.Nºö.HnÿÜpÿ?. */
-	$"3F00 A8A9 558F 2F2E FFE4 486E FFDC A8AD"            /* ?.¨©U<EFBFBD>/.ÿäHnÿܨ­ */
-	$"4A1F 504F 6700 012A 7E03 6000 0124 486E"            /* J.POg..*~.`..$Hn */
-	$"FFD4 2F0C 4EBA F49A 206C 0082 2050 4A28"            /* ÿÔ/.Nºôš l.‚ PJ( */
-	$"0014 504F 6700 010A 558F 2F2E FFE4 486E"            /* ..POg..ÂU<EFBFBD>/.ÿäHn */
-	$"FFD4 A8AD 4A1F 6700 00F8 7E02 206C 0082"            /* ÿÔ¨­J.g..ø~. l.‚ */
-	$"2050 4A28 0013 6608 4A2C 006F 6700 00E2"            /*  PJ(..f.J,.og..â */
-	$"4A2C 0070 6730 486E FFDC 486E FFD4 2F0C"            /* J,.pg0HnÿÜHnÿÔ/. */
-	$"4EBA F4A2 486E FFDC 70FF 3F00 3F00 A8A9"            /* Nºô¢HnÿÜpÿ?.?.¨© */
-	$"558F 2F2E FFE4 486E FFDC A8AD 4A1F 4FEF"            /* U<EFBFBD>/.ÿäHnÿܨ­J.Oï */
-	$"000C 6702 7E04 4A2C 0071 6700 00A4 486E"            /* ..g.~.J,.qg..¤Hn */
-	$"FFDC 486E FFD4 2F0C 4EBA F4C2 486E FFDC"            /* ÿÜHnÿÔ/.NºôÂHnÿÜ */
-	$"70FF 3F00 3F00 A8A9 558F 2F2E FFE4 486E"            /* pÿ?.?.¨©U<EFBFBD>/.ÿäHn */
-	$"FFDC A8AD 4A1F 4FEF 000C 6774 2F0C 4EBA"            /* ÿܨ­J.Oï..gt/.Nº */
-	$"FDD2 2E00 206C 0076 2050 43EE FFF8 5488"            /* ýÒ.. l.v PCîÿøTˆ */
-	$"22D8 22D8 206C 0082 2650 204B 5088 43EE"            /* "Ø"Ø l.‚&P KPˆCî */
-	$"FFE8 22D8 22D8 41EE FFF0 224B 20D9 20D9"            /* ÿè"Ø"ØAîÿð"K Ù Ù */
-	$"206C 0082 2050 4868 0008 302E FFFA 906E"            /*  l.‚ PHh..0.ÿú<EFBFBD>n */
-	$"FFEA 3F00 302E FFF8 906E FFE8 3F00 A8A8"            /* ÿê?.0.ÿø<EFBFBD>nÿè?.¨¨ */
-	$"206C 0082 2050 2F08 302E FFFA 906E FFF2"            /*  l.‚ P/.0.ÿú<EFBFBD>nÿò */
-	$"3F00 302E FFF8 906E FFF0 3F00 A8A8 584F"            /* ?.0.ÿø<EFBFBD>nÿð?.¨¨XO */
-	$"2007 4CEE 1880 FFC8 4E5E 4E75 4E56 FFF0"            /*  .Lî.€ÿÈN^NuNVÿð */
-	$"48E7 0118 266E 0008 2853 2F0C 2F2E 000C"            /* Hç..&n..(S/./... */
-	$"302E 0010 48C0 2F00 302E 0012 48C0 2F00"            /* 0...HÀ/.0...HÀ/. */
-	$"4EBA 0954 3E00 202B 0004 4FEF 0010 670A"            /* NºÆT>. +..Oï..g */
-	$"5980 6700 011E 6000 016A 701E 2F00 A863"            /* Y€g...`..jp./.¨c */
-	$"206C 0082 2050 4A28 0014 671E 486E FFF0"            /*  l.‚ PJ(..g.Hnÿð */
-	$"2F0C 4EBA F31C 48C7 2F07 2F0C 4EBA F494"            /* /.Nºó.HÇ/./.Nºô” */
-	$"486E FFF0 A8A1 4FEF 0010 206C 0082 2050"            /* Hnÿð¨¡Oï.. l.‚ P */
-	$"4A28 0013 6606 4A2C 006F 6770 206C 0082"            /* J(..f.J,.ogp l.‚ */
-	$"2050 4A28 0014 6716 7001 2F00 486E FFF0"            /*  PJ(..g.p./.Hnÿð */
-	$"48C7 2F07 2F0C 4EBA FB18 4FEF 0010 4A2C"            /* HÇ/./.Nºû.Oï..J, */
-	$"0070 6720 486E FFF8 486E FFF0 2F0C 4EBA"            /* .pg HnÿøHnÿð/.Nº */
-	$"F314 486E FFF8 48C7 2F07 2F0C 4EBA F660"            /* ó.HnÿøHÇ/./.Nºö` */
-	$"4FEF 0018 4A2C 0071 6738 486E FFF8 486E"            /* Oï..J,.qg8HnÿøHn */
-	$"FFF0 2F0C 4EBA F346 486E FFF8 48C7 2F07"            /* ÿð/.NºóFHnÿøHÇ/. */
-	$"2F0C 4EBA F752 4FEF 0018 6016 7000 2F00"            /* /.Nº÷ROï..`.p./. */
-	$"486E FFF0 48C7 2F07 2F0C 4EBA FAB4 4FEF"            /* HnÿðHÇ/./.Nºú´Oï */
-	$"0010 206C 0072 2050 43EE FFF8 5488 22D8"            /* .. l.r PCîÿøTˆ"Ø */
-	$"22D8 302E FFFC 536E FFFC 302E FFFE 536E"            /* "Ø0.ÿüSnÿü0.ÿþSn */
-	$"FFFE 48C7 2F07 2F0C 4EBA F3C8 486E FFF8"            /* ÿþHÇ/./.NºóÈHnÿø */
-	$"A8A1 486E FFF8 7001 3F00 3F00 A8A8 41EE"            /* ¨¡Hnÿøp.?.?.¨¨Aî */
-	$"0000 2F20 2F20 4EBA 09EA 4FEF 0010 6000"            /* ../ / NºÆêOï..`. */
-	$"00A6 486E FFF0 2F0C 4EBA F216 486E FFF8"            /* .¦Hnÿð/.Nºò.Hnÿø */
-	$"486E FFF0 2F0C 4EBA F25C 206C 0082 2050"            /* Hnÿð/.Nºò\ l.‚ P */
-	$"4A28 0010 4FEF 0014 6714 486E FFF8 48C7"            /* J(..Oï..g.HnÿøHÇ */
-	$"2F07 2F0C 4EBA F598 4FEF 000C 6068 486E"            /* /./.Nºõ˜Oï..`hHn */
-	$"FFF8 48C7 2F07 2F0C 4EBA F714 4FEF 000C"            /* ÿøHÇ/./.Nº÷.Oï.. */
-	$"6054 4A2C 0071 674E 486E FFF0 2F0C 4EBA"            /* `TJ,.qgNHnÿð/.Nº */
-	$"F1C0 486E FFF8 486E FFF0 2F0C 4EBA F25E"            /* ñÀHnÿøHnÿð/.Nºò^ */
-	$"206C 0082 2050 4A28 0011 4FEF 0014 6714"            /*  l.‚ PJ(..Oï..g. */
-	$"486E FFF8 48C7 2F07 2F0C 4EBA F65A 4FEF"            /* HnÿøHÇ/./.NºöZOï */
-	$"000C 6012 486E FFF8 48C7 2F07 2F0C 4EBA"            /* ..`.HnÿøHÇ/./.Nº */
-	$"F6BE 4FEF 000C 4EBA 08C2 4CEE 1880 FFE4"            /* ö¾Oï..Nº.ÂLî.€ÿä */
-	$"4E5E 205F 4FEF 000C 4ED0 4E56 FFF8 48E7"            /* N^ _Oï..NÐNVÿøHç */
-	$"1108 2E2E 000C 286E 0008 4A2C 006E 675C"            /* ......(n..J,.ng\ */
-	$"2D4C FFF8 2D47 FFFC 7000 2F00 486E FFF8"            /* -Lÿø-Gÿüp./.Hnÿø */
-	$"487A FDCA 2F2C 0072 4EBA 0340 2007 4FEF"            /* HzýÊ/,.rNº.@ .Oï */
-	$"0010 6738 5980 6702 601A 206C 0082 2050"            /* ..g8Y€g.`. l.‚ P */
-	$"4A28 0010 57C3 4403 206C 0082 2050 1143"            /* J(..WÃD. l.‚ P.C */
-	$"0010 6018 206C 0082 2050 4A28 0011 57C3"            /* ..`. l.‚ PJ(..WÃ */
-	$"4403 206C 0082 2050 1143 0011 4CEE 1088"            /* D. l.‚ P.C..Lî.ˆ */
-	$"FFEC 4E5E 4E75 4E56 FFF8 48E7 0018 286E"            /* ÿìN^NuNVÿøHç..(n */
-	$"0008 598F A8D8 265F 486E FFF8 2F0C 4EBA"            /* ..Y<EFBFBD>¨Ø&_Hnÿø/.Nº */
-	$"08F6 2F2C 0076 486E FFF8 A8DF 486E FFF8"            /* .ö/,.vHnÿø¨ßHnÿø */
-	$"70FF 3F00 3F00 A8A9 206C 0082 2050 4A28"            /* pÿ?.?.¨© l.‚ PJ( */
-	$"0014 671A 206C 0082 2050 4A28 0012 6708"            /* ..g. l.‚ PJ(..g. */
-	$"046E 000C FFF8 6006 046E 000C FFFA 2F2C"            /* .n..ÿø`..n..ÿú/, */
-	$"0072 486E FFF8 A8DF 486E FFF8 7001 3F00"            /* .rHnÿø¨ßHnÿøp.?. */
-	$"3F00 A8A8 2F0B 486E FFF8 A8DF 2F0B 2F2C"            /* ?.¨¨/.Hnÿø¨ß/./, */
-	$"0072 2F2C 0072 A8E5 2F0B A8D9 4CEE 1800"            /* .r/,.r¨å/.¨ÙLî.. */
-	$"FFF0 4E5E 4E75 4E56 FFF8 2F0C 286E 0008"            /* ÿðN^NuNVÿø/.(n.. */
-	$"206E 000C 43EE FFF8 22D8 22D8 206C 0082"            /*  n..Cîÿø"Ø"Ø l.‚ */
-	$"2050 4A28 0012 6708 046E 000C FFF8 6006"            /*  PJ(..g..n..ÿø`. */
-	$"046E 000C FFFA 486E FFF8 70FF 3F00 3F00"            /* .n..ÿúHnÿøpÿ?.?. */
-	$"A8A9 486E FFF8 A8A1 206C 0082 2050 4A28"            /* ¨©Hnÿø¨¡ l.‚ PJ( */
-	$"0012 6708 066E 000C FFF8 6006 066E 000C"            /* ..g..n..ÿø`..n.. */
-	$"FFFA 2F2E FFF8 A893 206C 0082 2050 4A28"            /* ÿú/.ÿø¨“ l.‚ PJ( */
-	$"0012 6710 302E FFFE 5540 3F00 3F2E FFF8"            /* ..g.0.ÿþU@?.?.ÿø */
-	$"A891 600E 3F2E FFFA 302E FFFC 5540 3F00"            /* ¨‘`.?.ÿú0.ÿüU@?. */
-	$"A891 302E FFFE 907C 0010 3F00 302E FFF8"            /* ¨‘0.ÿþ<EFBFBD>|..?.0.ÿø */
-	$"5240 3F00 A893 302E FFFE 907C 0010 3F00"            /* R@?.¨“0.ÿþ<EFBFBD>|..?. */
-	$"302E FFFC 5540 3F00 A891 3F2E FFFA 302E"            /* 0.ÿüU@?.¨‘?.ÿú0. */
-	$"FFFC 907C 0010 3F00 A893 302E FFFE 5540"            /* ÿü<C3BF>|..?.¨“0.ÿþU@ */
-	$"3F00 302E FFFC 907C 0010 3F00 A891 286E"            /* ?.0.ÿü<EFBFBD>|..?.¨‘(n */
-	$"FFF4 4E5E 4E75 4E56 FFF8 48E7 0108 206E"            /* ÿôN^NuNVÿøHç.. n */
-	$"0008 2850 2F0C 2F2E 000C 302E 0010 48C0"            /* ..(P/./...0...HÀ */
-	$"2F00 302E 0012 48C0 2F00 4EBA 055A 3E00"            /* /.0...HÀ/.Nº.Z>. */
-	$"486E FFF8 2F0C 4EBA F090 486E FFF8 48C7"            /* Hnÿø/.Nºð<EFBFBD>HnÿøHÇ */
-	$"2F07 2F0C 4EBA F5A0 4EBA 0680 4CEE 1080"            /* /./.Nºõ Nº.€Lî.€ */
-	$"FFF0 4E5E 205F 4FEF 000C 4ED0 4E56 FFF0"            /* ÿðN^ _Oï..NÐNVÿð */
-	$"48E7 0038 286E 0008 4A2C 006E 6766 206C"            /* Hç.8(n..J,.ngf l */
-	$"0082 2050 4A28 0015 675A 598F A8D8 245F"            /* .‚ PJ(..gZY<EFBFBD>¨Ø$_ */
-	$"598F A8D8 265F 2F2C 0018 2F2C 001C 2F0B"            /* Y<EFBFBD>¨Ø&_/,../,../. */
-	$"A8E4 2F0A A87A 486E FFFC 2F0C 4EBA 06D6"            /* ¨ä/¨zHnÿü/.Nº.Ö */
-	$"2F0B 2F2E FFFC A8E0 2F0B A879 2D4C FFF0"            /* /./.ÿü¨à/.¨y-Lÿð */
-	$"7000 2F00 486E FFF0 487A FF4C 2F2C 0072"            /* p./.HnÿðHzÿL/,.r */
-	$"4EBA 00C8 2F0A A879 2F0A A8D9 2F0B A8D9"            /* Nº.È/¨y/¨Ù/.¨Ù */
-	$"4FEF 0018 4CEE 1C00 FFE4 4E5E 4E75 4E56"            /* Oï..Lî..ÿäN^NuNV */
-	$"FFF0 2F03 7600 2F03 7001 41EE FFF0 A090"            /* ÿð/.v./.p.Aîÿð <EFBFBD> */
-	$"261F 4A40 660A 0C6E 0700 FFF4 6D02 7601"            /* &.J@fÂ.n..ÿôm.v. */
-	$"1003 262E FFEC 4E5E 4E75 4E56 FFF0 2F03"            /* ..&.ÿìN^NuNVÿð/. */
-	$"7600 2F03 7001 41EE FFF0 A090 261F 4A40"            /* v./.p.Aîÿð <EFBFBD>&.J@ */
-	$"6608 4A2E FFF9 6702 7601 1003 262E FFEC"            /* f.J.ÿùg.v...&.ÿì */
-	$"4E5E 4E75 4E56 FFF8 486E FFF8 A910 486E"            /* N^NuNVÿøHnÿø©.Hn */
-	$"FFFC AA48 2F2E FFFC A873 206E FFF8 41E8"            /* ÿüªH/.ÿü¨s nÿøAè */
-	$"0030 226E FFFC 43E9 0030 700A A02E 206E"            /* .0"nÿüCé.0p . n */
-	$"FFF8 41E8 0042 226E FFFC 43E9 0042 700E"            /* ÿøAè.B"nÿüCé.Bp. */
-	$"A02E 206E FFF8 4868 003A A89D 206E FFF8"            /*  . nÿøHh.:¨<EFBFBD> nÿø */
-	$"4868 0020 A87C 4E5E 4E75 4E56 FFEC 48E7"            /* Hh. ¨|N^NuNVÿìHç */
-	$"0338 2C2E 0010 4EBA FF46 4A00 6714 2F2E"            /* .8,...NºÿFJ.g./. */
-	$"0008 2F2E 000C 2F06 2F2E 0014 ABCA 6000"            /* ../..././...«Ê`. */
-	$"00CC 4EBA FF56 4A00 6700 00AE 598F A8D8"            /* .ÌNºÿVJ.g..®Y<EFBFBD>¨Ø */
-	$"2D5F FFF8 598F A8D8 245F 598F A8D8 265F"            /* -_ÿøY<EFBFBD>¨Ø$_Y<EFBFBD>¨Ø&_ */
-	$"2F2E FFF8 A87A 598F AA29 285F 6070 2054"            /* /.ÿø¨zY<EFBFBD>ª)(_`p T */
-	$"2D48 FFEC 41E8 0022 43EE FFF0 22D8 22D8"            /* -HÿìAè."Cîÿð"Ø"Ø */
-	$"206E FFEC 2068 0016 2050 3E28 0020 486E"            /*  nÿì h.. P>(. Hn */
-	$"FFF0 A871 486E FFF4 A871 2F0A 486E FFF0"            /* ÿð¨qHnÿô¨q/ÂHnÿð */
-	$"A8DF 2F2E 0008 2F0A 2F0B A8E4 2F0B 2F2E"            /* ¨ß/.../Â/.¨ä/./. */
-	$"FFF8 2F0B A8E4 558F 2F0B A8E2 4A1F 6616"            /* ÿø/.¨äU<EFBFBD>/.¨âJ.f. */
-	$"2F0B A879 3F07 2054 3F28 0014 2F0C 2F06"            /* /.¨y?. T?(.././. */
-	$"206E 000C 4E90 598F 2F0C AA2B 285F 200C"            /*  n..N<EFBFBD>Y<EFBFBD>/.ª+(_ . */
-	$"668C 2F2E FFF8 A879 2F2E FFF8 A8D9 2F0A"            /* fŒ/.ÿø¨y/.ÿø¨Ù/ */
-	$"A8D9 2F0B A8D9 6014 7001 3F00 7200 3F01"            /* ¨Ù/.¨Ù`.p.?.r.?. */
-	$"7000 2F00 2F06 206E 000C 4E90 4CEE 1CC0"            /* p././. n..N<EFBFBD>Lî.À */
-	$"FFD8 4E5E 4E75 4E56 0000 226E 000C 302E"            /* ÿØN^NuNV.."n..0. */
-	$"000A 6B60 0C40 000C 6E5A D040 303B 0006"            /* .Âk`.@..nZÐ@0;.. */
-	$"4EFB 0000 001C 0052 0052 0052 001C 001C"            /* Nû.....R.R.R.... */
-	$"0052 001C 0052 002E 0052 002E 0040 337C"            /* .R...R...R...@3| */
-	$"FFFF 0004 337C FFFF 0002 32BC FFFF 602A"            /* ÿÿ..3|ÿÿ..2¼ÿÿ`* */
-	$"337C CCCC 0002 32BC CCCC 337C FFFF 0004"            /* 3|ÌÌ..2¼ÌÌ3|ÿÿ.. */
-	$"6018 337C 3333 0002 32BC 3333 337C 6666"            /* `.3|33..2¼333|ff */
-	$"0004 6006 42A9 0002 4251 4E5E 4E75 4E56"            /* ..`.B©..BQN^NuNV */
-	$"FFFC 48E7 0308 286E 0010 3E2E 000E 558F"            /* ÿüHç..(n..>...U<EFBFBD> */
-	$"2F2E 0008 486E FFFC AA42 206E FFFC 2050"            /* /...HnÿüªB nÿü P */
-	$"2068 0008 2050 3C28 0006 BE46 544F 6F1E"            /*  h.. P<(..¾FTOo. */
-	$"558F 7000 2F00 486E FFFC AA42 206E FFFC"            /* U<EFBFBD>p./.HnÿüªB nÿü */
-	$"2050 2068 0008 2050 3C28 0006 544F BE46"            /*  P h.. P<(..TO¾F */
-	$"6F0E 2F0C 48C7 2F07 4EBA FF2C 504F 601C"            /* o./.HÇ/.Nºÿ,PO`. */
-	$"48C7 206E FFFC 2050 2068 0008 2050 2007"            /* HÇ nÿü P h.. P . */
-	$"E780 41F0 080A 224C 22D8 32D8 4CEE 10C0"            /* ç€Að.Â"L"Ø2ØLî.À */
-	$"FFF0 4E5E 4E75 4E56 FFFA 486E FFFA 302E"            /* ÿðN^NuNVÿúHnÿú0. */
-	$"000E 48C0 2F00 2F2E 0008 4EBA FF62 486E"            /* ..HÀ/./...NºÿbHn */
-	$"FFFA AA14 4E5E 4E75 4E56 FFFA 486E FFFA"            /* ÿúª.N^NuNVÿúHnÿú */
-	$"302E 000E 48C0 2F00 2F2E 0008 4EBA FF40"            /* 0...HÀ/./...Nºÿ@ */
-	$"486E FFFA AA15 4E5E 4E75 4E56 0000 48E7"            /* Hnÿúª.N^NuNV..Hç */
-	$"0038 246E 0014 266E 0008 342E 0012 286E"            /* .8$n..&n..4...(n */
-	$"000C 700F 9042 3400 7000 3013 7200 3214"            /* ..p.<EFBFBD>B4.p.0.r.2. */
-	$"9081 48C2 4C02 0800 4C7C 0800 0000 000F"            /* <20><>HÂL...L|...... */
-	$"7200 3214 D280 3481 7000 302B 0002 7200"            /* r.2.Ò€4<EFBFBD>p.0+..r. */
-	$"322C 0002 9081 48C2 4C02 0800 4C7C 0800"            /* 2,..<EFBFBD><EFBFBD>HÂL...L|.. */
-	$"0000 000F 7200 322C 0002 D280 3541 0002"            /* ....r.2,..Ò€5A.. */
-	$"7000 302B 0004 7200 322C 0004 9081 48C2"            /* p.0+..r.2,..<EFBFBD><EFBFBD>HÂ */
-	$"4C02 0800 4C7C 0800 0000 000F 7200 322C"            /* L...L|......r.2, */
-	$"0004 D280 3541 0004 4CEE 1C00 FFF4 4E5E"            /* ..Ò€5A..Lî..ÿôN^ */
-	$"4E75 4E56 FFF4 2F0C 286E 0008 486E FFF4"            /* NuNVÿô/.(n..Hnÿô */
-	$"302E 000E 48C0 2F00 2F0C 4EBA FE82 486E"            /* 0...HÀ/./.Nºþ‚Hn */
-	$"FFFA 302E 0012 48C0 2F00 2F0C 4EBA FE70"            /* ÿú0...HÀ/./.Nºþp */
-	$"2F2E 0018 302E 0016 48C0 2F00 486E FFFA"            /* /...0...HÀ/.Hnÿú */
-	$"486E FFF4 4EBA FF24 286E FFF0 4E5E 4E75"            /* HnÿôNºÿ$(nÿðN^Nu */
-	$"4E56 FFFA 486E FFFA 302E 0016 48C0 2F00"            /* NVÿúHnÿú0...HÀ/. */
-	$"302E 0012 48C0 2F00 302E 000E 48C0 2F00"            /* 0...HÀ/.0...HÀ/. */
-	$"2F2E 0008 4EBA FF8C 486E FFFA AA14 4E5E"            /* /...NºÿŒHnÿúª.N^ */
-	$"4E75 4E56 FFFA 486E FFFA 302E 0016 48C0"            /* NuNVÿúHnÿú0...HÀ */
-	$"2F00 302E 0012 48C0 2F00 302E 000E 48C0"            /* /.0...HÀ/.0...HÀ */
-	$"2F00 2F2E 0008 4EBA FF5A 486E FFFA AA15"            /* /./...NºÿZHnÿúª. */
-	$"4E5E 4E75 4E56 FFFA 48E7 0F18 266E 0018"            /* N^NuNVÿúHç..&n.. */
-	$"382E 000E 286E 0008 4246 4247 6046 486E"            /* 8...(n..BFBG`FHn */
-	$"FFFA 48C7 2007 D080 3033 0800 48C0 2F00"            /* ÿúHÇ .Ѐ03..HÀ/. */
-	$"302E 0012 48C0 2F00 48C4 2F04 2F0C 4EBA"            /* 0...HÀ/.HÄ/./.Nº */
-	$"FF12 3A06 598F 486E FFFA AA33 201F 3C00"            /* ÿ.:.Y<EFBFBD>Hnÿúª3 .<. */
-	$"4A47 4FEF 0014 6F08 BA46 6604 7000 600C"            /* JGOï..o.ºFf.p.`. */
-	$"3007 5247 BE6E 0016 6DB4 7001 4CEE 18F0"            /* 0.RG¾n..m´p.Lî.ð */
-	$"FFE2 4E5E 4E75 4E56 FFEC 48E7 1718 3C2E"            /* ÿâN^NuNVÿìHç..<. */
-	$"000A 266E 0014 49EE FFEC 7600 2F03 4EBA"            /* .Â&n..Iîÿìv./.Nº */
-	$"FB6A 261F 4A00 670A 7001 C06E 000E 6702"            /* ûj&.J.gÂp.Àn..g. */
-	$"7601 1A03 4247 0C46 0004 6D4C 206E 0010"            /* v...BG.F..mL n.. */
-	$"2050 7001 B068 0004 673E 4EBA FB12 4A00"            /*  Pp.°h..g>Nºû.J. */
-	$"6604 7E01 6032 486E FFF6 700B 2F00 2F0B"            /* f.~.`2Hnÿöp././. */
-	$"4EBA FD1C 7000 302E FFF6 4A80 4FEF 000C"            /* Nºý.p.0.ÿöJ€Oï.. */
-	$"6614 7000 302E FFF8 4A80 660A 7000 302E"            /* f.p.0.ÿøJ€fÂp.0. */
-	$"FFFA 4A80 6702 7E02 0C47 0002 6600 00B0"            /* ÿúJ€g.~..G..f..° */
-	$"4A05 6700 00AA 0C46 0008 6E00 00A2 4247"            /* J.g..ª.F..n..¢BG */
-	$"598F AA32 2D5F FFFC 2F2E 0010 AA31 4254"            /* Y<EFBFBD>ª2-_ÿü/...ª1BT */
-	$"397C 0007 0002 397C 0008 0004 397C 000A"            /* 9|....9|....9|. */
-	$"0006 397C 000D 0008 2F0C 7005 2F00 7206"            /* ..9|..../.p./.r. */
-	$"2F01 2F00 2F0B 4EBA FEBC 4A00 4FEF 0014"            /* /././.Nºþ¼J.Oï.. */
-	$"6756 4254 397C 0001 0002 397C 0004 0004"            /* gVBT9|....9|.... */
-	$"2F0C 7003 2F00 7208 2F01 7007 2F00 2F0B"            /* /.p./.r./.p././. */
-	$"4EBA FE92 4A00 4FEF 0014 672C 4254 397C"            /* Nºþ’J.Oï..g,BT9| */
-	$"0004 0002 397C 000F 0004 2F0C 7003 2F00"            /* ....9|..../.p./. */
-	$"720C 2F01 700B 2F00 2F0B 4EBA FE68 4A00"            /* r./.p././.NºþhJ. */
-	$"4FEF 0014 6702 7E02 2F2E FFFC AA31 3007"            /* Oï..g.~./.ÿüª10. */
-	$"4CEE 18E8 FFD4 4E5E 4E75 4E56 0000 7021"            /* Lî.èÿÔN^NuNV..p! */
-	$"2F00 A862 701E 2F00 A863 4E5E 4E75 4E56"            /* /.¨bp./.¨cN^NuNV */
-	$"FFF8 2F0C 286E 0008 41EE FFF8 224C 20D9"            /* ÿø/.(n..Aîÿø"L Ù */
-	$"20D9 2F0C A8A1 486E FFF8 7001 3F00 3F00"            /*  Ù/.¨¡Hnÿøp.?.?. */
-	$"A8A9 486E FFF8 A8A3 286E FFF4 4E5E 4E75"            /* ¨©Hnÿø¨£(nÿôN^Nu */
-	$"4E56 0000 302E 000E 536E 000E 302E 000C"            /* NV..0...Sn..0... */
-	$"536E 000C 3F2E 000A 3F2E 000C A893 2F2E"            /* Sn..?..Â?...¨“/. */
-	$"0008 A891 3F2E 000E 3F2E 0008 A891 4E5E"            /* ..¨‘?...?...¨‘N^ */
-	$"4E75 4E56 0000 302E 000E 536E 000E 302E"            /* NuNV..0...Sn..0. */
-	$"000C 536E 000C 3F2E 000A 3F2E 000C A893"            /* ..Sn..?..Â?...¨“ */
-	$"2F2E 000C A891 3F2E 000E 3F2E 0008 A891"            /* /...¨‘?...?...¨‘ */
-	$"4E5E 4E75 4E56 FFFC 2F0C 286E 000C 486E"            /* N^NuNVÿü/.(n..Hn */
-	$"FFFC A874 2F2E 0008 A873 2F0C 7000 3F00"            /* ÿü¨t/...¨s/.p.?. */
-	$"3F00 A880 2F0C A870 2F2E FFFC A873 286E"            /* ?.¨€/.¨p/.ÿü¨s(n */
-	$"FFF8 4E5E 4E75 4E56 FFFC 48E7 0018 266E"            /* ÿøN^NuNVÿüHç..&n */
-	$"000C 286E 0008 41EC 0010 224B 22D8 22D8"            /* ..(n..Aì.."K"Ø"Ø */
-	$"486E FFFC 2F0C 4EBA FFAC 2F0B 2F2E FFFC"            /* Hnÿü/.Nºÿ¬/./.ÿü */
-	$"A8A8 4CEE 1800 FFF4 4E5E 4E75"                      /* ¨¨Lî..ÿôN^Nu */
-};
-
 data 'snd ' (1047, "Sizzle", purgeable) {
 	$"0001 0001 0005 0000 00A0 0001 8051 0000"            /* ......... ..€Q.. */
 	$"0000 0014 0000 0000 0000 08C0 56EE 8BA3"            /* ...........ÀVî‹£ */

GpApp/About.cpp

@@ -7,26 +7,39 @@
 #include "PLArrayView.h"
 #include "PLKeyEncoding.h"
 #include "PLControlDefinitions.h"
+#include "FontFamily.h"
+#include "PLButtonWidget.h"
+#include "PLLabelWidget.h"
 #include "PLNumberFormatting.h"
 #include "PLResources.h"
 #include "PLSound.h"
 #include "PLPasStr.h"
+#include "PLStandardColors.h"
 #include "PLSysCalls.h"
+#include "PLTimeTaggedVOSEvent.h"
 #include "PLWidgets.h"
 #include "About.h"
 #include "DialogManager.h"
 #include "DialogUtils.h"
 #include "Environ.h"
 #include "Externs.h"
+#include "GpApplicationName.h"
+#include "GpBuildVersion.h"
 #include "HostSystemServices.h"
+#include "RenderedFont.h"
+#include "RenderedFontMetrics.h"
+#include "ResolveCachingColor.h"
+#include "ResourceManager.h"
 #include "ScanlineMask.h"
-#include "PLTimeTaggedVOSEvent.h"
+#include "WindowDef.h"
+#include "WindowManager.h"
 
 
 static void HiLiteOkayButton (DrawSurface *surface);
 static void UnHiLiteOkayButton (DrawSurface *surface);
 static void UpdateMainPict (Dialog *);
-static int16_t AboutFilter(Dialog *, const TimeTaggedVOSEvent &evt);
+static int16_t AboutFilter(Dialog *, const TimeTaggedVOSEvent *evt);
+static int16_t AboutFrameworkFilter(Dialog *, const TimeTaggedVOSEvent *evt);
 
 
 static Point			okayButtLowerV, okayButtUpperV;
@@ -49,21 +62,18 @@ void DoAbout (void)
 	StringPtr		messagePtr;
 	VersRecHndl		version;
 	ControlHandle	itemHandle;
-	short			hit, wasResFile;
+	short			hit;
 	
-	wasResFile = CurResFile();
-	UseResFile(thisMac.thisResFile);
-	
-	aboutDialog = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(kAboutDialogID, PL_GetPutInFrontWindowPtr());
+	aboutDialog = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(kAboutDialogID, PL_GetPutInFrontWindowPtr(), nullptr);
 //	if (aboutDialog == nil)
 //		RedAlert(kErrDialogDidntLoad);
 	
-	version = GetResource('vers', 1).StaticCast<VersionRecord>();
+	version = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('vers', 1).StaticCast<VersionRecord>();
 	if (version != nil)
 	{
 		messagePtr = (**version).shortVersion + 1 + (**version).shortVersion[0];
 
-		BlockMove((Ptr)messagePtr, &longVersion, ((UInt8)*messagePtr) + 1);
+		memcpy(&longVersion, messagePtr, ((UInt8)*messagePtr) + 1);
 		SetDialogString(aboutDialog, kTextItemVers, longVersion);
 	}
 
@@ -86,8 +96,66 @@ void DoAbout (void)
 	while (hit != kOkayButton);
 
 	aboutDialog->Destroy();
+}
+
+void DoAboutFramework (void)
+{
+#define			kAboutFrameworkDialogTemplateID			2000
+
+	const Rect windowRect = Rect::Create(0, 0, 272, 450);
+
+	PortabilityLayer::WindowDef wdef = PortabilityLayer::WindowDef::Create(windowRect, PortabilityLayer::WindowStyleFlags::kAlert, true, 0, 0, PSTR(""));
+
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+	PortabilityLayer::RenderedFont *font = GetApplicationFont(12, PortabilityLayer::FontFamilyFlag_Bold, true);
+	PortabilityLayer::RenderedFont *fontLight = GetApplicationFont(8, PortabilityLayer::FontFamilyFlag_None, true);
+
+	int16_t verticalPoint = 16 + font->GetMetrics().m_ascent;
+	int16_t horizontalOffset = 16;
+	const int16_t spacing = 12;
+
+	PortabilityLayer::DialogManager *dialogManager = PortabilityLayer::DialogManager::GetInstance();
+	Dialog *dialog = dialogManager->LoadDialogFromTemplate(kAboutFrameworkDialogTemplateID, windowRect, true, false, 0, 0, PL_GetPutInFrontWindowPtr(), PSTR(""), nullptr);
+
+#ifdef NDEBUG
+	#define ABOUT_DIALOG_CONFIGURATION_TAG "Release"
+#else
+	#define ABOUT_DIALOG_CONFIGURATION_TAG "Debug"
+#endif
+
+	Window *window = dialog->GetWindow();
+
+	DrawSurface *surface = window->GetDrawSurface();
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 0), PSTR(GP_APPLICATION_NAME " " GP_APPLICATION_VERSION_STRING "   \xa9" GP_APPLICATION_COPYRIGHT_STRING), blackColor, font);
 	
-	UseResFile(wasResFile);
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 2), PSTR(GP_APPLICATION_NAME " is an unoffical third-party port of Glider PRO\xaa."), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 4), PSTR("This software is not maintained by, supported by, endorsed by, or"), blackColor, font);
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 5), PSTR("otherwise associated with the authors and publishers of Glider PRO\xaa."), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 7), PSTR("Please do not contact any of them regarding issues that you have"), blackColor, font);
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 8), PSTR("with " GP_APPLICATION_NAME "."), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 10), PSTR("If you would like to contribute to this project, visit:"), blackColor, font);
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 11), PSTR(GP_APPLICATION_WEBSITE_STRING), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 13), PSTR("To report a problem or request support, submit an issue via"), blackColor, font);
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 14), PSTR("the website above."), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, verticalPoint + spacing * 16), PSTR("For more information, please see the accompanying documentation."), blackColor, font);
+
+	surface->DrawString(Point::Create(horizontalOffset, windowRect.bottom - 16), PSTR("Build: " __DATE__ " " __TIME__ " " ABOUT_DIALOG_CONFIGURATION_TAG), blackColor, fontLight);
+
+	DrawDefaultButton(dialog);
+
+	int16_t hit = 0;
+
+	do
+	{
+		hit = dialog->ExecuteModal(AboutFrameworkFilter);
+	} while (hit != kOkayButton);
+
+	dialog->Destroy();
 }
 
 //==============================================================  Static Functions
@@ -97,11 +165,11 @@ void DoAbout (void)
 static void HiLiteOkayButton (DrawSurface *surface)
 {
 	#define		kOkayButtPICTHiLit		151		// res ID of unhilit button PICT
-	THandle<Picture>	thePict;
+	THandle<BitmapImage>	thePict;
 	
 	if (!okayButtIsHiLit)
 	{
-		thePict = GetPicture(kOkayButtPICTHiLit);
+		thePict = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('PICT', kOkayButtPICTHiLit).StaticCast<BitmapImage>();
 		if (thePict != nil)
 		{
 			surface->DrawPicture(thePict, okayButtonBounds);
@@ -119,11 +187,11 @@ static void HiLiteOkayButton (DrawSurface *surface)
 static void UnHiLiteOkayButton (DrawSurface *surface)
 {
 	#define		kOkayButtPICTNotHiLit	150		// res ID of hilit button PICT
-	THandle<Picture>	thePict;
+	THandle<BitmapImage>	thePict;
 	
 	if (okayButtIsHiLit)
 	{
-		thePict = GetPicture(kOkayButtPICTNotHiLit);
+		thePict = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('PICT', kOkayButtPICTNotHiLit).StaticCast<BitmapImage>();
 		if (thePict != nil)
 		{
 			surface->DrawPicture(thePict, okayButtonBounds);
@@ -153,10 +221,10 @@ static void UpdateMainPict (Dialog *theDial)
 	DrawDialogUserText2(theDial, 7, theStr);
 	
 	PasStringCopy(PSTR("Screen:   "), theStr);		// display screen size/depth
-	NumToString((long)(thisMac.screen.right - thisMac.screen.left), theStr2);
+	NumToString((long)(thisMac.fullScreen.right - thisMac.fullScreen.left), theStr2);
 	PasStringConcat(theStr, theStr2);
 	PasStringConcat(theStr, PSTR("x"));
-	NumToString((long)(thisMac.screen.bottom - thisMac.screen.top), theStr2);
+	NumToString((long)(thisMac.fullScreen.bottom - thisMac.fullScreen.top), theStr2);
 	PasStringConcat(theStr, theStr2);
 	PasStringConcat(theStr, PSTR("x"));
 	NumToString((long)thisMac.isDepth, theStr2);
@@ -180,17 +248,20 @@ static bool PointIsInDiagonalOkayButton(const Point &pt)
 //--------------------------------------------------------------  AboutFilter
 // Dialog filter for the About dialog.
 
-static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent &evt)
+static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt)
 {
 	bool		handledIt = false;
 	int16_t		hit = -1;
 
+	if (!evt)
+		return -1;
+
 	Window *window = dialog->GetWindow();
 	DrawSurface *surface = window->GetDrawSurface();
 
-	if (evt.IsKeyDownEvent())
+	if (evt->IsKeyDownEvent())
 	{
-		switch (PackVOSKeyCode(evt.m_vosEvent.m_event.m_keyboardInputEvent))
+		switch (PackVOSKeyCode(evt->m_vosEvent.m_event.m_keyboardInputEvent))
 		{
 		case PL_KEY_SPECIAL(kEnter):
 		case PL_KEY_NUMPAD_SPECIAL(kEnter):
@@ -206,9 +277,9 @@ static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent &evt)
 			break;
 		}
 	}
-	else if (evt.m_vosEvent.m_eventType == GpVOSEventTypes::kMouseInput)
+	else if (evt->m_vosEvent.m_eventType == GpVOSEventTypes::kMouseInput)
 	{
-		const GpMouseInputEvent &mouseEvt = evt.m_vosEvent.m_event.m_mouseInputEvent;
+		const GpMouseInputEvent &mouseEvt = evt->m_vosEvent.m_event.m_mouseInputEvent;
 		const Point mousePt = window->MouseToLocal(mouseEvt);
 
 		if (mouseEvt.m_eventType == GpMouseEventTypes::kDown)
@@ -254,3 +325,44 @@ static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent &evt)
 	return hit;
 }
 
+
+
+//--------------------------------------------------------------  AboutFrameworkFilter
+// Dialog filter for the About Framework dialog.
+
+static int16_t AboutFrameworkFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt)
+{
+	bool		handledIt = false;
+	int16_t		hit = -1;
+
+	if (!evt)
+		return -1;
+
+	Window *window = dialog->GetWindow();
+	DrawSurface *surface = window->GetDrawSurface();
+
+	if (evt->IsKeyDownEvent())
+	{
+		switch (PackVOSKeyCode(evt->m_vosEvent.m_event.m_keyboardInputEvent))
+		{
+		case PL_KEY_SPECIAL(kEnter):
+		case PL_KEY_NUMPAD_SPECIAL(kEnter):
+			dialog->GetItems()[kOkayButton - 1].GetWidget()->SetHighlightStyle(kControlButtonPart, true);
+			PLSysCalls::Sleep(8);
+			dialog->GetItems()[kOkayButton - 1].GetWidget()->SetHighlightStyle(kControlButtonPart, false);
+			hit = kOkayButton;
+			handledIt = true;
+			break;
+
+		default:
+			handledIt = false;
+			break;
+		}
+	}
+
+	if (!handledIt)
+		return -1;
+
+	return hit;
+}
+

GpApp/AnimCursor.cpp

@@ -11,7 +11,9 @@
 #include "Externs.h"
 #include "Environ.h"
 #include "HostDisplayDriver.h"
-#include "IGpColorCursor.h"
+#include "IGpCursor.h"
+#include "IGpDisplayDriver.h"
+#include "ResourceManager.h"
 
 
 #define	rAcurID					128
@@ -35,7 +37,7 @@ typedef struct
 {
 	struct
 	{
-		IGpColorCursor *hwCursor;
+		IGpCursor *hwCursor;
 	} frame[1];
 } compiledAcurRec;
 
@@ -59,7 +61,7 @@ compiledAcurHandle	compiledAnimCursorH = nil;
 Boolean GetColorCursors (acurHandle ballCursH, compiledAcurHandle compiledBallCursH)
 {
 	short			i, j;
-	IGpColorCursor *hwCursor;
+	IGpCursor *hwCursor;
 	Boolean			result = true;
 	
 	if (ballCursH)
@@ -68,7 +70,7 @@ Boolean GetColorCursors (acurHandle ballCursH, compiledAcurHandle compiledBallCu
 		HideCursor();						// Hide the cursor
 		for (i = 0; i < j; i++)				// Walk through the acur resource
 		{
-			hwCursor = PortabilityLayer::HostDisplayDriver::GetInstance()->LoadColorCursor((*ballCursH)->frame[i].resID);	// Get the cursor
+			hwCursor = PortabilityLayer::HostDisplayDriver::GetInstance()->LoadCursor(true, (*ballCursH)->frame[i].resID);	// Get the cursor
 			if (hwCursor == nil)		// Make sure a real cursor was returned
 			{								// If not, trash all cursors loaded
 				for (j = 0; j < i; j++)
@@ -79,7 +81,7 @@ Boolean GetColorCursors (acurHandle ballCursH, compiledAcurHandle compiledBallCu
 			else							// But, if the cursor loaded ok
 			{								// add it to our list or cursor handles
 				(*compiledBallCursH)->frame[i].hwCursor = hwCursor;
-				PortabilityLayer::HostDisplayDriver::GetInstance()->SetColorCursor(hwCursor);
+				PortabilityLayer::HostDisplayDriver::GetInstance()->SetCursor(hwCursor);
 			}
 		}
 		InitCursor();						// Show the cursor again (as arrow)
@@ -96,7 +98,7 @@ void InitAnimatedCursor (acurHandle ballCursH)
 	compiledAcurHandle	compiledBallCursorH;
 	
 	if (ballCursH == nil) 
-		ballCursH = GetResource('acur', 128).StaticCast<acurRec>();
+		ballCursH = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('acur', 128).StaticCast<acurRec>();
 	if (ballCursH && ballCursH != animCursorH)
 	{
 		compiledBallCursorH = NewHandle(sizeof(compiledAcurRec) * (*ballCursH)->n).StaticCast<compiledAcurRec>();
@@ -121,7 +123,7 @@ void InitAnimatedCursor (acurHandle ballCursH)
 
 void LoadCursors (void)
 {
-	InitAnimatedCursor(GetResource('acur', rAcurID).StaticCast<acurRec>());
+	InitAnimatedCursor(PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('acur', rAcurID).StaticCast<acurRec>());
 }
 
 //--------------------------------------------------------------  DisposCursors
@@ -166,10 +168,10 @@ void IncrementCursor (void)
 		(*animCursorH)->index++;
 		(*animCursorH)->index %= (*animCursorH)->n;
 
-		PortabilityLayer::HostDisplayDriver::GetInstance()->SetColorCursor((*compiledAnimCursorH)->frame[(*animCursorH)->index].hwCursor);
+		PortabilityLayer::HostDisplayDriver::GetInstance()->SetCursor((*compiledAnimCursorH)->frame[(*animCursorH)->index].hwCursor);
 	}
 	else
-		SetBuiltinCursor(watchCursor);
+		PortabilityLayer::HostDisplayDriver::GetInstance()->SetStandardCursor(EGpStandardCursors::kWait);
 }
 
 //--------------------------------------------------------------  DecrementCursor
@@ -186,10 +188,10 @@ void DecrementCursor (void)
 		if (((*animCursorH)->index) < 0)
 			(*animCursorH)->index = ((*animCursorH)->n) - 1;
 
-		PortabilityLayer::HostDisplayDriver::GetInstance()->SetColorCursor((*compiledAnimCursorH)->frame[(*animCursorH)->index].hwCursor);
+		PortabilityLayer::HostDisplayDriver::GetInstance()->SetCursor((*compiledAnimCursorH)->frame[(*animCursorH)->index].hwCursor);
 	}
 	else
-		SetBuiltinCursor(watchCursor);
+		PortabilityLayer::HostDisplayDriver::GetInstance()->SetStandardCursor(EGpStandardCursors::kWait);
 }
 
 //--------------------------------------------------------------  SpinCursor

GpApp/AppleEvents.cpp

@@ -6,13 +6,17 @@
 //============================================================================
 
 
-#include "PLAppleEvents.h"
+#include "AppEventHandler.h"
+#include "DialogManager.h"
 #include "Externs.h"
 #include "House.h"
 
 
 #define kNoPrintingAlert			1031
 
+extern	Boolean		quitting;
+
+#if 0
 
 PLError_t DoOpenAppAE (const AppleEvent *, AppleEvent *, UInt32);
 PLError_t DoOpenDocAE (const AppleEvent *, AppleEvent *, UInt32);
@@ -26,7 +30,6 @@ AEEventHandlerUPP	openAppAEUPP, openDocAEUPP, printDocAEUPP, quitAEUPP;
 extern	VFileSpec	*theHousesSpecs;
 extern	long		incrementModeTime;
 extern	short		thisHouseIndex, splashOriginH, splashOriginV;
-extern	Boolean		quitting;
 
 
 //==============================================================  Functions
@@ -50,11 +53,12 @@ PLError_t DoOpenDocAE (const AppleEvent *theAE, AppleEvent *reply, UInt32 ref)
 	VFileInfo		finderInfo;
 	AEDescList		docList;
 	long			itemsInList;
-	Size			actualSize;
+	size_t			actualSize;
 	AEKeyword		keywd;
 	DescType		returnedType;
 	PLError_t			theErr, whoCares;
 	short			i;
+	bool			redrawMainWindow = false;
 	
 	theErr = AEGetParamDesc(theAE, keyDirectObject, typeAEList, &docList);
 	if (theErr != PLErrors::kNone)
@@ -111,7 +115,7 @@ PLError_t DoOpenDocAE (const AppleEvent *theAE, AppleEvent *reply, UInt32 ref)
 					Rect		updateRect;
 					
 					SetRect(&updateRect, splashOriginH + 474, splashOriginV + 304, splashOriginH + 474 + 166, splashOriginV + 304 + 12);
-					InvalWindowRect(mainWindow, &updateRect);
+					redrawMainWindow = true;
 				}
 			}
 		}
@@ -119,6 +123,9 @@ PLError_t DoOpenDocAE (const AppleEvent *theAE, AppleEvent *reply, UInt32 ref)
 	}
 #endif
 	whoCares = AEDisposeDesc(&docList);
+
+	if (redrawMainWindow)
+		UpdateMainWindow();
 	
 	return theErr;
 }
@@ -131,7 +138,7 @@ PLError_t DoPrintDocAE (const AppleEvent *theAE, AppleEvent *reply, UInt32 ref)
 	short		hitWhat;
 	
 //	CenterAlert(kNoPrintingAlert);
-	hitWhat = Alert(kNoPrintingAlert, nil);
+	hitWhat = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kNoPrintingAlert, nullptr);
 	
 	return PLErrors::kInvalidParameter;
 }
@@ -156,12 +163,37 @@ PLError_t DoQuitAE (const AppleEvent *theAE, AppleEvent *reply, UInt32 ref)
 PLError_t MyGotRequiredParams (const AppleEvent *theAE)
 {
 	DescType		returnedType;
-	Size			actualSize;
+	size_t			actualSize;
 	
 	return (AEGetAttributePtr(theAE, keyMissedKeywordAttr, typeWildCard,
 			&returnedType, 0L, 0, &actualSize) == errAEDescNotFound) ? PLErrors::kNone :
 			PLErrors::kInvalidParameter;
 }
+#endif
+
+class SystemEventHandlerImpl : public PortabilityLayer::IAppEventHandler
+{
+public:
+	void OnQuit() override;
+
+	static SystemEventHandlerImpl *GetInstance();
+
+private:
+	static SystemEventHandlerImpl ms_instance;
+};
+
+void SystemEventHandlerImpl::OnQuit()
+{
+	quitting = true;
+}
+
+
+SystemEventHandlerImpl *SystemEventHandlerImpl::GetInstance()
+{
+	return &ms_instance;
+}
+
+SystemEventHandlerImpl SystemEventHandlerImpl::ms_instance;
 
 //--------------------------------------------------------------  SetUpAppleEvents
 // Initializes all handlers, etc. for dealing with Apple Events.
@@ -169,34 +201,7 @@ PLError_t MyGotRequiredParams (const AppleEvent *theAE)
 void SetUpAppleEvents (void)
 {
 	PLError_t		theErr;
-	
-	openAppAEUPP = NewAEEventHandlerProc(DoOpenAppAE);
-	openDocAEUPP = NewAEEventHandlerProc(DoOpenDocAE);
-	printDocAEUPP = NewAEEventHandlerProc(DoPrintDocAE);
-	quitAEUPP = NewAEEventHandlerProc(DoQuitAE);
-	
-	theErr = AEInstallEventHandler(kCoreEventClass,		// install oapp 
-			kAEOpenApplication, openAppAEUPP, 0, false);
-	if (theErr != PLErrors::kNone)
-		YellowAlert(kYellowAppleEventErr, theErr);
-	
-	theErr = AEInstallEventHandler(kCoreEventClass, 	// install odoc 
-			kAEOpenDocuments, openDocAEUPP, 0, false);
-	if (theErr != PLErrors::kNone)
-		YellowAlert(kYellowAppleEventErr, theErr);
-	
-	theErr = AEInstallEventHandler(kCoreEventClass, 	// install pdoc 
-			kAEPrintDocuments, printDocAEUPP, 0, false);
-	if (theErr != PLErrors::kNone)
-		YellowAlert(kYellowAppleEventErr, theErr);
-	
-	theErr = AEInstallEventHandler(kCoreEventClass, 	// install quit 
-			kAEQuitApplication, quitAEUPP, 0, false);
-	if (theErr != PLErrors::kNone)
-		YellowAlert(kYellowAppleEventErr, theErr);
-	
-	theErr = AESetInteractionAllowed(kAEInteractWithAll);
-	if (theErr != PLErrors::kNone)
-		YellowAlert(kYellowAppleEventErr, theErr);
+
+	PortabilityLayer::AppEventHandler::SetInstance(SystemEventHandlerImpl::GetInstance());
 }
 

GpApp/Banner.cpp

@@ -14,8 +14,13 @@
 #include "FontManager.h"
 #include "MainWindow.h"
 #include "RectUtils.h"
+#include "RenderedFont.h"
+#include "RenderedFontMetrics.h"
+#include "ResolveCachingColor.h"
 #include "Room.h"
 #include "Utilities.h"
+#include "WindowDef.h"
+#include "WindowManager.h"
 
 
 #define kBannerPageTopPICT		1993
@@ -50,24 +55,24 @@ void DrawBanner (Point *topLeft)
 	PLError_t	theErr;
 	
 	QSetRect(&wholePage, 0, 0, 330, 220);
-	mapBounds = thisMac.screen;
+	mapBounds = thisMac.fullScreen;
 	ZeroRectCorner(&mapBounds);
 	CenterRectInRect(&wholePage, &mapBounds);
 	topLeft->h = wholePage.left;
 	topLeft->v = wholePage.top;
 	partPage = wholePage;
 	partPage.bottom = partPage.top + 190;	
-	LoadScaledGraphic(workSrcMap, kBannerPageTopPICT, &partPage);
+	LoadScaledGraphicCustom(workSrcMap, kBannerPageTopPICT, &partPage);
 	
 	partPage = wholePage;
 	partPage.top = partPage.bottom - 30;
 	mapBounds = partPage;
 	ZeroRectCorner(&mapBounds);
-	theErr = CreateOffScreenGWorld(&tempMap, &mapBounds, kPreferredPixelFormat);
-	LoadGraphic(tempMap, kBannerPageBottomPICT);
+	theErr = CreateOffScreenGWorld(&tempMap, &mapBounds);
+	LoadGraphicCustom(tempMap, kBannerPageBottomPICT);
 	
-	theErr = CreateOffScreenGWorld(&tempMask, &mapBounds, GpPixelFormats::kBW1);	
-	LoadGraphic(tempMask, kBannerPageBottomMask);
+	theErr = CreateOffScreenGWorldCustomDepth(&tempMask, &mapBounds, GpPixelFormats::kBW1);	
+	LoadGraphicCustom(tempMask, kBannerPageBottomMask);
 
 	CopyMask((BitMap *)*GetGWorldPixMap(tempMap), 
 			(BitMap *)*GetGWorldPixMap(tempMask), 
@@ -84,16 +89,17 @@ void DrawBanner (Point *topLeft)
 short CountStarsInHouse (void)
 {
 	short		i, h, numRooms, numStars;
+	housePtr	housePtr = *thisHouse;
 	
 	numStars = 0;
 	
-	numRooms = (*thisHouse)->nRooms;
+	numRooms = housePtr->nRooms;
 	for (i = 0; i < numRooms; i++)
 	{
-		if ((*thisHouse)->rooms[i].suite != kRoomIsEmpty)
+		if (housePtr->rooms[i].suite != kRoomIsEmpty)
 			for (h = 0; h < kMaxRoomObs; h++)
 			{
-				if ((*thisHouse)->rooms[i].objects[h].what == kStar)
+				if (housePtr->rooms[i].objects[h].what == kStar)
 					numStars++;
 			}
 	}
@@ -110,19 +116,17 @@ void DrawBannerMessage (Point topLeft)
 	Str255		bannerStr, subStr;
 	short		count;
 
-	DrawSurface *wasGWorld = GetGraphicsPort();
-
-	SetGraphicsPort(workSrcMap);
-
 	PasStringCopy((*thisHouse)->banner, bannerStr);
 
-	workSrcMap->SetApplicationFont(12, PortabilityLayer::FontFamilyFlag_Bold);
-	workSrcMap->SetForeColor(StdColors::Black());
+	PortabilityLayer::RenderedFont *appFont = GetApplicationFont(12, PortabilityLayer::FontFamilyFlag_Bold, true);
+
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+
 	count = 0;
 	do
 	{
 		GetLineOfText(bannerStr, count, subStr);
-		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 32 + (count * 20)), subStr);
+		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 32 + (count * 20)), subStr, blackColor, appFont);
 		count++;
 	}
 	while (subStr[0] > 0);
@@ -143,15 +147,12 @@ void DrawBannerMessage (Point topLeft)
 			GetLocalizedString(4, subStr);
 		PasStringConcat(bannerStr, subStr);
 
-		workSrcMap->SetForeColor(StdColors::Red());
-		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 164), bannerStr);
+		PortabilityLayer::ResolveCachingColor redColor = StdColors::Red();
+		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 164), bannerStr, redColor, appFont);
 
 		GetLocalizedString(5, subStr);
-		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 180), subStr);
+		workSrcMap->DrawString(Point::Create(topLeft.h + 16, topLeft.v + 180), subStr, redColor, appFont);
 	}
-	workSrcMap->SetForeColor(StdColors::Black());
-
-	SetGraphicsPort(wasGWorld);
 }
 
 //--------------------------------------------------------------  BringUpBanner
@@ -195,35 +196,53 @@ void BringUpBanner (void)
 // in a house.  It comes up when the player gets a star (the game is paused<65>
 // and the user informed as to how many remain).
 
-void DisplayStarsRemaining (void)
+void DisplayStarsRemaining(void)
 {
 	Rect		src, bounds;
 	Str255		theStr;
-	DrawSurface *surface = mainWindow->GetDrawSurface();
+
+	PortabilityLayer::WindowManager *wm = PortabilityLayer::WindowManager::GetInstance();
 
 	QSetRect(&bounds, 0, 0, 256, 64);
-	CenterRectInRect(&bounds, &thisMac.screen);
-	QOffsetRect(&bounds, -thisMac.screen.left, -thisMac.screen.top);
-	src = bounds;
-	InsetRect(&src, 64, 32);
+	CenterRectInRect(&bounds, &thisMac.fullScreen);
+	QOffsetRect(&bounds, -thisMac.fullScreen.left, -thisMac.fullScreen.top);
+	QOffsetRect(&bounds, 0, -20);
 
-	surface->SetApplicationFont(12, PortabilityLayer::FontFamilyFlag_Bold);
+	// Inset by 1 because the original graphic is bordered, and we want to use the window chrome for the border because it will apply the flicker effect
+	Rect windowBounds = bounds.Inset(1, 1);
+
+	PortabilityLayer::WindowDef wdef = PortabilityLayer::WindowDef::Create(windowBounds, 0, true, 0, 0, PSTR(""));
+
+	// Zero out
+	QOffsetRect(&bounds, -bounds.left - 1, -bounds.top - 1);
+
+	Window *starsWindow = wm->CreateWindow(wdef);
+	wm->PutWindowBehind(starsWindow, wm->GetPutInFrontSentinel());
+
+	DrawSurface *surface = starsWindow->GetDrawSurface();
+
+	PortabilityLayer::RenderedFont *appFont = GetApplicationFont(12, PortabilityLayer::FontFamilyFlag_Bold, true);
 
 	NumToString((long)numStarsRemaining, theStr);
-	
-	QOffsetRect(&bounds, 0, -20);
+
 	if (numStarsRemaining < 2)
-		LoadScaledGraphic(surface, kStarRemainingPICT, &bounds);
+		LoadScaledGraphicCustom(surface, kStarRemainingPICT, &bounds);
 	else
 	{
-		LoadScaledGraphic(surface, kStarsRemainingPICT, &bounds);
-		const Point textPoint = Point::Create(bounds.left + 102 - (surface->MeasureString(theStr) / 2), bounds.top + 23);
-		ColorText(surface, textPoint, theStr, 4L);
+		LoadScaledGraphicCustom(surface, kStarsRemainingPICT, &bounds);
+		const Point textPoint = Point::Create(bounds.left + 102 - (appFont->MeasurePStr(theStr) / 2), bounds.top + 23);
+		ColorText(surface, textPoint, theStr, 4L, appFont);
 	}
-	
+
+	if (doZooms)
+		wm->FlickerWindowIn(starsWindow, 32);
+
 	DelayTicks(60);
-	if (WaitForInputEvent(30))
-		RestoreEntireGameScreen();
-	CopyRectWorkToMain(&bounds);
+	WaitForInputEvent(30);
+
+	if (doZooms)
+		wm->FlickerWindowOut(starsWindow, 32);
+
+	wm->DestroyWindow(starsWindow);
 }
 

GpApp/ColorUtils.cpp

@@ -10,6 +10,7 @@
 #include "PLPalettes.h"
 #include "PLPasStr.h"
 #include "QDStandardPalette.h"
+#include "ResolveCachingColor.h"
 
 
 //==============================================================  Functions
@@ -19,14 +20,11 @@
 // this function draws text in that color.  It assumes the current port,<2C>
 // the current font, the current pen location, etc.
 
-void ColorText (DrawSurface *surface, const Point &point, StringPtr theStr, long color)
+void ColorText (DrawSurface *surface, const Point &point, StringPtr theStr, long color, PortabilityLayer::RenderedFont *font)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->DrawString(point, theStr);
-	surface->SetForeColor(wasColor);
+	surface->DrawString(point, theStr, rColor, font);
 }
 
 //--------------------------------------------------------------  ColorRect
@@ -36,12 +34,9 @@ void ColorText (DrawSurface *surface, const Point &point, StringPtr theStr, long
 
 void ColorRect (DrawSurface *surface, const Rect &theRect, long color)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->FillRect(theRect);
-	surface->SetForeColor(wasColor);
+	surface->FillRect(theRect, rColor);
 }
 
 //--------------------------------------------------------------  ColorOval
@@ -51,27 +46,27 @@ void ColorRect (DrawSurface *surface, const Rect &theRect, long color)
 
 void ColorOval (DrawSurface *surface, const Rect &theRect, long color)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->FillEllipse(theRect);
-	surface->SetForeColor(wasColor);
+	surface->FillEllipse(theRect, rColor);
 }
 
-//--------------------------------------------------------------  ColorRegion
+void ColorOvalMaskPattern(DrawSurface *surface, const Rect &theRect, long color, const uint8_t *pattern)
+{
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
+
+	surface->FillEllipseWithMaskPattern(theRect, pattern, rColor);
+}
+
+//--------------------------------------------------------------  ColorRegionMaskPattern
 
 // Given a region and color index, this function draws a solid<69>
 // region in that color.  Current port, pen mode, etc. assumed.
 
-void ColorRegion (DrawSurface *surface, PortabilityLayer::ScanlineMask *scanlineMask, long colorIndex)
+void ColorRegionMaskPattern (DrawSurface *surface, PortabilityLayer::ScanlineMask *scanlineMask, long colorIndex, const uint8_t *pattern)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[colorIndex];
-
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->FillScanlineMask(scanlineMask);
-	surface->SetForeColor(wasColor);
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(colorIndex);
+	surface->FillScanlineMaskWithMaskPattern(scanlineMask, pattern, rColor);
 }
 
 //--------------------------------------------------------------  ColorLine
@@ -81,12 +76,9 @@ void ColorRegion (DrawSurface *surface, PortabilityLayer::ScanlineMask *scanline
 
 void ColorLine (DrawSurface *surface, short h0, short v0, short h1, short v1, long color)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor cacheColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->DrawLine(Point::Create(h0, v0), Point::Create(h1, v1));
-	surface->SetForeColor(wasColor);
+	surface->DrawLine(Point::Create(h0, v0), Point::Create(h1, v1), cacheColor);
 }
 
 //--------------------------------------------------------------  HiliteRect
@@ -115,12 +107,9 @@ void HiliteRect (DrawSurface *surface, const Rect &theRect, short color1, short
 
 void ColorFrameRect (DrawSurface *surface, const Rect &theRect, long color)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->FrameRect(theRect);
-	surface->SetForeColor(wasColor);
+	surface->FrameRect(theRect, rColor);
 }
 
 //--------------------------------------------------------------  ColorFrameWHRect
@@ -147,12 +136,9 @@ void ColorFrameWHRect (DrawSurface *surface, short left, short top, short wide,
 
 void ColorFrameOval (DrawSurface *surface, const Rect &theRect, long color)
 {
-	const PortabilityLayer::RGBAColor &rgbaColor = PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color];
+	PortabilityLayer::ResolveCachingColor rColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(rgbaColor);
-	surface->FrameEllipse(theRect);
-	surface->SetForeColor(wasColor);
+	surface->FrameEllipse(theRect, rColor);
 }
 
 //--------------------------------------------------------------  LtGrayForeColor
@@ -160,9 +146,9 @@ void ColorFrameOval (DrawSurface *surface, const Rect &theRect, long color)
 // This function finds the closest match to a "light gray" in the<68>
 // current palette and sets the pen color to that.
 
-void LtGrayForeColor (DrawSurface *surface)
+PortabilityLayer::ResolveCachingColor LtGrayForeColor ()
 {
-	surface->SetForeColor(PortabilityLayer::RGBAColor::Create(191, 191, 191, 255));
+	return PortabilityLayer::RGBAColor::Create(191, 191, 191, 255);
 }
 
 //--------------------------------------------------------------  GrayForeColor
@@ -170,9 +156,9 @@ void LtGrayForeColor (DrawSurface *surface)
 // This function finds the closest match to a "medium gray" in the<68>
 // current palette and sets the pen color to that.
 
-void GrayForeColor (DrawSurface *surface)
+PortabilityLayer::ResolveCachingColor GrayForeColor ()
 {
-	surface->SetForeColor(PortabilityLayer::RGBAColor::Create(127, 127, 127, 255));
+	return PortabilityLayer::RGBAColor::Create(127, 127, 127, 255);
 }
 
 //--------------------------------------------------------------  DkGrayForeColor
@@ -180,7 +166,7 @@ void GrayForeColor (DrawSurface *surface)
 // This function finds the closest match to a "dark gray" in the<68>
 // current palette and sets the pen color to that.
 
-void DkGrayForeColor (DrawSurface *surface)
+PortabilityLayer::ResolveCachingColor DkGrayForeColor ()
 {
-	surface->SetForeColor(PortabilityLayer::RGBAColor::Create(63, 63, 63, 255));
+	return PortabilityLayer::RGBAColor::Create(63, 63, 63, 255);
 }

GpApp/Coordinates.cpp

@@ -13,6 +13,8 @@
 #include "Marquee.h"
 #include "ObjectEdit.h"
 #include "RectUtils.h"
+#include "ResolveCachingColor.h"
+#include "WindowDef.h"
 #include "WindowManager.h"
 
 
@@ -65,17 +67,19 @@ void UpdateCoordWindow (void)
 {
 #ifndef COMPILEDEMO
 	Str255		tempStr, numStr;
-	GrafPtr		wasPort;
 	
 	if (coordWindow == nil)
 		return;
 
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+	PortabilityLayer::ResolveCachingColor whiteColor = StdColors::White();
+	PortabilityLayer::ResolveCachingColor blueColor = StdColors::Blue();
+
+	PortabilityLayer::RenderedFont *appFont = GetApplicationFont(9, 0, true);
+
 	DrawSurface *surface = coordWindow->GetDrawSurface();
 
-	surface->SetForeColor(StdColors::White());
-	surface->FillRect(coordWindowRect);
-	
-	surface->SetForeColor(StdColors::Black());
+	surface->FillRect(coordWindowRect, whiteColor);
 
 	PasStringCopy(PSTR("h: "), tempStr);
 	if (coordH != -1)
@@ -86,7 +90,7 @@ void UpdateCoordWindow (void)
 	else
 		PasStringConcat(tempStr, PSTR("-"));
 
-	surface->DrawString(Point::Create(5, 12), tempStr);
+	surface->DrawString(Point::Create(5, 12), tempStr, blackColor, appFont);
 	
 	PasStringCopy(PSTR("v: "), tempStr);
 	if (coordV != -1)
@@ -97,9 +101,8 @@ void UpdateCoordWindow (void)
 	else
 		PasStringConcat(tempStr, PSTR("-"));
 
-	surface->DrawString(Point::Create(4, 22), tempStr);
+	surface->DrawString(Point::Create(4, 22), tempStr, blackColor, appFont);
 	
-	surface->SetForeColor(StdColors::Blue());
 	PasStringCopy(PSTR("d: "), tempStr);
 	if (coordD != -1)
 	{
@@ -109,8 +112,7 @@ void UpdateCoordWindow (void)
 	else
 		PasStringConcat(tempStr, PSTR("-"));
 
-	surface->DrawString(Point::Create(5, 32), tempStr);
-	surface->SetForeColor(StdColors::Black());
+	surface->DrawString(Point::Create(5, 32), tempStr, blueColor, appFont);
 #endif
 }
 
@@ -123,16 +125,19 @@ void OpenCoordWindow (void)
 	Rect		src, dest;
 	Point		globalMouse;
 	short		direction, dist;
+
+	PortabilityLayer::WindowManager *wm = PortabilityLayer::WindowManager::GetInstance();
 	
 	if (coordWindow == nil)
 	{
+		const uint16_t windowStyle = PortabilityLayer::WindowStyleFlags::kTitleBar | PortabilityLayer::WindowStyleFlags::kMiniBar | PortabilityLayer::WindowStyleFlags::kCloseBox;
+
 		QSetRect(&coordWindowRect, 0, 0, 50, 38);
-		if (thisMac.hasColor)
-			coordWindow = NewCWindow(nil, &coordWindowRect, 
-					PSTR("Tools"), false, kWindoidWDEF, kPutInFront, true, 0L);
-		else
-			coordWindow = NewWindow(nil, &coordWindowRect, 
-					PSTR("Tools"), false, kWindoidWDEF, kPutInFront, true, 0L);
+
+		{
+			PortabilityLayer::WindowDef wdef = PortabilityLayer::WindowDef::Create(coordWindowRect, windowStyle, true, 0, 0, PSTR("Tools"));
+			coordWindow = wm->CreateWindow(wdef);
+		}
 		
 		if (coordWindow == nil)
 			RedAlert(kErrNoMemory);
@@ -145,17 +150,14 @@ void OpenCoordWindow (void)
 		MoveWindow(coordWindow, isCoordH, isCoordV, true);
 
 		GetWindowRect(coordWindow, &dest);
-		BringToFront(coordWindow);
+		wm->PutWindowBehind(coordWindow, wm->GetPutInFrontSentinel());
 		PortabilityLayer::WindowManager::GetInstance()->ShowWindow(coordWindow);
 //		FlagWindowFloating(coordWindow);	TEMP - use flaoting windows
-		HiliteAllWindows();
 		
 		coordH = -1;
 		coordV = -1;
 		coordD = -1;
 
-		coordWindow->GetDrawSurface()->SetApplicationFont(9, 0);
-		
 		if (objActive != kNoObjectSelected)
 		{
 			if (ObjectHasHandle(&direction, &dist))

GpApp/DialogUtils.cpp

@@ -6,6 +6,7 @@
 
 #include "DialogManager.h"
 #include "PLArrayView.h"
+#include "PLButtonWidget.h"
 #include "PLControlDefinitions.h"
 #include "PLNumberFormatting.h"
 #include "PLPasStr.h"
@@ -15,7 +16,12 @@
 #include "DialogUtils.h"
 #include "Externs.h"
 #include "FontFamily.h"
+#include "ResourceManager.h"
+#include "ResolveCachingColor.h"
+#include "RenderedFont.h"
+#include "RenderedFontMetrics.h"
 
+#include <algorithm>
 
 #define kActive						0
 #define kInactive					255
@@ -26,14 +32,13 @@
 // Given a dialog pointer and a resource ID, this function brings it up<75>
 // centered, visible, and with the default button outlined.
 
-void BringUpDialog (Dialog **theDialog, short dialogID)
+void BringUpDialog (Dialog **theDialog, short dialogID, const DialogTextSubstitutions *substitutions)
 {
-	*theDialog = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(dialogID, kPutInFront);
+	*theDialog = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(dialogID, kPutInFront, substitutions);
 
 //	CenterDialog(dialogID);
 	if (*theDialog == nil)
 		RedAlert(kErrDialogDidntLoad);
-	SetGraphicsPort(&(*theDialog)->GetWindow()->m_surface);
 	ShowWindow((*theDialog)->GetWindow());
 	DrawDefaultButton(*theDialog);
 }
@@ -144,7 +149,7 @@ void GetDialogRect (Rect *bounds, short dialogID)
 {
 	Byte		wasState;
 	
-	Handle dlogHandle = GetResource('DLOG', dialogID).StaticCast<void>();
+	Handle dlogHandle = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('DLOG', dialogID).StaticCast<void>();
 	if (dlogHandle != nil)
 	{
 		BERect dataRect = **dlogHandle.StaticCast<BERect>();
@@ -345,9 +350,9 @@ void FlashDialogButton (Dialog *theDialog, short itemNumber)
 
 	PortabilityLayer::Widget *widget = theDialog->GetItems()[itemNumber - 1].GetWidget();
 
-	widget->SetHighlightStyle(kControlButtonPart);
+	widget->SetHighlightStyle(kControlButtonPart, true);
 	Delay(8, &dummyLong);
-	widget->SetHighlightStyle(0);
+	widget->SetHighlightStyle(kControlButtonPart, false);
 }
 
 //--------------------------------------------------------------  DrawDefaultButton
@@ -360,20 +365,7 @@ void DrawDefaultButton (Dialog *theDialog)
 	Rect								itemRect = firstItem.GetWidget()->GetRect();
 	DrawSurface							*surface = theDialog->GetWindow()->GetDrawSurface();
 
-	InsetRect(&itemRect, -4, -4);
-
-	surface->SetForeColor(StdColors::Black());
-
-	for (int xOffset = -1; xOffset <= 1; xOffset++)
-	{
-		for (int yOffset = -1; yOffset <= 1; yOffset++)
-		{
-			const Rect offsetRect = itemRect + Point::Create(xOffset, yOffset);
-			surface->FrameRoundRect(offsetRect, 8, 8);
-		}
-	}
-
-	PenNormal();
+	PortabilityLayer::ButtonWidget::DrawDefaultButtonChrome(itemRect, surface);
 }
 
 //--------------------------------------------------------------  GetDialogString
@@ -381,12 +373,13 @@ void DrawDefaultButton (Dialog *theDialog)
 
 void GetDialogString (Dialog *theDialog, short item, StringPtr theString)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	GetDialogItemText(itemHandle, theString);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	const PLPasStr str = itemRef.GetWidget()->GetString();
+
+	const uint8_t length = static_cast<uint8_t>(std::min<size_t>(255, str.Length()));
+
+	theString[0] = length;
+	memcpy(theString + 1, str.UChars(), length);
 }
 
 //--------------------------------------------------------------  SetDialogString
@@ -394,7 +387,9 @@ void GetDialogString (Dialog *theDialog, short item, StringPtr theString)
 
 void SetDialogString (Dialog *theDialog, short item, const PLPasStr &theString)
 {
-	theDialog->GetItems()[item - 1].GetWidget()->SetString(theString);
+	PortabilityLayer::Widget *widget = theDialog->GetItems()[item - 1].GetWidget();
+	widget->SetString(theString);
+	widget->DrawControl(theDialog->GetWindow()->GetDrawSurface());
 }
 
 //--------------------------------------------------------------  GetDialogStringLen
@@ -402,14 +397,8 @@ void SetDialogString (Dialog *theDialog, short item, const PLPasStr &theString)
 
 short GetDialogStringLen (Dialog *theDialog, short item)
 {
-	Rect			itemRect;
-	Str255			theString;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	GetDialogItemText(itemHandle, theString);
-	return (theString[0]);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	return itemRef.GetWidget()->GetString().Length();
 }
 
 //--------------------------------------------------------------  GetDialogItemValue
@@ -418,12 +407,8 @@ short GetDialogStringLen (Dialog *theDialog, short item)
 
 void GetDialogItemValue (Dialog *theDialog, short item, short *theState)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	*theState = GetControlValue(itemHandle);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	*theState = itemRef.GetWidget()->GetState();
 }
 
 //--------------------------------------------------------------  SetDialogItemValue
@@ -440,17 +425,17 @@ void SetDialogItemValue (Dialog *theDialog, short item, short theState)
 
 void ToggleDialogItemValue (Dialog *theDialog, short item)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType, theState;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	theState = GetControlValue(itemHandle);
+	int16_t			theState;
+
+	PortabilityLayer::Widget *widget = theDialog->GetItems()[item - 1].GetWidget();
+
+	theState = widget->GetState();
 	if (theState == 0)
 		theState = 1;
 	else
 		theState = 0;
-	SetControlValue(itemHandle, theState);
+	widget->SetState(theState);
+	widget->DrawControl(theDialog->GetWindow()->GetDrawSurface());
 }
 
 //--------------------------------------------------------------  SetDialogNumToStr
@@ -463,9 +448,11 @@ void SetDialogNumToStr (Dialog *theDialog, short item, long theNumber)
 	Rect			itemRect;
 	ControlHandle	itemHandle;
 	short			itemType;
-	
+
 	NumToString(theNumber, theString);
-	theDialog->GetItems()[item - 1].GetWidget()->SetString(theString);
+	PortabilityLayer::Widget *widget = theDialog->GetItems()[item - 1].GetWidget();
+	widget->SetString(theString);
+	widget->DrawControl(theDialog->GetWindow()->GetDrawSurface());
 }
 
 //--------------------------------------------------------------  GetDialogNumFromStr
@@ -475,12 +462,7 @@ void SetDialogNumToStr (Dialog *theDialog, short item, long theNumber)
 void GetDialogNumFromStr (Dialog *theDialog, short item, long *theNumber)
 {
 	Str255			theString;
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	GetDialogItemText(itemHandle, theString);
+	GetDialogString(theDialog, item, theString);
 	StringToNum(theString, theNumber);
 }
 
@@ -498,13 +480,10 @@ void GetDialogItemRect (Dialog *theDialog, short item, Rect *theRect)
 
 void SetDialogItemRect (Dialog *theDialog, short item, Rect *theRect)
 {
-	Rect			oldRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &oldRect);
-	OffsetRect(&oldRect, theRect->left - oldRect.left, theRect->top - oldRect.top);
-	SetDialogItem(theDialog, item, itemType, itemHandle, &oldRect);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+	widget->SetPosition(Point::Create(theRect->left, theRect->top));
+	widget->Resize(theRect->Width(), theRect->Height());
 }
 
 //--------------------------------------------------------------  OffsetDialogItemRect
@@ -512,13 +491,11 @@ void SetDialogItemRect (Dialog *theDialog, short item, Rect *theRect)
 
 void OffsetDialogItemRect (Dialog *theDialog, short item, short h, short v)
 {
-	Rect			oldRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &oldRect);
-	OffsetRect(&oldRect, h, v);
-	SetDialogItem(theDialog, item, itemType, itemHandle, &oldRect);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+
+	const Rect oldRect = widget->GetRect();
+	widget->SetPosition(Point::Create(oldRect.left + h, oldRect.top + v));
 }
 
 //--------------------------------------------------------------  SelectFromRadioGroup
@@ -553,12 +530,7 @@ void AddMenuToPopUp (Dialog *theDialog, short whichItem, MenuHandle theMenu)
 
 void GetPopUpMenuValue (Dialog *theDialog, short whichItem, short *value)
 {
-	Rect			iRect;
-	ControlHandle	iHandle;
-	short			iType;
-	
-	GetDialogItem(theDialog, whichItem, &iType, &iHandle, &iRect);
-	*value = GetControlValue(iHandle);
+	GetDialogItemValue(theDialog, whichItem, value);
 }
 
 //--------------------------------------------------------------  SetPopUpMenuValue
@@ -566,12 +538,7 @@ void GetPopUpMenuValue (Dialog *theDialog, short whichItem, short *value)
 
 void SetPopUpMenuValue (Dialog *theDialog, short whichItem, short value)
 {
-	Rect			iRect;
-	ControlHandle	iHandle;
-	short			iType;
-	
-	GetDialogItem(theDialog, whichItem, &iType, &iHandle, &iRect);
-	SetControlValue(iHandle, value);
+	SetDialogItemValue(theDialog, whichItem, value);
 }
 
 //--------------------------------------------------------------  MyEnableControl
@@ -579,12 +546,9 @@ void SetPopUpMenuValue (Dialog *theDialog, short whichItem, short value)
 
 void MyEnableControl (Dialog *theDialog, short whichItem)
 {
-	Rect			iRect;
-	ControlHandle	iHandle;
-	short			iType;
-	
-	GetDialogItem(theDialog, whichItem, &iType, &iHandle, &iRect);
-	HiliteControl(iHandle, kActive);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[whichItem - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+	widget->SetEnabled(true);
 }
 
 //--------------------------------------------------------------  MyDisableControl
@@ -592,11 +556,9 @@ void MyEnableControl (Dialog *theDialog, short whichItem)
 
 void MyDisableControl (Dialog *theDialog, short whichItem)
 {
-	Rect			iRect;
-	ControlHandle	iHandle;
-	short			iType;
-
-	theDialog->GetItems()[whichItem - 1].GetWidget()->SetEnabled(false);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[whichItem - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+	widget->SetEnabled(false);
 }
 
 //--------------------------------------------------------------  DrawDialogUserText
@@ -612,41 +574,45 @@ void DrawDialogUserText (Dialog *dial, short item, StringPtr text, Boolean inver
 
 	DrawSurface *surface = dial->GetWindow()->GetDrawSurface();
 
-	surface->SetApplicationFont(9, PortabilityLayer::FontFamilyFlag_None);
+	PortabilityLayer::RenderedFont *appFont = GetApplicationFont(9, PortabilityLayer::FontFamilyFlag_None, true);
 	
 	PasStringCopy(text, stringCopy);
 
 	Rect iRect = dial->GetItems()[item - 1].GetWidget()->GetRect();
 
-	if ((surface->MeasureString(stringCopy) + 2) > (iRect.right - iRect.left))
-		CollapseStringToWidth(surface, stringCopy, iRect.right - iRect.left - 2);
+	if ((appFont->MeasurePStr(stringCopy) + 2) > (iRect.right - iRect.left))
+		CollapseStringToWidth(appFont, stringCopy, iRect.right - iRect.left - 2);
 	
-	OffsetRect(&iRect, 0, 1);
+	PortabilityLayer::ResolveCachingColor whiteColor = StdColors::White();
+	surface->FillRect(iRect, whiteColor);
 
-	surface->SetForeColor(StdColors::White());
-	surface->FillRect(iRect);
-	surface->SetForeColor(StdColors::Black());
-
-	OffsetRect(&iRect, 0, -1);
-
-	short strWidth = surface->MeasureString(stringCopy);
+	short strWidth = appFont->MeasurePStr(stringCopy);
 	inset = ((iRect.right - iRect.left) - (strWidth + 2)) / 2;
 	iRect.left += inset;
 	iRect.right -= inset;
 
 	// Draw centered
-	PL_NotYetImplemented_TODO("Clip to iRect");
 
-	const int32_t ascender = surface->MeasureFontAscender();
+	const int32_t ascender = appFont->GetMetrics().m_ascent;
 
-	const Point centeredDrawPoint = Point::Create((iRect.left + iRect.right - strWidth) / 2, (iRect.top + iRect.bottom + ascender) / 2);
-	surface->DrawString(centeredDrawPoint, stringCopy);
+	PortabilityLayer::ResolveCachingColor backgroundColor;
+	PortabilityLayer::ResolveCachingColor textColor;
 
 	if (invert)
 	{
-		OffsetRect(&iRect, 0, 1);
-		surface->InvertFillRect(iRect, nullptr);
+		backgroundColor = StdColors::Black();
+		textColor = StdColors::White();
 	}
+	else
+	{
+		backgroundColor = StdColors::White();
+		textColor = StdColors::Black();
+	}
+
+	surface->FillRect(iRect, backgroundColor);
+
+	const Point centeredDrawPoint = Point::Create((iRect.left + iRect.right - strWidth) / 2, (iRect.top + iRect.bottom + ascender) / 2);
+	surface->DrawString(centeredDrawPoint, stringCopy, textColor, appFont);
 }
 
 //--------------------------------------------------------------  DrawDialogUserText
@@ -661,16 +627,16 @@ void DrawDialogUserText2 (Dialog *dial, short item, StringPtr text)
 	short			iType;
 
 	DrawSurface *surface = dial->GetWindow()->GetDrawSurface();
-	surface->SetApplicationFont(9, PortabilityLayer::FontFamilyFlag_None);
+	PortabilityLayer::RenderedFont *appFont = GetApplicationFont(9, PortabilityLayer::FontFamilyFlag_None, true);
 	
 	PasStringCopy(text, stringCopy);
 	const Rect iRect = dial->GetItems()[item - 1].GetWidget()->GetRect();
 
-	if ((surface->MeasureString(stringCopy) + 2) > (iRect.right - iRect.left))
-		CollapseStringToWidth(surface, stringCopy, iRect.right - iRect.left - 2);
+	if ((appFont->MeasurePStr(stringCopy) + 2) > (iRect.right - iRect.left))
+		CollapseStringToWidth(appFont, stringCopy, iRect.right - iRect.left - 2);
 
-	surface->SetForeColor(StdColors::Black());
-	surface->DrawString(Point::Create(iRect.left, iRect.bottom), stringCopy);
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+	surface->DrawString(Point::Create(iRect.left, iRect.bottom), stringCopy, blackColor, appFont);
 }
 
 //--------------------------------------------------------------  LoadDialogPICT
@@ -679,11 +645,11 @@ void DrawDialogUserText2 (Dialog *dial, short item, StringPtr text)
 
 void LoadDialogPICT (Dialog *theDialog, short item, short theID)
 {
-	THandle<Picture>		thePict;
+	THandle<BitmapImage>	thePict;
 
 	Rect			iRect = theDialog->GetItems()[item - 1].GetWidget()->GetRect();;
 
-	thePict = GetPicture(theID);
+	thePict = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('PICT', theID).StaticCast<BitmapImage>();
 	if (thePict)
 		theDialog->GetWindow()->GetDrawSurface()->DrawPicture(thePict, iRect);
 }
@@ -691,15 +657,14 @@ void LoadDialogPICT (Dialog *theDialog, short item, short theID)
 //--------------------------------------------------------------  FrameDialogItem
 // Given a dialog item, this function draws a box around it.
 
-void FrameDialogItem (Dialog *theDialog, short item)
+void FrameDialogItem (Dialog *theDialog, short item, PortabilityLayer::ResolveCachingColor &color)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	DrawSurface		*surface = theDialog->GetWindow()->GetDrawSurface();
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
-	surface->FrameRect(itemRect);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+
+	const Rect itemRect = widget->GetRect();
+
+	theDialog->GetWindow()->GetDrawSurface()->FrameRect(itemRect, color);
 }
 
 //--------------------------------------------------------------  FrameDialogItemC
@@ -710,71 +675,98 @@ void FrameDialogItemC (Dialog *theDialog, short item, long color)
 	DrawSurface		*surface = theDialog->GetWindow()->GetDrawSurface();
 	const Rect		itemRect = theDialog->GetItems()[item - 1].GetWidget()->GetRect();
 
-	const PortabilityLayer::RGBAColor wasColor = surface->GetForeColor();
-	surface->SetForeColor(PortabilityLayer::StandardPalette::GetInstance()->GetColors()[color]);
-	surface->FrameRect(itemRect);
-	surface->SetForeColor(wasColor);
+	PortabilityLayer::ResolveCachingColor frameColor = PortabilityLayer::ResolveCachingColor::FromStandardColor(color);
+
+	surface->FrameRect(itemRect, frameColor);
 }
 
 //--------------------------------------------------------------  FrameOvalDialogItem
 // Given a dialog item, this function draws an oval around it.
 
-void FrameOvalDialogItem (Dialog *theDialog, short item)
+void FrameOvalDialogItem (Dialog *theDialog, short item, PortabilityLayer::ResolveCachingColor &color)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
 
-	theDialog->GetWindow()->GetDrawSurface()->FrameEllipse(itemRect);
+	const Rect itemRect = widget->GetRect();
+
+	theDialog->GetWindow()->GetDrawSurface()->FrameEllipse(itemRect, color);
 }
 
 //--------------------------------------------------------------  BorderDialogItem
 // Given a dialog item, this function draws any combination of 4 sides<65>
 // of a box around it.  Which sides get drawn is encoded in "sides".
 
-void BorderDialogItem (Dialog *theDialog, short item, short sides)
+void BorderDialogItem(Dialog *theDialog, short item, short sides, short thickness, const uint8_t *pattern)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
 	// 1 = left
 	// 2 = top
 	// 4 = bottom
 	// 8 = right ... so 6 = top & bottom, 15 = all 4 sides
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
+
+	PortabilityLayer::ResolveCachingColor whiteColor = StdColors::White();
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+	const Rect itemRect = widget->GetRect();
 
 	DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
 
 	if (sides >= 8)				// 8 = right
 	{
 		const Point pointA = Point::Create(itemRect.right, itemRect.top);
-		const Point pointB = Point::Create(itemRect.right, itemRect.bottom);
-		surface->DrawLine(pointA, pointB);
+		const Point pointB = Point::Create(itemRect.right + thickness, itemRect.bottom + 1);
+		const Rect rect = Rect::Create(pointA.v, pointA.h, pointB.v, pointB.h);
+		if (pattern)
+		{
+			surface->FillRect(rect, whiteColor);
+			surface->FillRectWithMaskPattern8x8(rect, pattern,blackColor);
+		}
+		else
+			surface->FillRect(rect, blackColor);
 		sides -= 8;
 	}
 	if (sides >= 4)				// 4 = bottom
 	{
 		const Point pointA = Point::Create(itemRect.left, itemRect.bottom);
-		const Point pointB = Point::Create(itemRect.right, itemRect.bottom);
-		surface->DrawLine(pointA, pointB);
+		const Point pointB = Point::Create(itemRect.right + 1, itemRect.bottom + thickness);
+		const Rect rect = Rect::Create(pointA.v, pointA.h, pointB.v, pointB.h);
+		if (pattern)
+		{
+			surface->FillRect(rect, whiteColor);
+			surface->FillRectWithMaskPattern8x8(rect, pattern, blackColor);
+		}
+		else
+			surface->FillRect(rect, blackColor);
 		sides -= 4;
 	}
 	if (sides >= 2)				// 2 = top
 	{
 		const Point pointA = Point::Create(itemRect.left, itemRect.top - 1);
-		const Point pointB = Point::Create(itemRect.right, itemRect.top - 1);
-		surface->DrawLine(pointA, pointB);
+		const Point pointB = Point::Create(itemRect.right + 1, itemRect.top + thickness);
+		const Rect rect = Rect::Create(pointA.v, pointA.h, pointB.v, pointB.h);
+		if (pattern)
+		{
+			surface->FillRect(rect, whiteColor);
+			surface->FillRectWithMaskPattern8x8(rect, pattern, blackColor);
+		}
+		else
+			surface->FillRect(rect, blackColor);
 		sides -= 2;
 	}
 	if (sides >= 1)				// 1 = left
 	{
 		const Point pointA = Point::Create(itemRect.left - 1, itemRect.top);
-		const Point pointB = Point::Create(itemRect.left - 1, itemRect.bottom);
-		surface->DrawLine(pointA, pointB);
+		const Point pointB = Point::Create(itemRect.left - 1 + thickness, itemRect.bottom + 1);
+		const Rect rect = Rect::Create(pointA.v, pointA.h, pointB.v, pointB.h);
+		if (pattern)
+		{
+			surface->FillRect(rect, whiteColor);
+			surface->FillRectWithMaskPattern8x8(rect, pattern, blackColor);
+		}
+		else
+			surface->FillRect(rect, blackColor);
 	}
 }
 
@@ -783,21 +775,19 @@ void BorderDialogItem (Dialog *theDialog, short item, short sides)
 
 void ShadowDialogItem (Dialog *theDialog, short item, short thickness)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-
 	DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
 
-	surface->SetForeColor(StdColors::Black());
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	const Rect itemRect = itemRef.GetWidget()->GetRect();
+
+	PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+
 	const Point bottomLeftCorner = Point::Create(itemRect.left + thickness, itemRect.bottom);
 	const Point topRightCorner = Point::Create(itemRect.right, itemRect.top + thickness);
 	const Point bottomRightCorner = Point::Create(itemRect.right + thickness, itemRect.bottom + thickness);
 
-	surface->FillRect(Rect::Create(topRightCorner.v, topRightCorner.h, bottomRightCorner.v, bottomRightCorner.h));
-	surface->FillRect(Rect::Create(bottomLeftCorner.v, bottomLeftCorner.h, bottomRightCorner.v, bottomRightCorner.h));
+	surface->FillRect(Rect::Create(topRightCorner.v, topRightCorner.h, bottomRightCorner.v, bottomRightCorner.h), blackColor);
+	surface->FillRect(Rect::Create(bottomLeftCorner.v, bottomLeftCorner.h, bottomRightCorner.v, bottomRightCorner.h), blackColor);
 }
 
 //--------------------------------------------------------------  EraseDialogItem
@@ -805,15 +795,14 @@ void ShadowDialogItem (Dialog *theDialog, short item, short thickness)
 
 void EraseDialogItem (Dialog *theDialog, short item)
 {
-	Rect			itemRect;
-	ControlHandle	itemHandle;
-	short			itemType;
-	
-	GetDialogItem(theDialog, item, &itemType, &itemHandle, &itemRect);
+	const PortabilityLayer::DialogItem &itemRef = theDialog->GetItems()[item - 1];
+	PortabilityLayer::Widget *widget = itemRef.GetWidget();
+
+	const Rect itemRect = widget->GetRect();
+
+	PortabilityLayer::ResolveCachingColor whiteColor = StdColors::White();
 
 	DrawSurface *surface = theDialog->GetWindow()->GetDrawSurface();
-	surface->SetForeColor(StdColors::White());
-	surface->FillRect(itemRect);
-	surface->SetForeColor(StdColors::Black());
+	surface->FillRect(itemRect, whiteColor);
 }
 

GpApp/DialogUtils.h

@@ -7,8 +7,14 @@
 
 #include "PLDialogs.h"
 
+namespace PortabilityLayer
+{
+	class ResolveCachingColor;
+}
 
-void BringUpDialog (Dialog **theDialog, short dialogID);
+struct DialogTextSubstitutions;
+
+void BringUpDialog (Dialog **theDialog, short dialogID, const DialogTextSubstitutions *);
 //void GetPutDialogCorner (Point *);
 //void GetGetDialogCorner (Point *);
 //void CenterDialog (short);
@@ -39,9 +45,9 @@ void MyDisableControl(Dialog *, short);
 void DrawDialogUserText (Dialog *, short, StringPtr, Boolean);
 void DrawDialogUserText2 (Dialog *, short, StringPtr);
 void LoadDialogPICT (Dialog *, short, short);
-void FrameDialogItem (Dialog *, short);
+void FrameDialogItem (Dialog *, short, PortabilityLayer::ResolveCachingColor &color);
 void FrameDialogItemC (Dialog *, short, long);
-void FrameOvalDialogItem (Dialog *, short);
-void BorderDialogItem (Dialog *, short, short);
+void FrameOvalDialogItem (Dialog *, short, PortabilityLayer::ResolveCachingColor &color);
+void BorderDialogItem (Dialog *theDialog, short item, short sides, short thickness, const uint8_t *pattern);
 void ShadowDialogItem (Dialog *, short, short);
 void EraseDialogItem (Dialog *, short);

GpApp/DynamicMaps.cpp

@@ -5,10 +5,12 @@
 //============================================================================
 
 
+#include "ArrayTools.h"
 #include "Externs.h"
 #include "Environ.h"
 #include "MainWindow.h"
 #include "Objects.h"
+#include "QDPixMap.h"
 #include "RectUtils.h"
 #include "Room.h"
 #include "Utilities.h"
@@ -57,6 +59,7 @@ void NilSavedMaps (void)
 		}
 		savedMaps[i].where = -1;
 		savedMaps[i].who = -1;
+		savedMaps[i].component = -1;
 	}
 	numSavedMaps = 0;
 }
@@ -67,7 +70,7 @@ void NilSavedMaps (void)
 // room that it obscured so that, should the player get the object,<2C>
 // it can be made to "disappear".
 
-short BackUpToSavedMap (Rect *theRect, short where, short who)
+short BackUpToSavedMap (Rect *theRect, SInt16 where, SInt16 who, SInt16 component)
 {
 	Rect		mapRect;
 	PLError_t		theErr;
@@ -79,7 +82,7 @@ short BackUpToSavedMap (Rect *theRect, short where, short who)
 	ZeroRectCorner(&mapRect);
 	savedMaps[numSavedMaps].dest = *theRect;
 //	CreateOffScreenPixMap(&mapRect, &savedMaps[numSavedMaps].map);
-	theErr = CreateOffScreenGWorld(&savedMaps[numSavedMaps].map, &mapRect, kPreferredPixelFormat);
+	theErr = CreateOffScreenGWorld(&savedMaps[numSavedMaps].map, &mapRect);
 	
 	CopyBits((BitMap *)*GetGWorldPixMap(backSrcMap), 
 			GetPortBitMapForCopyBits(savedMaps[numSavedMaps].map), 
@@ -87,6 +90,7 @@ short BackUpToSavedMap (Rect *theRect, short where, short who)
 	
 	savedMaps[numSavedMaps].where = where;
 	savedMaps[numSavedMaps].who = who;
+	savedMaps[numSavedMaps].component = component;
 	numSavedMaps++;
 	
 	return (numSavedMaps - 1);	// return array index
@@ -97,7 +101,7 @@ short BackUpToSavedMap (Rect *theRect, short where, short who)
 // a slot in the pixmap array for the object.  It re-copies the background<6E>
 // and is needed when the lights in the room go on or off.
 
-short ReBackUpSavedMap (Rect *theRect, short where, short who)
+SInt16 ReBackUpSavedMap (Rect *theRect, SInt16 where, SInt16 who, SInt16 component)
 {
 	Rect		mapRect;
 	short		i, foundIndex;
@@ -106,11 +110,13 @@ short ReBackUpSavedMap (Rect *theRect, short where, short who)
 	
 	for (i = 0; i < numSavedMaps; i++)
 	{
-		if ((savedMaps[i].where == where) && (savedMaps[i].who == who))
+		if ((savedMaps[i].where == where) && (savedMaps[i].who == who) && (savedMaps[i].component == component))
 		{
 			foundIndex = i;
 			mapRect = *theRect;
 			ZeroRectCorner(&mapRect);
+
+			savedMaps[foundIndex].dest = *theRect;
 			
 			CopyBits((BitMap *)*GetGWorldPixMap(backSrcMap), 
 					GetPortBitMapForCopyBits(savedMaps[foundIndex].map), 
@@ -120,7 +126,54 @@ short ReBackUpSavedMap (Rect *theRect, short where, short who)
 		}
 	}
 	
-	return (foundIndex);
+	return BackUpToSavedMap(theRect, where, who, component);
+}
+
+//--------------------------------------------------------------  RemoveFromSavedMap
+template<class T>
+void RemapDynamicObject(T *arr, short &count, int removedIndex, int substituteIndex)
+{
+	short countCopy = count;
+	for (int i = 0; i < countCopy; i++)
+	{
+		if (arr[i].who == removedIndex)
+		{
+			PortabilityLayer::ArrayTools::RemoveFromArray(arr, countCopy, i);
+			i--;
+		}
+		else if (arr[i].who == substituteIndex)
+			arr[i].who = removedIndex;
+	}
+
+	count = countCopy;
+}
+
+SInt16 RemoveFromSavedMap (SInt16 index)
+{
+	int swappedIn = numSavedMaps - 1;
+	RemapDynamicObject(flames, numFlames, index, swappedIn);
+	RemapDynamicObject(tikiFlames, numTikiFlames, index, swappedIn);
+	RemapDynamicObject(bbqCoals, numCoals, index, swappedIn);
+	RemapDynamicObject(pendulums, numPendulums, index, swappedIn);
+	RemapDynamicObject(theStars, numStars, index, swappedIn);
+
+	RemapGreaseSavedMap(index, swappedIn);
+
+	// Have to do this explicitly so we don't trash the draw surface pointer
+	if (swappedIn != index)
+	{
+		savedType &dest = savedMaps[index];
+		savedType &src = savedMaps[swappedIn];
+
+		DisposeGWorld(dest.map);
+		dest = src;
+
+		src.map = nil;
+	}
+
+	numSavedMaps--;
+
+	return -1;
 }
 
 //--------------------------------------------------------------  RestoreFromSavedMap
@@ -128,14 +181,14 @@ short ReBackUpSavedMap (Rect *theRect, short where, short who)
 // This copies the saved background swatch to the screen - effectively<6C>
 // covering up or "erasing" the object.
 
-void RestoreFromSavedMap (short where, short who, Boolean doSparkle)
+void RestoreFromSavedMap (SInt16 where, SInt16 who, SInt16 component, Boolean doSparkle)
 {
 	Rect		mapRect, bounds;
 	short		i;
 	
 	for (i = 0; i < numSavedMaps; i++)
 	{
-		if ((savedMaps[i].where == where) && (savedMaps[i].who == who) && 
+		if ((savedMaps[i].where == where) && (savedMaps[i].who == who) && (savedMaps[i].component == component) &&
 				(savedMaps[i].map != nil))
 		{
 			mapRect = savedMaps[i].dest;
@@ -289,7 +342,7 @@ void BackUpFlames (Rect *src, short index)
 // Like the above function but this is called when the lighting changes<65>
 // in a room (lights go on or off).
 
-void ReBackUpFlames (short where, short who)
+Boolean ReBackUpFlames (short where, short who, short h, short v)
 {
 	short		i, f;
 	
@@ -301,19 +354,22 @@ void ReBackUpFlames (short where, short who)
 			{
 				if (flames[f].who == i)
 				{
+					QOffsetRect(&flames[f].dest, h - 8 - flames[f].dest.left, v - 15 - flames[f].dest.top);
 					BackUpFlames(&flames[f].dest, i);
-					return;
+					return true;
 				}
 			}
 		}
 	}
+
+	return false;
 }
 
 //--------------------------------------------------------------  AddCandleFlame
 
 // This adds a candle flame to tha array of flames.
 
-void AddCandleFlame (short where, short who, short h, short v)
+void AddCandleFlame (SInt16 where, SInt16 who, SInt16 h, SInt16 v)
 {
 	Rect		src, bounds;
 	short		savedNum;
@@ -330,7 +386,7 @@ void AddCandleFlame (short where, short who, short h, short v)
 			QOffsetRect(&src, 2, 0);
 	}
 	QSetRect(&bounds, 0, 0, 16, 15 * kNumCandleFlames);
-	savedNum = BackUpToSavedMap(&bounds, where, who);
+	savedNum = BackUpToSavedMap(&bounds, where, who, kCandleFlameComponent);
 	if (savedNum != -1)
 	{
 		BackUpFlames(&src, savedNum);
@@ -373,7 +429,7 @@ void BackUpTikiFlames (Rect *src, short index)
 
 // This is like the function ReBackUpFlames() but customized for Tiki torches.
 
-void ReBackUpTikiFlames (short where, short who)
+Boolean ReBackUpTikiFlames (short where, short who, short h, short v)
 {
 	short		i, f;
 	
@@ -385,12 +441,15 @@ void ReBackUpTikiFlames (short where, short who)
 			{
 				if (tikiFlames[f].who == i)
 				{
+					QOffsetRect(&tikiFlames[f].dest, h - tikiFlames[f].dest.left, v - tikiFlames[f].dest.top);
 					BackUpTikiFlames(&tikiFlames[f].dest, i);
-					return;
+					return true;
 				}
 			}
 		}
 	}
+
+	return false;
 }
 
 //--------------------------------------------------------------  AddTikiFlame
@@ -414,7 +473,7 @@ void AddTikiFlame (short where, short who, short h, short v)
 	}
 	QOffsetRect(&src, h, v);
 	QSetRect(&bounds, 0, 0, 8, 10 * kNumTikiFlames);
-	savedNum = BackUpToSavedMap(&bounds, where, who);
+	savedNum = BackUpToSavedMap(&bounds, where, who, kTikiFlamesComponent);
 	if (savedNum != -1)
 	{
 		BackUpTikiFlames(&src, savedNum);
@@ -459,7 +518,7 @@ void BackUpBBQCoals (Rect *src, short index)
 
 // Sense a pattern here?
 
-void ReBackUpBBQCoals (short where, short who)
+Boolean ReBackUpBBQCoals (short where, short who, short h, short v)
 {
 	short		i, f;
 	
@@ -471,12 +530,15 @@ void ReBackUpBBQCoals (short where, short who)
 			{
 				if (bbqCoals[f].who == i)
 				{
+					QOffsetRect(&bbqCoals[f].dest, h - bbqCoals[f].dest.left, v - bbqCoals[f].dest.top);
 					BackUpBBQCoals(&bbqCoals[f].dest, i);
-					return;
+					return true;
 				}
 			}
 		}
 	}
+
+	return false;
 }
 
 //--------------------------------------------------------------  AddBBQCoals
@@ -500,7 +562,7 @@ void AddBBQCoals (short where, short who, short h, short v)
 	}
 	QOffsetRect(&src, h, v);
 	QSetRect(&bounds, 0, 0, 32, 9 * kNumBBQCoals);
-	savedNum = BackUpToSavedMap(&bounds, where, who);
+	savedNum = BackUpToSavedMap(&bounds, where, who, kBBQCoalsComponent);
 	if (savedNum != -1)
 	{
 		BackUpBBQCoals(&src, savedNum);
@@ -543,7 +605,7 @@ void BackUpPendulum (Rect *src, short index)
 
 // Backs up the pendulums in the event of lights going on or off.
 
-void ReBackUpPendulum (short where, short who)
+Boolean ReBackUpPendulum (short where, short who, short h, short v)
 {
 	short		i, f;
 	
@@ -555,19 +617,26 @@ void ReBackUpPendulum (short where, short who)
 			{
 				if (pendulums[f].who == i)
 				{
-					BackUpPendulum(&pendulums[f].dest, i);
-					return;
+					Rect &pendulumDest = pendulums[f].dest;
+					pendulumDest.right += h - pendulumDest.left;
+					pendulumDest.bottom += v - pendulumDest.top;
+					pendulumDest.left = h;
+					pendulumDest.top = v;
+					BackUpPendulum(&pendulumDest, i);
+					return true;
 				}
 			}
 		}
 	}
+
+	return false;
 }
 
 //--------------------------------------------------------------  AddPendulum
 
 // Adds a pendulum to the array of pendulums.
 
-void AddPendulum (short where, short who, short h, short v)
+void AddPendulum (SInt16 where, SInt16 who, SInt16 h, SInt16 v)
 {
 	Rect		src, bounds;
 	short		savedNum;
@@ -577,7 +646,7 @@ void AddPendulum (short where, short who, short h, short v)
 	
 	clockFrame = 10;
 	QSetRect(&bounds, 0, 0, 32, 28 * kNumPendulums);
-	savedNum = BackUpToSavedMap(&bounds, where, who);
+	savedNum = BackUpToSavedMap(&bounds, where, who, kPendulumComponent);
 	if (savedNum != -1)
 	{
 		QSetRect(&src, 0, 0, 32, 28);
@@ -635,7 +704,7 @@ void BackUpStar (Rect *src, short index)
 
 // Re-backs up the stars - in the event of lighting switch.
 
-void ReBackUpStar (short where, short who)
+void ReBackUpStar (short where, short who, short h, short v)
 {
 	short		i, f;
 	
@@ -647,6 +716,7 @@ void ReBackUpStar (short where, short who)
 			{
 				if (theStars[f].who == i)
 				{
+					QOffsetRect(&theStars[f].dest, h - theStars[f].dest.left, v - theStars[f].dest.top);
 					BackUpStar(&theStars[f].dest, i);
 					return;
 				}
@@ -677,7 +747,7 @@ void AddStar (short where, short who, short h, short v)
 	QOffsetRect(&src, h, v);
 	
 	QSetRect(&bounds, 0, 0, 32, 31 * 6);
-	savedNum = BackUpToSavedMap(&bounds, where, who);
+	savedNum = BackUpToSavedMap(&bounds, where, who, kStarComponent);
 	if (savedNum != -1)
 	{
 		BackUpStar(&src, savedNum);
@@ -796,3 +866,14 @@ void ZeroFlamesAndTheLike (void)
 	numChimes = 0;
 }
 
+void RemoveSavedMapsNotInRoom(SInt16 where)
+{
+	for (int i = 0; i < numSavedMaps; i++)
+	{
+		if (savedMaps[i].where != where)
+		{
+			RemoveFromSavedMap(i);
+			i--;
+		}
+	}
+}

GpApp/Dynamics.cpp

@@ -11,8 +11,10 @@
 #include "MainWindow.h"
 #include "Objects.h"
 #include "PLHacks.h"
+#include "PLStandardColors.h"
 #include "RectUtils.h"
 #include "Room.h"
+#include "ResolveCachingColor.h"
 
 
 #define kShoveVelocity		8
@@ -578,7 +580,8 @@ void HandleOutlet (short who)
 		}
 		else
 		{
-			workSrcMap->FillRect(dinahs[who].dest);
+			PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black();
+			workSrcMap->FillRect(dinahs[who].dest, blackColor);
 		}
 		AddRectToWorkRects(&dinahs[who].dest);
 	}

GpApp/Dynamics3.cpp

@@ -153,6 +153,48 @@ void RenderDynamics (void)
 	}
 }
 
+//--------------------------------------------------------------  ZeroDinah
+
+void ZeroDinah(dynaType &dinah)
+{
+	dinah.type = kObjectIsEmpty;
+	QSetRect(&dinah.dest, 0, 0, 0, 0);
+	QSetRect(&dinah.whole, 0, 0, 0, 0);
+	dinah.hVel = 0;
+	dinah.vVel = 0;
+	dinah.count = 0;
+	dinah.frame = 0;
+	dinah.timer = 0;
+	dinah.position = 0;
+	dinah.room = 0;
+	dinah.byte0 = 0;
+	dinah.active = false;
+}
+
+//--------------------------------------------------------------  ZeroDinahsNotInRoom
+void ZeroDinahsNotInRoom (SInt16 room)
+{
+	short		i;
+	short		newNumDynamics = 0;
+
+	for (i = 0; i < numDynamics; i++)
+	{
+		dynaType &dinah = dinahs[i];
+		if (dinah.room == room)
+		{
+			if (newNumDynamics != numDynamics)
+				memcpy(&dinahs[newNumDynamics], &dinahs[i], sizeof(dynaType));
+
+			newNumDynamics++;
+		}
+	}
+
+	for (i = newNumDynamics; i < kMaxDynamicObs; i++)
+		ZeroDinah(dinahs[i]);
+
+	numDynamics = newNumDynamics;
+}
+
 //--------------------------------------------------------------  ZeroDinahs
 
 // This clears all dynamics - zeros them all out.  Used to initialize them.
@@ -162,20 +204,8 @@ void ZeroDinahs (void)
 	short		i;
 	
 	for (i = 0; i < kMaxDynamicObs; i++)
-	{
-		dinahs[i].type = kObjectIsEmpty;
-		QSetRect(&dinahs[i].dest, 0, 0, 0, 0);
-		QSetRect(&dinahs[i].whole, 0, 0, 0, 0);
-		dinahs[i].hVel = 0;
-		dinahs[i].vVel = 0;
-		dinahs[i].count = 0;
-		dinahs[i].frame = 0;
-		dinahs[i].timer = 0;
-		dinahs[i].position = 0;
-		dinahs[i].room = 0;
-		dinahs[i].byte0 = 0;
-		dinahs[i].active = false;
-	}
+		ZeroDinah(dinahs[i]);
+
 	numDynamics = 0;
 }
 
@@ -185,371 +215,494 @@ void ZeroDinahs (void)
 // This function sets up the structures to handle them.
 
 short AddDynamicObject (short what, Rect *where, objectType *who, 
-		short room, short index, Boolean isOn)
+		short room, short index, Boolean isOn, Boolean keepExisting)
 {
 	short		position, velocity;
 	Boolean		lilFrame;
-	
-	if (numDynamics >= kMaxDynamicObs)
-		return (-1);
-	
-	dinahs[numDynamics].type = what;
-	switch (what)
+
+	short		dynIndex = -1;
+
+	if (!keepExisting)
 	{
-		case kSparkle:
-		dinahs[numDynamics].dest = sparkleSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, where->left, where->top);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = RandomInt(60) + 15;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kToaster:
-		dinahs[numDynamics].dest = breadSrc[0];
-		CenterRectInRect(&dinahs[numDynamics].dest, where);
-		VOffsetRect(&dinahs[numDynamics].dest, 
-				where->top - dinahs[numDynamics].dest.top);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = where->top + 2;	// hVel used as clip
-		position = who->data.g.height;				// reverse engineer init. vel.
-		velocity = 0;
-		do
+		if (numDynamics >= kMaxDynamicObs)
+			return (-1);
+
+		dynIndex = numDynamics;
+		numDynamics++;
+
+		dinahs[dynIndex].type = what;
+	}
+	else
+	{
+		for (int i = 0; i < numDynamics; i++)
 		{
-			velocity++;
-			position -= velocity;
+			if (dinahs[i].type == what && dinahs[i].room == room && dinahs[i].byte0 == index)
+			{
+				dynIndex = i;
+				break;
+			}
 		}
-		while (position > 0);
-		dinahs[numDynamics].vVel = -velocity;
-		dinahs[numDynamics].count = velocity;		// count = initial velocity
-		dinahs[numDynamics].frame = (short)who->data.g.delay * 3;
-		dinahs[numDynamics].timer = dinahs[numDynamics].frame;
-		dinahs[numDynamics].position = 0;			// launch/idle state
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kMacPlus:
-		dinahs[numDynamics].dest = plusScreen1;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 10, 
-				where->top + playOriginV + 7);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kTV:
-		dinahs[numDynamics].dest = tvScreen1;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 17, 
-				where->top + playOriginV + 10);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kCoffee:
-		dinahs[numDynamics].dest = coffeeLight1;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 32, 
-				where->top + playOriginV + 57);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		if (isOn)
-			dinahs[numDynamics].timer = 200;
-		else
-			dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kOutlet:
-		dinahs[numDynamics].dest = outletSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH, 
-				where->top + playOriginV);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = numLights;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = ((short)who->data.g.delay * 6) / kTicksPerFrame;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = dinahs[numDynamics].count;
-		dinahs[numDynamics].position = 0;			// launch/idle state
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kVCR:
-		dinahs[numDynamics].dest = vcrTime1;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 64, 
-				where->top + playOriginV + 6);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		if (isOn)
-			dinahs[numDynamics].timer = 115;
-		else
-			dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kStereo:
-		dinahs[numDynamics].dest = stereoLight1;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 56, 
-				where->top + playOriginV + 20);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kMicrowave:
-		dinahs[numDynamics].dest = microOn;
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + playOriginH + 14, 
-				where->top + playOriginV + 13);
-		dinahs[numDynamics].dest.right = dinahs[numDynamics].dest.left + 48;
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = 0;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kBalloon:
-		dinahs[numDynamics].dest = balloonSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, where->left, 0);
-		dinahs[numDynamics].dest.bottom = kBalloonStart;
-		dinahs[numDynamics].dest.top = dinahs[numDynamics].dest.bottom - 
-				RectTall(&balloonSrc[0]);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		dinahs[numDynamics].vVel = -2;
-		dinahs[numDynamics].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = dinahs[numDynamics].count;
-		dinahs[numDynamics].position = 0;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;			// initially idle
-		break;
-		
-		case kCopterLf:
-		case kCopterRt:
-		dinahs[numDynamics].dest = copterSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, where->left, 0);
-		dinahs[numDynamics].dest.top = kCopterStart;
-		dinahs[numDynamics].dest.bottom = dinahs[numDynamics].dest.top + 
-				RectTall(&copterSrc[0]);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		if (what == kCopterLf)
-			dinahs[numDynamics].hVel = -1;
-		else
-			dinahs[numDynamics].hVel = 1;
-		dinahs[numDynamics].vVel = 2;
-		dinahs[numDynamics].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = dinahs[numDynamics].count;
-		dinahs[numDynamics].position = dinahs[numDynamics].dest.left;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;			// initially idle
-		break;
-		
-		case kDartLf:
-		case kDartRt:
-		dinahs[numDynamics].dest = dartSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		if (what == kDartLf)
-		{
-			QOffsetRect(&dinahs[numDynamics].dest, 
-					kRoomWide - RectWide(&dartSrc[0]), where->top);
-			dinahs[numDynamics].hVel = -kDartVelocity;
-			dinahs[numDynamics].frame = 0;
-		}
-		else
-		{
-			QOffsetRect(&dinahs[numDynamics].dest, 0, where->top);
-			dinahs[numDynamics].hVel = kDartVelocity;
-			dinahs[numDynamics].frame = 2;
-		}
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].vVel = 2;
-		dinahs[numDynamics].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
-		dinahs[numDynamics].timer = dinahs[numDynamics].count;
-		dinahs[numDynamics].position = dinahs[numDynamics].dest.top;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;			// initially idle
-		break;
-		
-		case kBall:
-		dinahs[numDynamics].dest = ballSrc[0];
-		ZeroRectCorner(&dinahs[numDynamics].dest);
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left, where->top);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = 0;
-		position = who->data.h.length;			// reverse engineer init. vel.
-		velocity = 0;
-		evenFrame = true;
-		lilFrame = true;
-		do
-		{
-			if (lilFrame)
-				velocity++;
-			lilFrame = !lilFrame;
-			position -= velocity;
-		}
-		while (position > 0);
-		dinahs[numDynamics].vVel = -velocity;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].count = -velocity;	// count = initial velocity
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = 0;
-		dinahs[numDynamics].position = dinahs[numDynamics].dest.bottom;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kDrip:
-		dinahs[numDynamics].dest = dripSrc[0];
-		CenterRectInRect(&dinahs[numDynamics].dest, where);
-		VOffsetRect(&dinahs[numDynamics].dest, 
-				where->top - dinahs[numDynamics].dest.top);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = dinahs[numDynamics].dest.top;	// remember
-		dinahs[numDynamics].vVel = 0;
-		dinahs[numDynamics].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
-		dinahs[numDynamics].frame = 3;
-		dinahs[numDynamics].timer = dinahs[numDynamics].count;
-		dinahs[numDynamics].position = dinahs[numDynamics].dest.top + 
-				who->data.h.length;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		case kFish:
-		dinahs[numDynamics].dest = fishSrc[0];
-		QOffsetRect(&dinahs[numDynamics].dest, 
-				where->left + 10, where->top + 8);
-		dinahs[numDynamics].whole = dinahs[numDynamics].dest;
-		dinahs[numDynamics].hVel = ((short)who->data.h.delay * 6) / kTicksPerFrame;
-		position = who->data.g.height;			// reverse engineer init. vel.
-		velocity = 0;
-		evenFrame = true;
-		lilFrame = true;
-		do
-		{
-			if (lilFrame)
-				velocity++;
-			lilFrame = !lilFrame;
-			position -= velocity;
-		}
-		while (position > 0);
-		dinahs[numDynamics].vVel = -velocity;
-		dinahs[numDynamics].count = -velocity;	// count = initial velocity
-		dinahs[numDynamics].frame = 0;
-		dinahs[numDynamics].timer = dinahs[numDynamics].hVel;
-		dinahs[numDynamics].position = dinahs[numDynamics].dest.bottom;
-		dinahs[numDynamics].room = room;
-		dinahs[numDynamics].byte0 = (Byte)index;
-		dinahs[numDynamics].byte1 = 0;
-		dinahs[numDynamics].moving = false;
-		dinahs[numDynamics].active = isOn;
-		break;
-		
-		default:
-		return (-1);
-		break;
+
+		if (dynIndex == -1)
+			return (-1);
 	}
 	
-	numDynamics++;
-	
-	return (numDynamics - 1);
-}
+	switch (what)
+	{
+	case kSparkle:
+		dinahs[dynIndex].dest = sparkleSrc[0];
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, where->left, where->top);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
 
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = RandomInt(60) + 15;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kToaster:
+		{
+			short baselineDelta = 0;
+			if (keepExisting)
+				baselineDelta = dinahs[dynIndex].dest.top - (where->top - 2);
+
+			dinahs[dynIndex].dest = breadSrc[0];
+			CenterRectInRect(&dinahs[dynIndex].dest, where);
+			VOffsetRect(&dinahs[dynIndex].dest, 
+				where->top - dinahs[dynIndex].dest.top + baselineDelta);
+
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+			dinahs[dynIndex].hVel = where->top + 2;	// hVel used as clip
+
+			if (!keepExisting)
+			{
+				position = who->data.g.height;				// reverse engineer init. vel.
+				velocity = 0;
+				do
+				{
+					velocity++;
+					position -= velocity;
+				} while (position > 0);
+				dinahs[dynIndex].vVel = -velocity;
+				dinahs[dynIndex].count = velocity;		// count = initial velocity
+				dinahs[dynIndex].frame = (short)who->data.g.delay * 3;
+				dinahs[dynIndex].timer = dinahs[dynIndex].frame;
+				dinahs[dynIndex].position = 0;			// launch/idle state
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].active = isOn;
+			}
+		}
+		break;
+		
+	case kMacPlus:
+		dinahs[dynIndex].dest = plusScreen1;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 10, 
+				where->top + playOriginV + 7);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kTV:
+		dinahs[dynIndex].dest = tvScreen1;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 17, 
+				where->top + playOriginV + 10);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kCoffee:
+		dinahs[dynIndex].dest = coffeeLight1;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 32, 
+				where->top + playOriginV + 57);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			if (isOn)
+				dinahs[dynIndex].timer = 200;
+			else
+				dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kOutlet:
+		dinahs[dynIndex].dest = outletSrc[0];
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH, 
+				where->top + playOriginV);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = numLights;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = ((short)who->data.g.delay * 6) / kTicksPerFrame;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = dinahs[dynIndex].count;
+			dinahs[dynIndex].position = 0;			// launch/idle state
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kVCR:
+		dinahs[dynIndex].dest = vcrTime1;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 64, 
+				where->top + playOriginV + 6);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			if (isOn)
+				dinahs[dynIndex].timer = 115;
+			else
+				dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kStereo:
+		dinahs[dynIndex].dest = stereoLight1;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 56, 
+				where->top + playOriginV + 20);
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kMicrowave:
+		dinahs[dynIndex].dest = microOn;
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		QOffsetRect(&dinahs[dynIndex].dest, 
+				where->left + playOriginH + 14, 
+				where->top + playOriginV + 13);
+		dinahs[dynIndex].dest.right = dinahs[dynIndex].dest.left + 48;
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].hVel = 0;
+			dinahs[dynIndex].vVel = 0;
+			dinahs[dynIndex].count = 0;
+			dinahs[dynIndex].frame = 0;
+			dinahs[dynIndex].timer = 0;
+			dinahs[dynIndex].position = 0;
+			dinahs[dynIndex].room = room;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;
+		}
+		break;
+		
+	case kBalloon:
+		{
+			short baselineDelta = 0;
+			if (keepExisting)
+				baselineDelta = dinahs[dynIndex].dest.bottom - kBalloonStart;
+
+			dinahs[dynIndex].dest = balloonSrc[0];
+			ZeroRectCorner(&dinahs[dynIndex].dest);
+			QOffsetRect(&dinahs[dynIndex].dest, where->left, 0);
+			dinahs[dynIndex].dest.bottom = kBalloonStart + baselineDelta;
+			dinahs[dynIndex].dest.top = dinahs[dynIndex].dest.bottom -
+				RectTall(&balloonSrc[0]);
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+			if (!keepExisting)
+			{
+				dinahs[dynIndex].hVel = 0;
+				dinahs[dynIndex].vVel = -2;
+				dinahs[dynIndex].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
+				dinahs[dynIndex].frame = 0;
+				dinahs[dynIndex].timer = dinahs[dynIndex].count;
+				dinahs[dynIndex].position = 0;
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].active = isOn;			// initially idle
+			}
+		}
+		break;
+		
+	case kCopterLf:
+	case kCopterRt:
+		{
+			short baselineDeltaH = 0;
+			short baselineDeltaV = 0;
+
+			if (keepExisting)
+			{
+				baselineDeltaH = dinahs[dynIndex].dest.left - dinahs[dynIndex].position;
+				baselineDeltaV = dinahs[dynIndex].dest.top - kCopterStart;
+			}
+
+			dinahs[dynIndex].dest = copterSrc[0];
+			ZeroRectCorner(&dinahs[dynIndex].dest);
+			QOffsetRect(&dinahs[dynIndex].dest, where->left, 0);
+			dinahs[dynIndex].dest.top = kCopterStart + baselineDeltaV;
+			dinahs[dynIndex].dest.bottom = dinahs[dynIndex].dest.top + 
+					RectTall(&copterSrc[0]);
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+			if (!keepExisting)
+			{
+				dinahs[dynIndex].position = dinahs[dynIndex].dest.left;
+
+				if (what == kCopterLf)
+					dinahs[dynIndex].hVel = -1;
+				else
+					dinahs[dynIndex].hVel = 1;
+				dinahs[dynIndex].vVel = 2;
+				dinahs[dynIndex].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
+				dinahs[dynIndex].frame = 0;
+				dinahs[dynIndex].timer = dinahs[dynIndex].count;
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].active = isOn;			// initially idle
+			}
+		}
+		break;
+		
+	case kDartLf:
+	case kDartRt:
+		dinahs[dynIndex].dest = dartSrc[0];
+		ZeroRectCorner(&dinahs[dynIndex].dest);
+		if (what == kDartLf)
+		{
+			QOffsetRect(&dinahs[dynIndex].dest, 
+					kRoomWide - RectWide(&dartSrc[0]), where->top);
+			dinahs[dynIndex].hVel = -kDartVelocity;
+			dinahs[dynIndex].frame = 0;
+		}
+		else
+		{
+			QOffsetRect(&dinahs[dynIndex].dest, 0, where->top);
+			dinahs[dynIndex].hVel = kDartVelocity;
+			dinahs[dynIndex].frame = 2;
+		}
+		dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+		dinahs[dynIndex].position = dinahs[dynIndex].dest.top;
+
+		if (!keepExisting)
+		{
+			dinahs[dynIndex].vVel = 2;
+			dinahs[dynIndex].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
+			dinahs[dynIndex].timer = dinahs[dynIndex].count;
+			dinahs[dynIndex].byte0 = (Byte)index;
+			dinahs[dynIndex].byte1 = 0;
+			dinahs[dynIndex].moving = false;
+			dinahs[dynIndex].active = isOn;			// initially idle
+		}
+		break;
+		
+	case kBall:
+		{
+			short baselineDelta = 0;
+
+			if (keepExisting)
+				baselineDelta = dinahs[dynIndex].dest.bottom - dinahs[dynIndex].position;
+
+			dinahs[dynIndex].dest = ballSrc[0];
+			ZeroRectCorner(&dinahs[dynIndex].dest);
+			QOffsetRect(&dinahs[dynIndex].dest, 
+					where->left, where->top + baselineDelta);
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+			if (!keepExisting)
+			{
+				dinahs[dynIndex].position = dinahs[dynIndex].dest.bottom;
+
+				dinahs[dynIndex].hVel = 0;
+				position = who->data.h.length;			// reverse engineer init. vel.
+				velocity = 0;
+				evenFrame = true;
+				lilFrame = true;
+				do
+				{
+					if (lilFrame)
+						velocity++;
+					lilFrame = !lilFrame;
+					position -= velocity;
+				} while (position > 0);
+				dinahs[dynIndex].vVel = -velocity;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].count = -velocity;	// count = initial velocity
+				dinahs[dynIndex].frame = 0;
+				dinahs[dynIndex].timer = 0;
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].active = isOn;
+			}
+		}
+		break;
+		
+	case kDrip:
+		{
+			short baselineDelta = 0;
+
+			if (keepExisting)
+				baselineDelta = dinahs[dynIndex].dest.top - dinahs[dynIndex].hVel;
+
+			dinahs[dynIndex].dest = dripSrc[0];
+			CenterRectInRect(&dinahs[dynIndex].dest, where);
+			VOffsetRect(&dinahs[dynIndex].dest, 
+					where->top - dinahs[dynIndex].dest.top + baselineDelta);
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+			if (!keepExisting)
+			{
+				dinahs[dynIndex].hVel = dinahs[dynIndex].dest.top;	// remember
+				dinahs[dynIndex].position = dinahs[dynIndex].dest.top +
+					who->data.h.length;
+
+				dinahs[dynIndex].vVel = 0;
+				dinahs[dynIndex].count = ((short)who->data.h.delay * 6) / kTicksPerFrame;
+				dinahs[dynIndex].frame = 3;
+				dinahs[dynIndex].timer = dinahs[dynIndex].count;
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].active = isOn;
+			}
+		}
+		break;
+		
+	case kFish:
+		{
+			short baselineDelta = 0;
+
+			if (keepExisting)
+				baselineDelta = dinahs[dynIndex].dest.bottom - dinahs[dynIndex].position;
+
+			dinahs[dynIndex].dest = fishSrc[0];
+			QOffsetRect(&dinahs[dynIndex].dest,
+				where->left + 10, where->top + 8 + baselineDelta);
+			dinahs[dynIndex].whole = dinahs[dynIndex].dest;
+
+			if (!keepExisting)
+			{
+				dinahs[dynIndex].position = dinahs[dynIndex].dest.bottom;
+
+				dinahs[dynIndex].hVel = ((short)who->data.h.delay * 6) / kTicksPerFrame;
+				position = who->data.g.height;			// reverse engineer init. vel.
+				velocity = 0;
+				evenFrame = true;
+				lilFrame = true;
+				do
+				{
+					if (lilFrame)
+						velocity++;
+					lilFrame = !lilFrame;
+					position -= velocity;
+				} while (position > 0);
+				dinahs[dynIndex].vVel = -velocity;
+				dinahs[dynIndex].count = -velocity;	// count = initial velocity
+				dinahs[dynIndex].frame = 0;
+				dinahs[dynIndex].timer = dinahs[dynIndex].hVel;
+				dinahs[dynIndex].room = room;
+				dinahs[dynIndex].byte0 = (Byte)index;
+				dinahs[dynIndex].byte1 = 0;
+				dinahs[dynIndex].moving = false;
+				dinahs[dynIndex].active = isOn;
+			}
+		}
+		break;
+		
+	default:
+		break;
+	}
+
+	return dynIndex;
+}

GpApp/Environ.cpp

@@ -8,11 +8,16 @@
 
 #include "PLResources.h"
 #include "PLPasStr.h"
+#include "DisplayDeviceManager.h"
 #include "Externs.h"
 #include "Environ.h"
 #include "HostDisplayDriver.h"
 #include "HostSystemServices.h"
+#include "MenuManager.h"
+#include "IGpDisplayDriver.h"
+#include "WindowManager.h"
 
+#include <algorithm>
 
 #define	kSwitchDepthAlert		130
 #define kSetMemoryAlert			180
@@ -26,6 +31,8 @@
 #define	kDisplay12Inch			2
 #define	kDisplay13Inch			3
 
+extern Boolean isAutoScale;
+
 
 typedef struct
 {
@@ -192,8 +199,7 @@ Boolean DoWeHaveSoundManager3 (void)
 
 Boolean DoWeHaveQuickTime (void)
 {
-	PL_NotYetImplemented_TODO("Movies");
-	return false;
+	return true;
 }
 
 //--------------------------------------------------------------  DoWeHaveDragManager
@@ -203,30 +209,6 @@ Boolean DoWeHaveDragManager (void)
 	return true;
 }
 
-//--------------------------------------------------------------  WhatsOurDepth  
-
-// Determines the pixel bit depth for current device (monitor).
-
-short WhatsOurDepth (void)
-{
-	GpPixelFormat_t pixelFormat;
-	PortabilityLayer::HostDisplayDriver::GetInstance()->GetDisplayResolution(nil, nil, &pixelFormat);
-
-	switch (pixelFormat)
-	{
-	case GpPixelFormats::k8BitCustom:
-	case GpPixelFormats::k8BitStandard:
-		return 8;
-	case GpPixelFormats::kRGB555:
-		return 16;
-	case GpPixelFormats::kRGB24:
-	case GpPixelFormats::kRGB32:
-		return 32;
-	default:
-		return 0;
-	}
-}
-
 void SwitchToDepth (short, Boolean)
 {
 }
@@ -272,13 +254,36 @@ short HowManyUsableScreens (Boolean use1Bit, Boolean use4Bit, Boolean use8Bit)
 	return 1;
 }
 
+//--------------------------------------------------------------  FlushResolutionChange
+void FlushResolutionChange(void)
+{
+	if (thisMac.isResolutionDirty)
+	{
+		GetDeviceRect(&thisMac.fullScreen);
+		thisMac.constrainedScreen = thisMac.fullScreen;
+		if (thisMac.constrainedScreen.Width() > kMaxViewWidth)
+		{
+			thisMac.constrainedScreen.left = 0;
+			thisMac.constrainedScreen.right = kMaxViewWidth;
+		}
+		if (thisMac.constrainedScreen.Height() > kMaxViewHeight)
+		{
+			thisMac.constrainedScreen.top = 0;
+			thisMac.constrainedScreen.bottom = kMaxViewHeight;
+		}
+
+		thisMac.gray = thisMac.fullScreen;
+		thisMac.gray.top = 20;
+		thisMac.isResolutionDirty = false;
+	}
+}
+
 //--------------------------------------------------------------  CheckOurEnvirons  
 // Calls all the above functions in order to fill out a sort of "spec sheet"<22>
 // for the current Mac.
 
 void CheckOurEnvirons (void)
 {	
-	thisMac.thisResFile = CurResFile();
 	thisMac.vRefNum = 0;		// TEMP
 	thisMac.dirID = 0;			// TEMP
 	thisMac.hasGestalt = true;	// TEMP
@@ -294,10 +299,67 @@ void CheckOurEnvirons (void)
 	thisMac.can4Bit = true;
 	thisMac.can8Bit = true;
 	thisMac.numScreens = HowManyUsableScreens(false, true, true);
-	GetDeviceRect(&thisMac.screen);
-	
-	thisMac.wasDepth = WhatsOurDepth();
-	thisMac.wasColorOrGray = AreWeColorOrGrayscale();
+
+	thisMac.isResolutionDirty = true;
+	FlushResolutionChange();
+}
+
+//--------------------------------------------------------------  HandleResolutionChange
+// Installs handler
+void HandleResolutionChange(uint32_t prevWidth, uint32_t prevHeight, uint32_t newWidth, uint32_t newHeight)
+{
+	PortabilityLayer::WindowManager::GetInstance()->HandleScreenResolutionChange(prevWidth, prevHeight, newWidth, newHeight);
+	PortabilityLayer::MenuManager::GetInstance()->DrawMenuBar();
+	thisMac.isResolutionDirty = true;	// Because of legacy code, we don't want to update thisMac.screen immediately, but rather, let the editor or game pick it up
+}
+
+class GpAppResolutionChangeHandler final : public PortabilityLayer::DisplayDeviceManager::IResolutionChangeHandler
+{
+public:
+	void OnResolutionChanged(uint32_t prevWidth, uint32_t prevHeight, uint32_t newWidth, uint32_t newHeight) override
+	{
+		HandleResolutionChange(prevWidth, prevHeight, newWidth, newHeight);
+	}
+
+	void AdjustRequestedResolution(uint32_t &physicalWidth, uint32_t &physicalHeight, uint32_t &virtualWidth, uint32_t &virtualHeight, float &pixelScaleX, float &pixelScaleY) override
+	{
+		if (physicalWidth < 640)
+			physicalWidth = 640;
+
+		if (physicalHeight < 480)
+			physicalHeight = 480;
+
+		double minMul = 1.0;
+
+		if (isAutoScale)
+		{
+			double xMul = static_cast<double>(physicalWidth) / 640.0;
+			double yMul = static_cast<double>(physicalHeight) / 480.0;
+
+			double granularity = 2.0;
+
+			xMul = floor(xMul * granularity) / granularity;
+			yMul = floor(yMul * granularity) / granularity;
+
+			minMul = std::max<double>(1.0, std::min(xMul, yMul));
+		}
+
+		virtualWidth = physicalWidth / minMul;
+		virtualHeight = physicalHeight / minMul;
+		pixelScaleX = static_cast<float>(minMul);
+		pixelScaleY = static_cast<float>(minMul);
+	}
+
+	static GpAppResolutionChangeHandler ms_instance;
+};
+
+GpAppResolutionChangeHandler GpAppResolutionChangeHandler::ms_instance;
+
+//--------------------------------------------------------------  InstallResolutionHandler
+// Installs handler
+void InstallResolutionHandler(void)
+{
+	PortabilityLayer::DisplayDeviceManager::GetInstance()->SetResolutionChangeHandler(&GpAppResolutionChangeHandler::ms_instance);
 }
 
 //--------------------------------------------------------------  ReflectMonitor2Environs
@@ -335,53 +397,21 @@ void ReflectSecondMonitorEnvirons (Boolean use1Bit, Boolean use4Bit, Boolean use
 
 void HandleDepthSwitching (void)
 {
-	if (thisMac.hasColor)
+	switch (isDepthPref)
 	{
-		switch (isDepthPref)
-		{
-			case kSwitchIfNeeded:
-			if ((thisMac.wasDepth != 8) && 
-					((thisMac.wasDepth != 4) || (thisMac.wasColorOrGray)))
-				SwitchDepthOrAbort();
-			break;
-			
-			case kSwitchTo256Colors:
-			if (thisMac.wasDepth != 8)
-			{
-				if (thisMac.can8Bit)
-					SwitchToDepth(8, true);
-				else
-					SwitchDepthOrAbort();
-			}
-			break;
-			
-			case kSwitchTo16Grays:
-			if ((thisMac.wasDepth != 4) || (thisMac.wasColorOrGray))
-			{
-				if (thisMac.can4Bit)
-					SwitchToDepth(4, false);
-				else
-					SwitchDepthOrAbort();
-			}
-			break;
-			
-			default:
-			break;
-		}
+	case 32:
+		PortabilityLayer::DisplayDeviceManager::GetInstance()->SetPixelFormat(GpPixelFormats::kRGB32);
+		break;
+	case 8:
+		PortabilityLayer::DisplayDeviceManager::GetInstance()->SetPixelFormat(GpPixelFormats::k8BitStandard);
+		break;
+	default:
+		isDepthPref = 8;
+		PortabilityLayer::DisplayDeviceManager::GetInstance()->SetPixelFormat(GpPixelFormats::k8BitStandard);
+		break;
 	}
-	
-	thisMac.isDepth = WhatsOurDepth();
-}
 
-//--------------------------------------------------------------  RestoreColorDepth
-
-// Restores a monitor to its previous depth when we quit (if we changed it).
-
-void RestoreColorDepth (void)
-{
-	if ((thisMac.hasColor) && ((thisMac.wasDepth != thisMac.isDepth) || 
-			(thisMac.wasColorOrGray != AreWeColorOrGrayscale())))
-		SwitchToDepth(thisMac.wasDepth, true);
+	thisMac.isDepth = isDepthPref;
 }
 
 //--------------------------------------------------------------  CheckMemorySize
@@ -411,7 +441,7 @@ void CheckMemorySize (void)
 		RedAlert(kErrNoMemory);
 	else
 		bytesNeeded += musicBytes;
-	bytesNeeded += 4L * (long)thisMac.screen.bottom;		// main screen
+	bytesNeeded += 4L * (long)thisMac.constrainedScreen.bottom;		// main screen
 	bytesNeeded += (((long)houseRect.right - (long)houseRect.left) * 
 			((long)houseRect.bottom + 1 - (long)houseRect.top) * 
 			(long)thisMac.isDepth) / 8L;					// work map
@@ -492,7 +522,7 @@ void GetDeviceRect(Rect *rect)
 {
 	unsigned int width;
 	unsigned int height;
-	PortabilityLayer::HostDisplayDriver::GetInstance()->GetDisplayResolution(&width, &height, nil);
+	PortabilityLayer::HostDisplayDriver::GetInstance()->GetDisplayResolution(&width, &height);
 
 	SetRect(rect, 0, 0, static_cast<short>(width), static_cast<short>(height));
 }

GpApp/Environ.h

@@ -10,10 +10,9 @@
 
 typedef struct
 {
-	Rect		screen, gray;
+	Rect		fullScreen, constrainedScreen, gray;
 	long		dirID;
-	short		wasDepth, isDepth;
-	short		thisResFile;
+	short		isDepth;
 	short		numScreens;
 	short		vRefNum;
 	Boolean		can1Bit;
@@ -29,9 +28,10 @@ typedef struct
 	Boolean		hasSM3;
 	Boolean		hasQT;
 	Boolean		hasDrag;
+	Boolean		isResolutionDirty;
 } macEnviron;
 
 
 extern macEnviron	thisMac;
 
-
+void FlushResolutionChange(void);