Allocator refactor

gpr2gpa/gpr2gpa.cpp

@@ -2,6 +2,7 @@
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"
 #include "GPArchive.h"
+#include "GpAllocator_C.h"
 #include "MacRomanConversion.h"
 #include "MemReaderStream.h"
 #include "QDPictDecoder.h"
@@ -15,6 +16,7 @@
 #include "ZipFile.h"
 #include "WaveFormat.h"
 #include "GpUnicode.h"
+#include "PLDrivers.h"
 
 #include "zlib.h"
 
@@ -1431,6 +1433,9 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 
 	PortabilityLayer::CFileStream cfs(inF);
 
+	GpDriverCollection *drivers = PLDrivers::GetDriverCollection();
+	drivers->SetDriver<GpDriverIDs::kAlloc>(GpAllocator_C::GetInstance());
+
 	PortabilityLayer::ResourceFile *resFile = PortabilityLayer::ResourceFile::Create();
 	resFile->Load(&cfs);
 	cfs.Close();

gpr2gpa/gpr2gpa.vcxproj

@@ -45,6 +45,7 @@
     <Import Project="..\RapidJSON.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
     <Import Project="..\Debug.props" />
+    <Import Project="..\AerofoilPortable.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" />
@@ -56,6 +57,7 @@
     <Import Project="..\RapidJSON.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
     <Import Project="..\Release.props" />
+    <Import Project="..\AerofoilPortable.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -95,6 +97,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp" />
     <ClCompile Include="gpr2gpa.cpp" />
     <ClCompile Include="macedec.cpp" />
   </ItemGroup>

gpr2gpa/gpr2gpa.vcxproj.filters

@@ -21,6 +21,9 @@
     <ClCompile Include="macedec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="macedec.h">