Increment version

Co-authored-by: briaguya <briaguya@alice>

.gitignore

@@ -0,0 +1,408 @@
+# Cache files
+__pycache__/
+.pyc
+.DS_Store
+
+# Text editor remnants
+.vscode/
+.vs/
+.idea/
+cmake-build-debug
+venv/
+
+# Project-specific ignores
+build/
+expected/
+notes/
+baserom/
+docs/doxygen/
+*.elf
+*.sra
+*.z64
+*.n64
+*.v64
+*.map
+*.dump
+out.txt
+
+# Tool artifacts
+tools/mipspro7.2_compiler/
+tools/overlayhelpers/batchdisasm/output/*
+tools/overlayhelpers/batchdisasm/output2/*
+tools/overlayhelpers/batchdisasm/mipsdisasm/*
+tools/disasm/output/*
+tools/asmsplitter/asm/*
+tools/asmsplitter/c/*
+ctx.c
+tools/*dSYM/
+graphs/
+
+# Assets
+*.png
+*.jpg
+*.mdli
+*.anmi
+*.obj
+*.mtl
+*.fbx
+!*_custom*
+.extracted-assets.json
+
+# Docs
+!docs/tutorial/
+
+# Per-user configuration
+.python-version
+
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+*.out
+*.o
+*.d
+lib/libgfxd/libgfxd.a
+ExporterTest/ExporterTest.a
+ZAPDUtils/ZAPDUtils.a
+.vscode/
+build/
+external/
+ZAPDUtils/build/
+ZAPD/BuildInfo.h
+
+DebugObj/*
+ReleaseObj/*
+.tags
+tags
+oot.otr
+*.sav
+shipofharkinian.ini
+shipofharkinian.json

BUILDING.md

@@ -0,0 +1,88 @@
+# Building Ship of Harkinian
+
+## Windows
+
+ 1. Requires [Python](https://www.python.org/downloads/) >= 3.6.
+ 2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
+ 3. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
+ 4. Clone the Ship of Harkinian repository.
+ 5. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice.
+ 6. Run `OTRExporter/OTRExporter.sln`.
+ 7. Switch the solution to `Release x64`.
+ 8. Build the solution.
+ 9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
+ 10. Run `soh/soh.sln`
+ 11. Switch the solution to `Release x86` or `Release x64`.
+ 12. Build the solution.
+ 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
+ 14. Launch `soh.exe`.
+
+## Linux
+
+```bash
+# Clone the repo
+git clone https://github.com/HarbourMasters/Shipwright.git
+cd Shipwright
+# Copy the baserom to the OTRExporter folder
+cp <path to your ROM> OTRExporter
+# Build the docker image
+sudo docker build . -t soh
+# Run the docker image with the working directory mounted to /soh
+sudo docker run --rm -it -v $(pwd):/soh soh /bin/bash
+```
+Inside the Docker container:
+```bash
+# Clone and build StormLib
+git clone https://github.com/ladislav-zezula/StormLib external/StormLib
+cmake -B external/StormLib/build -S external/StormLib
+cmake --build external/StormLib/build
+cp external/StormLib/build/libstorm.a external
+cp /usr/local/lib/libGLEW.a external
+
+cd soh
+# Extract the assets/Compile the exporter/Run the exporter
+make setup -j$(nproc) OPTFLAGS=-O2 DEBUG=0
+# Compile the code
+make -j $(nproc) OPTFLAGS=-O2 DEBUG=0
+```
+
+## macOS
+
+1. Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, dylibbundler` (can be installed via brew, etc)
+```bash
+# Clone the repo
+git clone https://github.com/HarbourMasters/Shipwright.git
+cd ShipWright
+# Copy the baserom to the OTRExporter folder
+cp <path to your ROM> OTRExporter
+
+cd soh
+# Extract the assets/Compile the exporter/Run the exporter
+# -jX defines number of cores to use for compilation - lower or remove entirely if having issues
+make setup -j8 DEBUG=0
+# Compile the code (watch the -j parameter as above)
+make -j8 DEBUG=0
+# Create macOS app bundle
+make appbundle
+```
+9. Copy your OTR file to ~/Library/Application\ Support/com.shipofharkinian.soh
+10. Launch soh app in the soh folder!
+
+# Compatible Roms
+```
+OOT_PAL_GC      checksum 0x09465AC3
+OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
+```
+
+# OTRExporter Usage
+
+The OTRExporter exports an `oot.otr` archive file which Ship of Harkinian requires to play.
+
+Use the `extract_assets.py` script file to run the exporter using any of the following methods:
+1) Double click on the script after placing one or more roms in the directory.
+2) Drag & Drop a rom onto the script.
+3) In a terminal run `python3 extract_assets.py` after placing one or more roms in the directory.
+4) In a terminal run `python3 extract_assets.py <path_to_rom>`
+
+If the script finds multiple roms the user is prompted which to use. Selection is done using the number keys and then pressing the carriage return key.
+

Dockerfile

@@ -0,0 +1,47 @@
+FROM ubuntu:20.04 as build
+
+ENV LANG C.UTF-8
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+	apt-get upgrade -y && \
+	apt-get install -y \
+		binutils \
+		gcc-10 \
+		g++-10 \
+		patchelf \
+		p7zip-full \
+		python3.9 \
+		make \
+		cmake \
+		curl \
+		git \
+		lld \
+		libsdl2-dev \
+		zlib1g-dev \
+		libbz2-dev \
+		libpng-dev \
+		libgles2-mesa-dev && \    
+	ln -s /usr/bin/g++-10 /usr/bin/g++ && \
+	update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 && \
+	gcc --version && \
+	g++ --version
+	
+RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/cache /var/lib/log
+	
+RUN git clone https://github.com/Perlmint/glew-cmake.git && \
+	cmake glew-cmake && \
+	make -j$(nproc) && \
+	make install
+    
+ENV SDL2VER=2.0.22
+RUN curl -sLO https://libsdl.org/release/SDL2-${SDL2VER}.tar.gz && \
+	tar -xzf SDL2-${SDL2VER}.tar.gz && \
+	cd SDL2-${SDL2VER} && \
+	./configure --prefix=/usr && \
+	make && make install && \
+	rm ../SDL2-${SDL2VER}.tar.gz && \
+	cp -av /lib/libSDL* /lib/x86_64-linux-gnu/
+
+RUN mkdir /soh
+WORKDIR /soh

Jenkinsfile

@@ -0,0 +1,164 @@
+pipeline {
+    agent none
+    
+    options {
+        timestamps() 
+        skipDefaultCheckout(true)
+        disableConcurrentBuilds(abortPrevious: true)
+    }
+    
+    stages {
+        stage('Build SoH') {
+            parallel {
+                stage ('Build Windows') {
+                    options {
+                        timeout(time: 20)
+                    }
+                    environment {
+                        MSBUILD='C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Msbuild\\Current\\Bin\\msbuild.exe'
+                        CONFIG='Release'
+                        OTRPLATFORM='x64'
+                        PLATFORM='x64'
+                        ZIP='C:\\Program Files\\7-Zip\\7z.exe'
+                        PYTHON='C:\\Users\\jenkins\\AppData\\Local\\Programs\\Python\\Python310\\python.exe'
+                        CMAKE='C:\\Program Files\\CMake\\bin\\cmake.exe'
+                        TOOLSET='v142'
+                    }
+                    agent {
+                        label "SoH-Builders"
+                    }
+                    steps {
+                        checkout([
+                            $class: 'GitSCM',
+                            branches: scm.branches,
+                            doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                            extensions: scm.extensions,
+                            userRemoteConfigs: scm.userRemoteConfigs
+                        ])
+                            
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            bat """ 
+                            
+                            "${env.MSBUILD}" ".\\OTRExporter\\OTRExporter.sln" -t:build -p:Configuration=${env.CONFIG};Platform=${env.OTRPLATFORM};PlatformToolset=${env.TOOLSET};RestorePackagesConfig=true /restore /nodeReuse:false /m
+                            
+                            xcopy "..\\..\\ZELOOTD.z64" "OTRExporter\\"
+                            
+                            cd "OTRExporter"
+                            "${env.PYTHON}" ".\\extract_assets.py"
+                            cd "..\\"
+                            
+                            "${env.MSBUILD}" ".\\soh\\soh.sln" -t:build -p:Configuration=${env.CONFIG};Platform=${env.PLATFORM};PlatformToolset=${env.TOOLSET} /nodeReuse:false /m
+                            
+                            cd OTRGui
+                            mkdir build
+                            cd build
+                            
+                            "${env.CMAKE}" ..
+                            "${env.CMAKE}" --build . --config Release
+                            
+                            cd "..\\..\\"
+                            
+                            move "soh\\x64\\Release\\soh.exe" ".\\"
+                            move "OTRGui\\build\\assets" ".\\"
+                            move ".\\OTRExporter\\x64\\Release\\ZAPD.exe" ".\\assets\\extractor\\"
+                            move ".\\OTRGui\\build\\Release\\OTRGui.exe" ".\\"
+                            rename README.md readme.txt
+                            
+                            "${env.ZIP}" a soh.7z soh.exe OTRGui.exe assets readme.txt
+                            
+                            """
+                            archiveArtifacts artifacts: 'soh.7z', followSymlinks: false, onlyIfSuccessful: true
+                        }
+                    }
+                    post {
+                        always {
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+                stage ('Build Linux') {
+                    options {
+                        timeout(time: 20)
+                    }
+                    agent {
+                        label "SoH-Linux-Builders"
+                    }
+                    steps {
+                        checkout([
+                            $class: 'GitSCM',
+                            branches: scm.branches,
+                            doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                            extensions: scm.extensions,
+                            userRemoteConfigs: scm.userRemoteConfigs
+                        ])
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            sh '''
+                            
+                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                            docker build . -t soh
+                            docker run --name sohcont -dit --rm -v $(pwd):/soh soh /bin/bash
+                            cp ../../buildsoh.bash soh
+                            docker exec sohcont soh/buildsoh.bash
+                            
+                            mkdir build
+                            mv soh/soh.elf build/
+                            mv OTRGui/build/OTRGui build/
+                            mv OTRGui/build/assets build/
+                            mv ZAPDTR/ZAPD.out build/assets/extractor/
+                            mv README.md readme.txt
+			    
+                            docker exec sohcont appimage/appimage.sh
+			    
+                            7z a soh-linux.7z SOH-Linux.AppImage readme.txt
+                            
+                            '''
+                        }
+                        sh 'sudo docker container stop sohcont'
+                        archiveArtifacts artifacts: 'soh-linux.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+                stage ('Build macOS') {
+                    agent {
+                        label "SoH-Mac-Builders"
+                    }
+                    environment {
+                        CC = 'clang -arch arm64 -arch x86_64'
+                        CXX = 'clang++ -arch arm64 -arch x86_64'
+                        MACOSX_DEPLOYMENT_TARGET = 10.15
+                    }
+                    steps {
+                        checkout([
+                            $class: 'GitSCM',
+                            branches: scm.branches,
+                            doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                            extensions: scm.extensions,
+                            userRemoteConfigs: scm.userRemoteConfigs
+                        ])
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            sh '''
+                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                            cd soh
+                            make setup -j4 OPTFLAGS=-O2 DEBUG=0 LD="ld"
+                            make -j4 DEBUG=0 OPTFLAGS=-O2 LD="ld"
+                            make -j4 appbundle
+                            mv ../README.md readme.txt
+                            7z a soh-mac.7z soh.app readme.txt
+                            '''
+                        }
+                        archiveArtifacts artifacts: 'soh/soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

OTRExporter/.gitignore

@@ -341,10 +341,13 @@ build/
 ZAPDUtils/build/
 ZAPD/BuildInfo.h
 baserom/
+baserom_ntsc/
 *.vtx.inc
 *.otr
 *.swp
 *.a
+*.z64
+*.n64
 Extract/
 
 tmp.txt

OTRExporter/CFG/Config.xml

@@ -2,7 +2,7 @@
     <SymbolMap File="SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="ActorList_OoTMqDbg.txt"/>
     <ObjectList File="ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="../soh/assets/xml/"/>
+    <ExternalXMLFolder Path="../soh/assets/xml/GC_NMQ_PAL_F/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>

OTRExporter/OTRExporter.sln

@@ -11,6 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libultraship", "..\libultra
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "..\ZAPDTR\ZAPD\ZAPD.vcxproj", "{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}"
 	ProjectSection(ProjectDependencies) = postProject
+		{78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055}
 		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
 		{A2E01C3E-D647-45D1-9788-043DEBC1A908} = {A2E01C3E-D647-45D1-9788-043DEBC1A908}
 		{A6103FD3-0709-4FC7-B066-1A6E056D6306} = {A6103FD3-0709-4FC7-B066-1A6E056D6306}
@@ -18,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "..\ZAPDTR\ZAPD\ZAPD
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "..\ZAPDTR\ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\StormLib\StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -58,6 +61,14 @@ Global
 		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.Build.0 = Release|x64
 		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.ActiveCfg = Release|Win32
 		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.Build.0 = Release|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.ActiveCfg = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.Build.0 = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.ActiveCfg = ReleaseAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.Build.0 = ReleaseAS|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OTRExporter/OTRExporter/AnimationExporter.cpp

@@ -49,12 +49,12 @@ void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, Binary
 
 		writer->Write((uint32_t)normalAnim->rotationValues.size());
 
-		for (int i = 0; i < normalAnim->rotationValues.size(); i++)
+		for (size_t i = 0; i < normalAnim->rotationValues.size(); i++)
 			writer->Write(normalAnim->rotationValues[i]);
 
 		writer->Write((uint32_t)normalAnim->rotationIndices.size());
 
-		for (int i = 0; i < normalAnim->rotationIndices.size(); i++)
+		for (size_t i = 0; i < normalAnim->rotationIndices.size(); i++)
 		{
 			writer->Write(normalAnim->rotationIndices[i].x);
 			writer->Write(normalAnim->rotationIndices[i].y);

OTRExporter/OTRExporter/ArrayExporter.cpp

@@ -10,7 +10,7 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 	writer->Write((uint32_t)arr->resList[0]->GetResourceType());
 	writer->Write((uint32_t)arr->arrayCnt);
 
-	for (int i = 0; i < arr->arrayCnt; i++)
+	for (size_t i = 0; i < arr->arrayCnt; i++)
 	{
 		if (arr->resList[i]->GetResourceType() == ZResourceType::Vertex)
 		{
@@ -32,7 +32,7 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 			writer->Write((uint32_t)vec->scalarType);
 			writer->Write((uint32_t)vec->dimensions);
 
-			for (int k = 0; k < vec->dimensions; k++)
+			for (size_t k = 0; k < vec->dimensions; k++)
 			{
 				// OTRTODO: Duplicate code here. Cleanup at a later date...
 				switch (vec->scalarType)
@@ -62,6 +62,8 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 					writer->Write(vec->scalars[k].scalarData.u64);
 					break;
 					// OTRTODO: ADD OTHER TYPES
+				default:
+					break;
 				}
 			}
 		}
@@ -98,6 +100,8 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 				writer->Write(scal->scalarData.u64);
 				break;
 				// OTRTODO: ADD OTHER TYPES
+			default:
+				break;
 			}
 		}
 	}

OTRExporter/OTRExporter/AudioExporter.cpp

@@ -0,0 +1,192 @@
+#include "AudioExporter.h"
+#include "Main.h"
+#include <Animation.h>
+#include <Utils/MemoryStream.h>
+#include <Globals.h>
+#include <Utils/File.h>
+#include "DisplayListExporter.h"
+
+void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map<uint32_t, SampleEntry*> samples, BinaryWriter* writer)
+{
+	writer->Write((uint8_t)(entry != nullptr ? 1 : 0));
+
+	if (entry != nullptr)
+	{
+		if (audio->sampleOffsets[entry->bankId].find(entry->sampleLoopOffset) != audio->sampleOffsets[entry->bankId].end())
+		{
+			if (audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].find(entry->sampleDataOffset) != audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].end())
+			{
+				writer->Write(StringHelper::Sprintf("audio/samples/%s", audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset][entry->sampleDataOffset].c_str()));
+			}
+			else
+				writer->Write(entry->fileName);
+		}
+		else
+			writer->Write(entry->fileName);
+	}
+	else
+		writer->Write("");
+}
+
+void OTRExporter_Audio::WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer)
+{
+	WriteHeader(nullptr, "", writer, Ship::ResourceType::AudioSample, Ship::Version::Rachael);
+
+	writer->Write(entry->codec);
+	writer->Write(entry->medium);
+	writer->Write(entry->unk_bit26);
+	writer->Write(entry->unk_bit25);
+
+	writer->Write((uint32_t)entry->data.size());
+	writer->Write((char*)entry->data.data(), entry->data.size());
+
+	writer->Write((uint32_t)(entry->loop.start));
+	writer->Write((uint32_t)(entry->loop.end));
+	writer->Write((uint32_t)(entry->loop.count));
+	writer->Write((uint32_t)entry->loop.states.size());
+
+	for (size_t i = 0; i < entry->loop.states.size(); i++)
+		writer->Write((entry->loop.states[i]));
+
+	writer->Write((uint32_t)(entry->book.order));
+	writer->Write((uint32_t)(entry->book.npredictors));
+	writer->Write((uint32_t)entry->book.books.size());
+
+	for (size_t i = 0; i < entry->book.books.size(); i++)
+		writer->Write((entry->book.books[i]));
+}
+
+void OTRExporter_Audio::WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map<uint32_t, SampleEntry*> samples, BinaryWriter* writer)
+{
+	writer->Write((uint8_t)(entry != nullptr ? 1 : 0));
+
+	if (entry != nullptr)
+	{
+		WriteSampleEntryReference(audio, entry->sampleEntry, samples, writer);
+		writer->Write(entry->tuning);
+	}
+}
+
+void OTRExporter_Audio::WriteEnvData(std::vector<AdsrEnvelope*> envelopes, BinaryWriter* writer)
+{
+	writer->Write((uint32_t)envelopes.size());
+
+	for (auto env : envelopes)
+	{
+		writer->Write(env->delay);
+		writer->Write(env->arg);
+	}
+}
+
+void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
+{
+	ZAudio* audio = (ZAudio*)res;
+
+	WriteHeader(res, outPath, writer, Ship::ResourceType::Audio, Ship::Version::Rachael);
+
+	// Write Samples as individual files
+	for (auto pair : audio->samples)
+	{
+		MemoryStream* sampleStream = new MemoryStream();
+		BinaryWriter sampleWriter = BinaryWriter(sampleStream);
+
+		writer->Write((uint32_t)pair.first);
+		WriteSampleEntry(pair.second, &sampleWriter);
+
+		std::string basePath = "";
+
+		if (audio->sampleOffsets[pair.second->bankId].find(pair.second->sampleLoopOffset) != audio->sampleOffsets[pair.second->bankId].end())
+		{
+			if (audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].find(pair.second->sampleDataOffset) != audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].end())
+				basePath = StringHelper::Sprintf("samples/%s", audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset][pair.second->sampleDataOffset].c_str());
+			else
+				basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first);
+		}
+		else
+			basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first);
+
+		std::string fName = OTRExporter_DisplayList::GetPathToRes(res, basePath);
+		AddFile(fName, sampleStream->ToVector());
+	}
+
+	// Write the soundfont table
+	for (size_t i = 0; i < audio->soundFontTable.size(); i++)
+	{
+		MemoryStream* fntStream = new MemoryStream();
+		BinaryWriter fntWriter = BinaryWriter(fntStream);
+
+		WriteHeader(nullptr, "", &fntWriter, Ship::ResourceType::AudioSoundFont, Ship::Version::Rachael);
+
+		fntWriter.Write((uint32_t)i);
+		fntWriter.Write(audio->soundFontTable[i].medium);
+		fntWriter.Write(audio->soundFontTable[i].cachePolicy);
+		fntWriter.Write(audio->soundFontTable[i].data1);
+		fntWriter.Write(audio->soundFontTable[i].data2);
+		fntWriter.Write(audio->soundFontTable[i].data3);
+
+		fntWriter.Write((uint32_t)audio->soundFontTable[i].drums.size());
+		fntWriter.Write((uint32_t)audio->soundFontTable[i].instruments.size());
+		fntWriter.Write((uint32_t)audio->soundFontTable[i].soundEffects.size());
+
+		for (size_t k = 0; k < audio->soundFontTable[i].drums.size(); k++)
+		{
+			fntWriter.Write(audio->soundFontTable[i].drums[k].releaseRate);
+			fntWriter.Write(audio->soundFontTable[i].drums[k].pan);
+			fntWriter.Write(audio->soundFontTable[i].drums[k].loaded);
+
+			WriteEnvData(audio->soundFontTable[i].drums[k].env, &fntWriter);
+
+			WriteSampleEntryReference(audio, audio->soundFontTable[i].drums[k].sample, audio->samples, &fntWriter);
+			fntWriter.Write(audio->soundFontTable[i].drums[k].tuning);
+		}
+
+		for (size_t k = 0; k < audio->soundFontTable[i].instruments.size(); k++)
+		{
+			fntWriter.Write((uint8_t)audio->soundFontTable[i].instruments[k].isValidInstrument);
+
+			fntWriter.Write(audio->soundFontTable[i].instruments[k].loaded);
+			fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeLo);
+			fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeHi);
+			fntWriter.Write(audio->soundFontTable[i].instruments[k].releaseRate);
+
+			WriteEnvData(audio->soundFontTable[i].instruments[k].env, &fntWriter);
+
+			WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].lowNotesSound, audio->samples, &fntWriter);
+			WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].normalNotesSound, audio->samples, &fntWriter);
+			WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].highNotesSound, audio->samples, &fntWriter);
+		}
+
+		for (size_t k = 0; k < audio->soundFontTable[i].soundEffects.size(); k++)
+		{
+			WriteSoundFontEntry(audio, audio->soundFontTable[i].soundEffects[k], audio->samples, &fntWriter);
+		}
+
+		//std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/font_%02X", i));
+		std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/%s", audio->soundFontNames[i].c_str()));
+		AddFile(fName, fntStream->ToVector());
+	}
+
+	// Write Sequences
+	for (size_t i = 0; i < audio->sequences.size(); i++)
+	{
+		auto seq = audio->sequences[i];
+
+		MemoryStream* seqStream = new MemoryStream();
+		BinaryWriter seqWriter = BinaryWriter(seqStream);
+
+		WriteHeader(nullptr, "", &seqWriter, Ship::ResourceType::AudioSequence, Ship::Version::Rachael);
+
+		seqWriter.Write((uint32_t)seq.size());
+		seqWriter.Write(seq.data(), seq.size());
+		seqWriter.Write((uint8_t)i);
+		seqWriter.Write((uint8_t)audio->sequenceTable[i].medium);
+		seqWriter.Write((uint8_t)audio->sequenceTable[i].cachePolicy);
+		seqWriter.Write((uint32_t)audio->fontIndices[i].size());
+
+		for (size_t k = 0; k < audio->fontIndices[i].size(); k++)
+			seqWriter.Write((uint8_t)audio->fontIndices[i][k]);
+
+		std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("sequences/%s", audio->seqNames[i].c_str()));
+		AddFile(fName, seqStream->ToVector());
+	}
+}

OTRExporter/OTRExporter/AudioExporter.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ZResource.h"
+#include "ZAudio.h"
+#include "Exporter.h"
+#include <Utils/BinaryWriter.h>
+
+class OTRExporter_Audio : public OTRExporter
+{
+public:
+	void WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer);
+	void WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map<uint32_t, SampleEntry*> samples, BinaryWriter* writer);
+	void WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map<uint32_t, SampleEntry*> samples, BinaryWriter* writer);
+	void WriteEnvData(std::vector<AdsrEnvelope*> envelopes, BinaryWriter* writer);
+	virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override;
+};

OTRExporter/OTRExporter/CutsceneExporter.cpp

@@ -29,7 +29,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
 				writer->Write(CMD_BBH(e->continueFlag, e->cameraRoll, e->nextPointFrame));
-				writer->Write(CMD_F(e->viewAngle));
+				writer->Write(e->viewAngle);
 				writer->Write(CMD_HH(e->posX, e->posY));
 				writer->Write(CMD_HH(e->posZ, e->unused));
 			}
@@ -46,7 +46,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
 				writer->Write(CMD_BBH(e->continueFlag, e->cameraRoll, e->nextPointFrame));
-				writer->Write(CMD_F(e->viewAngle));
+				writer->Write(e->viewAngle);
 				writer->Write(CMD_HH(e->posX, e->posY));
 				writer->Write(CMD_HH(e->posZ, e->unused));
 			}
@@ -105,7 +105,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
 				writer->Write(CMD_BBH(e->continueFlag, e->cameraRoll, e->nextPointFrame));
-				writer->Write(CMD_F(e->viewAngle));
+				writer->Write(e->viewAngle);
 				writer->Write(CMD_HH(e->posX, e->posY));
 				writer->Write(CMD_HH(e->posZ, e->unused));
 			}
@@ -122,7 +122,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
 				writer->Write(CMD_BBH(e->continueFlag, e->cameraRoll, e->nextPointFrame));
-				writer->Write(CMD_F(e->viewAngle));
+				writer->Write(e->viewAngle);
 				writer->Write(CMD_HH(e->posX, e->posY));
 				writer->Write(CMD_HH(e->posZ, e->unused));
 			}

OTRExporter/OTRExporter/DisplayListExporter.cpp

@@ -29,20 +29,6 @@
                    Ab1, Ad1))       \
 }
 
-typedef int32_t Mtx_t[4][4];
-
-typedef union Mtx
-{
-	//_Alignas(8)
-		Mtx_t		m;
-	int32_t		l[16];
-	struct
-	{
-		int16_t		i[16];
-		uint16_t	f[16];
-	};
-} Mtx;
-
 #define gsSPBranchLessZraw2(dl, vtx, zval)               \
 {   _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\
     (unsigned int)(zval),                       }
@@ -71,7 +57,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 	// DEBUG: Write in a marker
 	Declaration* dbgDecl = dList->parent->GetDeclaration(dList->GetRawDataIndex());
-	std::string dbgName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dbgDecl->varName.c_str());
+	std::string dbgName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), dbgDecl->varName.c_str());
 	uint64_t hash = CRC64(dbgName.c_str());
 	writer->Write((uint32_t)(G_MARKER << 24));
 	writer->Write((uint32_t)0xBEEFBEEF);
@@ -81,7 +67,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 	auto dlStart = std::chrono::steady_clock::now();
 
 	//for (auto data : dList->instructions)
-	for (int dataIdx = 0; dataIdx < dList->instructions.size(); dataIdx++)
+	for (size_t dataIdx = 0; dataIdx < dList->instructions.size(); dataIdx++)
 	{
 		auto data = dList->instructions[dataIdx];
 		uint32_t word0 = 0;
@@ -110,14 +96,14 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		{
 		case G_NOOP:
 		{
-			Gfx value = gsDPNoOp();
+			Gfx value = {gsDPNoOp()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_ENDDL:
 		{
-			Gfx value = gsSPEndDisplayList();
+			Gfx value = {gsSPEndDisplayList()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -128,7 +114,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t nnnn = (data & 0x0000FFFF00000000ULL) >> 32;
 			int32_t vvvvvvvv = (data & 0x00000000FFFFFFFFULL);
 
-			Gfx value = gsSPModifyVertex(nnnn / 2, ww, vvvvvvvv);
+			Gfx value = {gsSPModifyVertex(nnnn / 2, ww, vvvvvvvv)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -145,35 +131,35 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32;
 			int32_t ssssssss = (data & 0xFFFFFFFF);
 
-			Gfx value = gsSPGeometryMode(~cccccc, ssssssss);
+			Gfx value = {gsSPGeometryMode(~cccccc, ssssssss)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_RDPPIPESYNC:
 		{
-			Gfx value = gsDPPipeSync();
+			Gfx value = {gsDPPipeSync()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_RDPLOADSYNC:
 		{
-			Gfx value = gsDPLoadSync();
+			Gfx value = {gsDPLoadSync()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_RDPTILESYNC:
 		{
-			Gfx value = gsDPTileSync();
+			Gfx value = {gsDPTileSync()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_RDPFULLSYNC:
 		{
-			Gfx value = gsDPFullSync();
+			Gfx value = {gsDPFullSync()};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -183,14 +169,14 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t hhhhhh = (data & 0x00FFFFFF00000000) >> 32;
 			int32_t llllllll = (data & 0x00000000FFFFFFFF);
 
-			Gfx value = gsDPSetOtherMode(hhhhhh, llllllll);
+			Gfx value = {gsDPSetOtherMode(hhhhhh, llllllll)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_POPMTX:
 		{
-			Gfx value = gsSPPopMatrix(data);
+			Gfx value = {gsSPPopMatrix(data)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -202,23 +188,23 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			uint8_t b = (uint8_t)((data & 0xFF00FF00) >> 8);
 			uint8_t a = (uint8_t)((data & 0x000000FF) >> 0);
 
-			Gfx value = gsDPSetEnvColor(r, g, b, a);
+			Gfx value = {gsDPSetEnvColor(r, g, b, a)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
 		break;
 		case G_MTX:
 		{
-			if ((!Globals::Instance->HasSegment(GETSEGNUM(data))) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
+			if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID)) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
 			{
 				uint32_t pp = (data & 0x000000FF00000000) >> 32;
 				uint32_t mm = (data & 0x00000000FFFFFFFF);
 
 				pp ^= G_MTX_PUSH;
 
-				mm = (mm & 0x0FFFFFFF) + 0xF0000000;
+				mm = (mm & 0x0FFFFFFF) + 1;
 
-				Gfx value = gsSPMatrix(mm, pp);
+				Gfx value = {gsSPMatrix(mm, pp)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 			}
@@ -228,7 +214,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t mm = (data & 0x00000000FFFFFFFF);
 				pp ^= G_MTX_PUSH;
 
-				Gfx value = gsSPMatrix(mm, pp);
+				Gfx value = {gsSPMatrix(mm, pp)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 
@@ -243,7 +229,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 				if (mtxDecl != nullptr)
 				{
-					std::string vName = StringHelper::Sprintf("%s\\%s", (GetParentFolderName(res).c_str()), mtxDecl->varName.c_str());
+					std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), mtxDecl->varName.c_str());
 
 					uint64_t hash = CRC64(vName.c_str());
 
@@ -267,7 +253,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t xxx = (data & 0x0000000000FFF000) >> 12;
 			int32_t ddd = (data & 0x0000000000000FFF);
 
-			Gfx value = gsDPLoadBlock(i, sss, ttt, xxx, ddd);
+			Gfx value = {gsDPLoadBlock(i, sss, ttt, xxx, ddd)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -277,7 +263,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t vvvv = (data & 0xFFFF00000000) >> 32;
 			int32_t wwww = (data & 0x0000FFFF);
 
-			Gfx value = gsSPCullDisplayList(vvvv / 2, wwww / 2);
+			Gfx value = {gsSPCullDisplayList(vvvv / 2, wwww / 2)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -293,7 +279,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t z = (data & 0x00000000FFFFFFFF) >> 0;
 				uint32_t h = (data & 0xFFFFFFFF);
 
-				Gfx value = gsSPBranchLessZraw3(h & 0x00FFFFFF);
+				Gfx value = {gsSPBranchLessZraw3(h & 0x00FFFFFF)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 			}
@@ -306,7 +292,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			break;
 		case G_RDPHALF_2:
 		{
-			Gfx value = gsDPWordLo(data & 0xFFFFFFFF);
+			Gfx value = {gsDPWordLo(data & 0xFFFFFFFF)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -319,7 +305,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t XXX = (data & 0x0000000000FFF000) >> 12;
 			int32_t YYY = (data & 0x0000000000000FFF);
 
-			Gfx value = gsSPTextureRectangle2(XXX, YYY, xxx, yyy, i);
+			Gfx value = {gsSPTextureRectangle2(XXX, YYY, xxx, yyy, i)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -338,7 +324,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 			int bp = 0;
 
-			Gfx value = gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z);
+			Gfx value = {gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z)};
 			word0 = (value.words.w0 & 0x00FFFFFF) + (G_BRANCH_Z_OTR << 24);
 			word1 = value.words.w1;
 
@@ -347,7 +333,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 			if (dListDecl != nullptr)
 			{
-				std::string vName = StringHelper::Sprintf("%s\\%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str());
+				std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str());
 
 				uint64_t hash = CRC64(vName.c_str());
 
@@ -370,21 +356,13 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					//std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str());
 					std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str());
 
-					if (!File::Exists("Extract\\" + fName))
+					if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 					{
 						MemoryStream* dlStream = new MemoryStream();
 						BinaryWriter dlWriter = BinaryWriter(dlStream);
 
 						Save(dList->otherDLists[i], outPath, &dlWriter);
-
-#ifdef _DEBUG
-						//if (otrArchive->HasFile(fName))
-							//otrArchive->RemoveFile(fName);
-#endif
-
-						File::WriteAllBytes("Extract\\" + fName, dlStream->ToVector());
-
-						//otrArchive->AddFile(fName, (uintptr_t)dlStream->ToVector().data(), dlWriter.GetBaseAddress());
+						AddFile(fName, dlStream->ToVector());
 					}
 				}
 				else
@@ -401,19 +379,19 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		//case G_BRANCH_Z:
 		case G_DL:
 		{
-			if ((!Globals::Instance->HasSegment(GETSEGNUM(data)) && (int)opF3D != G_BRANCH_Z)
+			if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID) && (int)opF3D != G_BRANCH_Z)
 				|| ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
 			{
 				int32_t pp = (data & 0x00FF000000000000) >> 56;
 
 				Gfx value;
 
-				u32 dListVal = (data & 0x0FFFFFFF) + 0xF0000000;
+				u32 dListVal = (data & 0x0FFFFFFF) + 1;
 
 				if (pp != 0)
-					value = gsSPBranchList(dListVal);
+					value = {gsSPBranchList(dListVal)};
 				else
-					value = gsSPDisplayList(dListVal);
+					value = {gsSPDisplayList(dListVal)};
 
 				word0 = value.words.w0;
 				word1 = value.words.w1;
@@ -441,7 +419,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 				if (dListDecl != nullptr)
 				{
-					std::string vName = StringHelper::Sprintf("%s\\%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str());
+					std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str());
 
 					uint64_t hash = CRC64(vName.c_str());
 
@@ -464,14 +442,14 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 						//std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str());
 						std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str());
 
-						if (!File::Exists("Extract\\" + fName))
+						if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 						{
 							MemoryStream* dlStream = new MemoryStream();
 							BinaryWriter dlWriter = BinaryWriter(dlStream);
 
 							Save(dList->otherDLists[i], outPath, &dlWriter);
 
-							File::WriteAllBytes("Extract\\" + fName, dlStream->ToVector());
+							AddFile(fName, dlStream->ToVector());
 						}
 					}
 					else
@@ -491,7 +469,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t ddd = (____ & 0x700) >> 8;
 			int32_t nnnnnnn = (____ & 0xFE) >> 1;
 
-			Gfx value = gsSPTexture(ssss, tttt, lll, ddd, nnnnnnn);
+			Gfx value = {gsSPTexture(ssss, tttt, lll, ddd, nnnnnnn)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -502,7 +480,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2;
 			int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2;
 
-			Gfx test = gsSP1Triangle(aa, bb, cc, 0);
+			Gfx test = {gsSP1Triangle(aa, bb, cc, 0)};
 			word0 = test.words.w0;
 			word1 = test.words.w1;
 		}
@@ -516,7 +494,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t ee = ((data & 0x0000000000FF00ULL) >> 8) / 2;
 			int32_t ff = ((data & 0x000000000000FFULL) >> 0) / 2;
 
-			Gfx test = gsSP2Triangles(aa, bb, cc, 0, dd, ee, ff, 0);
+			Gfx test = {gsSP2Triangles(aa, bb, cc, 0, dd, ee, ff, 0)};
 			word0 = test.words.w0;
 			word1 = test.words.w1;
 		}
@@ -527,8 +505,8 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2;
 			int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2;
 			int32_t dd = ((data & 0x000000000000FFULL)) / 2;
-			
-			Gfx test = gsSP1Quadrangle(aa, bb, cc, dd, 0);
+
+			Gfx test = {gsSP1Quadrangle(aa, bb, cc, dd, 0)};
 			word0 = test.words.w0;
 			word1 = test.words.w1;
 		}
@@ -542,7 +520,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t bb = (data & 0x000000000000FF00) >> 8;
 			int32_t aa = (data & 0x00000000000000FF) >> 0;
 
-			Gfx value = gsDPSetPrimColor(mm, ff, rr, gg, bb, aa);
+			Gfx value = {gsDPSetPrimColor(mm, ff, rr, gg, bb, aa)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -556,7 +534,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 			// TODO: Output the correct render modes in data
 
-			Gfx value = gsSPSetOtherMode(0xE2, sft, len, dd);
+			Gfx value = {gsSPSetOtherMode(0xE2, sft, len, dd)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -574,11 +552,11 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			if (sft == 14)  // G_MDSFT_TEXTLUT
 			{
 				const char* types[] = { "G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16" };
-				value = gsDPSetTextureLUT(dd >> 14);
+				value = {gsDPSetTextureLUT(dd >> 14)};
 			}
 			else
 			{
-				value = gsSPSetOtherMode(0xE3, sft, nn + 1, dd);
+				value = {gsSPSetOtherMode(0xE3, sft, nn + 1, dd)};
 			}
 
 			word0 = value.words.w0;
@@ -605,7 +583,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4;
 			int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111);
 
-			Gfx value = gsDPSetTile(fff, ii, nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu);
+			Gfx value = {gsDPSetTile(fff, ii, nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -629,7 +607,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3;
 			int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0;
 
-			Gfx value = gsDPSetCombineLERP2(a0, b0, c0, d0, aa0, ab0, ac0, ad0, a1, b1, c1, d1, aa1, ab1, ac1, ad1);
+			Gfx value = {gsDPSetCombineLERP2(a0, b0, c0, d0, aa0, ab0, ac0, ad0, a1, b1, c1, d1, aa1, ab1, ac1, ad1)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -642,7 +620,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t vvv = (data & 0x0000000000000FFF);
 			int32_t i = (data & 0x000000000F000000) >> 24;
 
-			Gfx value = gsDPSetTileSize(i, sss, ttt, uuu, vvv);
+			Gfx value = {gsDPSetTileSize(i, sss, ttt, uuu, vvv)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -652,7 +630,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			int32_t t = (data & 0x0000000007000000) >> 24;
 			int32_t ccc = (data & 0x00000000003FF000) >> 14;
 
-			Gfx value = gsDPLoadTLUTCmd(t, ccc);
+			Gfx value = {gsDPLoadTLUTCmd(t, ccc)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -661,11 +639,11 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		{
 			int sss =	(data & 0x00FFF00000000000) >> 44;
 			int ttt =	(data & 0x00000FFF00000000) >> 32;
-			int i =		(data & 0x000000000F000000) >> 16;
+			int i =		(data & 0x000000000F000000) >> 24;
 			int uuu =	(data & 0x0000000000FFF000) >> 12;
 			int vvv=	(data & 0x0000000000000FFF);
 
-			Gfx value = gsDPLoadTile(i, sss, ttt, uuu, vvv);
+			Gfx value = {gsDPLoadTile(i, sss, ttt, uuu, vvv)};
 			word0 = value.words.w0;
 			word1 = value.words.w1;
 		}
@@ -675,7 +653,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			uint32_t seg = data & 0xFFFFFFFF;
 			int32_t texAddress = Seg2Filespace(data, dList->parent->baseAddress);
 
-			if (!Globals::Instance->HasSegment(GETSEGNUM(seg)))
+			if (!Globals::Instance->HasSegment(GETSEGNUM(seg), res->parent->workerID))
 			{
 				int32_t __ = (data & 0x00FF000000000000) >> 48;
 				int32_t www = (data & 0x00000FFF00000000) >> 32;
@@ -683,7 +661,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;
 
-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, (seg & 0x0FFFFFFF) + 0xF0000000);
+				Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 
@@ -693,7 +671,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			else
 			{
 				std::string texName = "";
-				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName);
+				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName, res->parent->workerID);
 
 				int32_t __ = (data & 0x00FF000000000000) >> 48;
 				int32_t www = (data & 0x00000FFF00000000) >> 32;
@@ -701,7 +679,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;
 
-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, __);
+				Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, __)};
 				word0 = value.words.w0 & 0x00FFFFFF;
 				word0 += (G_SETTIMG_OTR << 24);
 				//word1 = value.words.w1;
@@ -712,10 +690,10 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 				if (foundDecl)
 				{
-					ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg));
+					ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg), res->parent->workerID);
 					std::string assocFileName = assocFile->GetName();
 					std::string fName = "";
-					
+
 					if (GETSEGNUM(seg) == SEGMENT_SCENE || GETSEGNUM(seg) == SEGMENT_ROOM)
 						fName = GetPathToRes(res, texName.c_str());
 					else
@@ -744,48 +722,13 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				int32_t aa = (data & 0x000000FF00000000ULL) >> 32;
 				int32_t nn = (data & 0x000FF00000000000ULL) >> 44;
 
-				Gfx value = gsSPVertex(data & 0xFFFFFFFF, nn, ((aa >> 1) - nn));
+				Gfx value = {gsSPVertex(data & 0xFFFFFFFF, nn, ((aa >> 1) - nn))};
 
 				word0 = value.words.w0;
-				word1 = value.words.w1 | 0xF0000000;
+				word1 = value.words.w1 | 1;
 			}
 			else
-			//if (dList->vertices.size() > 0)
 			{
-				// Connect neighboring vertex arrays
-				std::vector<std::pair<uint32_t, std::vector<ZVtx>>> vertsKeys(dList->vertices.begin(),
-					dList->vertices.end());
-
-				if (vertsKeys.size() > 0)
-				{
-					auto lastItem = vertsKeys[0];
-
-					for (size_t i = 1; i < vertsKeys.size(); i++)
-					{
-						auto curItem = vertsKeys[i];
-
-						int32_t sizeDiff = curItem.first - (lastItem.first + (lastItem.second.size() * 16));
-
-						// Make sure there isn't an unaccounted inbetween these two
-						if (sizeDiff == 0)
-						{
-							for (auto v : curItem.second)
-							{
-								dList->vertices[lastItem.first].push_back(v);
-								lastItem.second.push_back(v);
-							}
-
-							dList->vertices.erase(curItem.first);
-							vertsKeys.erase(vertsKeys.begin() + i);
-
-							i--;
-							continue;
-						}
-
-						lastItem = curItem;
-					}
-				}
-
 				// Write CRC64 of vtx file name
 				uint32_t addr = data & 0xFFFFFFFF;
 
@@ -793,10 +736,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					addr -= dList->parent->baseAddress;
 
 				auto segOffset = GETSEGOFFSET(addr);
-				//uint32_t seg = data & 0xFFFFFFFF;
 				Declaration* vtxDecl = dList->parent->GetDeclarationRanged(segOffset);
-				//std::string vtxName = "";
-				//bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", vtxName);
 
 				int32_t aa = (data & 0x000000FF00000000ULL) >> 32;
 				int32_t nn = (data & 0x000FF00000000000ULL) >> 44;
@@ -805,7 +745,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				{
 					uint32_t diff = segOffset - vtxDecl->address;
 
-					Gfx value = gsSPVertex(diff, nn, ((aa >> 1) - nn));
+					Gfx value = {gsSPVertex(diff, nn, ((aa >> 1) - nn))};
 
 					word0 = value.words.w0;
 					word0 &= 0x00FFFFFF;
@@ -822,9 +762,8 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					word0 = hash >> 32;
 					word1 = hash & 0xFFFFFFFF;
 
-					if (!File::Exists("Extract\\" + fName))
+					if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 					{
-						//printf("Exporting VTX Data %s\n", fName.c_str());
 						// Write vertices to file
 						MemoryStream* vtxStream = new MemoryStream();
 						BinaryWriter vtxWriter = BinaryWriter(vtxStream);
@@ -833,7 +772,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 						auto split = StringHelper::Split(vtxDecl->text, "\n");
 
-						for (int i = 0; i < split.size(); i++)
+						for (size_t i = 0; i < split.size(); i++)
 						{
 							std::string line = split[i];
 
@@ -847,44 +786,37 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 						vtxWriter.Write((uint32_t)ZResourceType::Vertex);
 						vtxWriter.Write((uint32_t)arrCnt);
 
-						size_t sz = dList->vertices[vtxDecl->address].size();
+						auto start = std::chrono::steady_clock::now();
 
-						//if (sz > 0)
+						// God dammit this is so dumb
+						for (size_t i = 0; i < split.size(); i++)
 						{
-							auto start = std::chrono::steady_clock::now();
+							std::string line = split[i];
 
-							// God dammit this is so dumb
-							for (size_t i = 0; i < split.size(); i++)
+							if (StringHelper::Contains(line, "VTX("))
 							{
-								std::string line = split[i];
+								auto split2 = StringHelper::Split(StringHelper::Split(StringHelper::Split(line, "VTX(")[1], ")")[0], ",");
 
-								if (StringHelper::Contains(line, "VTX("))
-								{
-									auto split2 = StringHelper::Split(StringHelper::Split(StringHelper::Split(line, "VTX(")[1], ")")[0], ",");
+								vtxWriter.Write((int16_t)std::stoi(split2[0], nullptr, 10)); // v.x
+								vtxWriter.Write((int16_t)std::stoi(split2[1], nullptr, 10)); // v.y
+								vtxWriter.Write((int16_t)std::stoi(split2[2], nullptr, 10)); // v.z
 
-									vtxWriter.Write((int16_t)std::stoi(split2[0], nullptr, 10)); // v.x
-									vtxWriter.Write((int16_t)std::stoi(split2[1], nullptr, 10)); // v.y
-									vtxWriter.Write((int16_t)std::stoi(split2[2], nullptr, 10)); // v.z
+								vtxWriter.Write((int16_t)0);								 // v.flag
 
-									vtxWriter.Write((int16_t)0);								 // v.flag
-									
-									vtxWriter.Write((int16_t)std::stoi(split2[3], nullptr, 10)); // v.s
-									vtxWriter.Write((int16_t)std::stoi(split2[4], nullptr, 10)); // v.t
-									
-									vtxWriter.Write((uint8_t)std::stoi(split2[5], nullptr, 10)); // v.r
-									vtxWriter.Write((uint8_t)std::stoi(split2[6], nullptr, 10)); // v.g
-									vtxWriter.Write((uint8_t)std::stoi(split2[7], nullptr, 10)); // v.b
-									vtxWriter.Write((uint8_t)std::stoi(split2[8], nullptr, 10)); // v.a
-								}
+								vtxWriter.Write((int16_t)std::stoi(split2[3], nullptr, 10)); // v.s
+								vtxWriter.Write((int16_t)std::stoi(split2[4], nullptr, 10)); // v.t
+
+								vtxWriter.Write((uint8_t)std::stoi(split2[5], nullptr, 10)); // v.r
+								vtxWriter.Write((uint8_t)std::stoi(split2[6], nullptr, 10)); // v.g
+								vtxWriter.Write((uint8_t)std::stoi(split2[7], nullptr, 10)); // v.b
+								vtxWriter.Write((uint8_t)std::stoi(split2[8], nullptr, 10)); // v.a
 							}
-
-							File::WriteAllBytes("Extract\\" + fName, vtxStream->ToVector());
-
-							auto end = std::chrono::steady_clock::now();
-							size_t diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
-
-							//printf("Exported VTX Array %s in %zums\n", fName.c_str(), diff);
 						}
+
+						AddFile(fName, vtxStream->ToVector());
+
+						auto end = std::chrono::steady_clock::now();
+						size_t diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
 					}
 				}
 				else
@@ -892,19 +824,10 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					spdlog::error("vtxDecl == nullptr!");
 				}
 			}
-			/*else
-			{
-				writer->Write(word0);
-				writer->Write(word1);
-				word0 = 0;
-				word1 = 0;
-
-				spdlog::error("dList->vertices.size() <= 0!");
-			}*/
 		}
 		break;
 		}
-	
+
 		writer->Write(word0);
 		writer->Write(word1);
 	}
@@ -918,7 +841,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 std::string OTRExporter_DisplayList::GetPathToRes(ZResource* res, std::string varName)
 {
 	std::string prefix = GetPrefix(res);
-	std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), varName.c_str());
+	std::string fName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), varName.c_str());
 
 	return fName;
 }
@@ -932,7 +855,7 @@ std::string OTRExporter_DisplayList::GetParentFolderName(ZResource* res)
 	{
 		auto split = StringHelper::Split(oName, "_");
 		oName = "";
-		for (int i = 0; i < split.size() - 1; i++)
+		for (size_t i = 0; i < split.size() - 1; i++)
 			oName += split[i] + "_";
 
 		oName += "scene";
@@ -943,7 +866,7 @@ std::string OTRExporter_DisplayList::GetParentFolderName(ZResource* res)
 	}
 
 	if (prefix != "")
-		oName = prefix + "\\" + oName;
+		oName = prefix + "/" + oName;
 
 	return oName;
 }
@@ -970,4 +893,4 @@ std::string OTRExporter_DisplayList::GetPrefix(ZResource* res)
 		prefix = "code";
 
 	return prefix;
-}
+}

OTRExporter/OTRExporter/Exporter.cpp

@@ -1,7 +1,7 @@
 #include "Exporter.h"
 #include "VersionInfo.h"
 
-void OTRExporter::WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, Ship::ResourceType resType)
+void OTRExporter::WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, Ship::ResourceType resType, Ship::Version resVersion)
 {
 	writer->Write((uint8_t)Endianess::Little); // 0x00
 	writer->Write((uint8_t)0); // 0x01
@@ -9,7 +9,8 @@ void OTRExporter::WriteHeader(ZResource* res, const fs::path& outPath, BinaryWri
 	writer->Write((uint8_t)0); // 0x03
 
 	writer->Write((uint32_t)resType); // 0x04
-	writer->Write((uint32_t)MAJOR_VERSION); // 0x08
+	//writer->Write((uint32_t)MAJOR_VERSION); // 0x08
+	writer->Write((uint32_t)resVersion); // 0x08
 	writer->Write((uint64_t)0xDEADBEEFDEADBEEF); // id, 0x0C
 	writer->Write((uint32_t)resourceVersions[resType]); // 0x10
 	writer->Write((uint64_t)0); // ROM CRC, 0x14

OTRExporter/OTRExporter/Exporter.h

@@ -4,9 +4,10 @@
 //#include "OTRExporter.h"
 #include <Utils/BinaryWriter.h>
 #include <Resource.h>
+#include "VersionInfo.h"
 
 class OTRExporter : public ZResourceExporter
 {
 protected:
-	static void WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, Ship::ResourceType resType);
+	static void WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, Ship::ResourceType resType, Ship::Version resVersion = MAJOR_VERSION);
 };

OTRExporter/OTRExporter/Main.cpp

@@ -15,6 +15,7 @@
 #include "TextExporter.h"
 #include "BlobExporter.h"
 #include "MtxExporter.h"
+#include "AudioExporter.h"
 #include <Globals.h>
 #include <Utils/File.h>
 #include <Utils/Directory.h>
@@ -25,6 +26,8 @@ std::string otrFileName = "oot.otr";
 std::shared_ptr<Ship::Archive> otrArchive;
 BinaryWriter* fileWriter;
 std::chrono::steady_clock::time_point fileStart, resStart;
+std::map<std::string, std::vector<char>> files;
+std::mutex fileMutex;
 
 void InitVersionInfo();
 
@@ -39,21 +42,52 @@ static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileM
 	{
 		fileMode = (ZFileMode)ExporterFileMode::BuildOTR;
 
+		printf("BOTR: Generating OTR Archive...\n");
+
 		if (File::Exists(otrFileName))
 			otrArchive = std::shared_ptr<Ship::Archive>(new Ship::Archive(otrFileName, true));
 		else
-			otrArchive = Ship::Archive::CreateArchive(otrFileName, 65536 / 2);
+			otrArchive = Ship::Archive::CreateArchive(otrFileName, 40000);
 
 		auto lst = Directory::ListFiles("Extract");
 
 		for (auto item : lst)
 		{
 			auto fileData = File::ReadAllBytes(item);
-			otrArchive->AddFile(StringHelper::Split(item, "Extract\\")[1], (uintptr_t)fileData.data(), fileData.size());
+			otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size());
 		}
 	}
 }
 
+static void ExporterProgramEnd()
+{
+	if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+	{
+		printf("Generating OTR Archive...\n");
+		otrArchive = Ship::Archive::CreateArchive(otrFileName, 40000);
+
+		for (auto item : files)
+		{
+			auto fileData = item.second;
+			otrArchive->AddFile(item.first, (uintptr_t)fileData.data(), fileData.size());
+		}
+
+		// Add any additional files that need to be manually copied...
+		auto lst = Directory::ListFiles("Extract");
+
+		for (auto item : lst)
+		{
+			auto fileData = File::ReadAllBytes(item);
+			otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size());
+		}
+
+		//otrArchive->AddFile("Audiobank", (uintptr_t)Globals::Instance->GetBaseromFile("Audiobank").data(), Globals::Instance->GetBaseromFile("Audiobank").size());
+		//otrArchive->AddFile("Audioseq", (uintptr_t)Globals::Instance->GetBaseromFile("Audioseq").data(), Globals::Instance->GetBaseromFile("Audioseq").size());
+		//otrArchive->AddFile("Audiotable", (uintptr_t)Globals::Instance->GetBaseromFile("Audiotable").data(), Globals::Instance->GetBaseromFile("Audiotable").size());
+	}
+}
+
+
 static void ExporterParseArgs(int argc, char* argv[], int& i)
 {
 	std::string arg = argv[i];
@@ -85,6 +119,7 @@ static void ExporterFileBegin(ZFile* file)
 
 static void ExporterFileEnd(ZFile* file)
 {
+	// delete fileWriter;
 }
 
 static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
@@ -107,7 +142,7 @@ static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
 		{
 			auto split = StringHelper::Split(oName, "_");
 			oName = "";
-			for (int i = 0; i < split.size() - 1; i++)
+			for (size_t i = 0; i < split.size() - 1; i++)
 				oName += split[i] + "_";
 
 			oName += "scene";
@@ -120,11 +155,17 @@ static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
 		std::string fName = "";
 
 		if (prefix != "")
-			fName = StringHelper::Sprintf("%s\\%s\\%s", prefix.c_str(), oName.c_str(), rName.c_str());
+			fName = StringHelper::Sprintf("%s/%s/%s", prefix.c_str(), oName.c_str(), rName.c_str());
 		else
-			fName = StringHelper::Sprintf("%s\\%s", oName.c_str(), rName.c_str());
+			fName = StringHelper::Sprintf("%s/%s", oName.c_str(), rName.c_str());
 
-		File::WriteAllBytes("Extract\\" + fName, strem->ToVector());
+		if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+		{
+			std::unique_lock Lock(fileMutex);
+			files[fName] = strem->ToVector();
+		}
+		else
+			File::WriteAllBytes("Extract/" + fName, strem->ToVector());
 	}
 
 	auto end = std::chrono::steady_clock::now();
@@ -142,6 +183,17 @@ static void ExporterXMLEnd()
 {
 }
 
+void AddFile(std::string fName, std::vector<char> data)
+{
+	if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
+		File::WriteAllBytes("Extract/" + fName, data);
+	else
+	{
+		std::unique_lock Lock(fileMutex);
+		files[fName] = data;
+	}
+}
+
 static void ImportExporters()
 {
 	// In this example we set up a new exporter called "EXAMPLE".
@@ -155,6 +207,8 @@ static void ImportExporters()
 	exporterSet->beginXMLFunc = ExporterXMLBegin;
 	exporterSet->endXMLFunc = ExporterXMLEnd;
 	exporterSet->resSaveFunc = ExporterResourceEnd;
+	exporterSet->endProgramFunc = ExporterProgramEnd;
+
 	exporterSet->exporters[ZResourceType::Background] = new OTRExporter_Background();
 	exporterSet->exporters[ZResourceType::Texture] = new OTRExporter_Texture();
 	exporterSet->exporters[ZResourceType::Room] = new OTRExporter_Room();
@@ -173,6 +227,7 @@ static void ImportExporters()
 	exporterSet->exporters[ZResourceType::Text] = new OTRExporter_Text();
 	exporterSet->exporters[ZResourceType::Blob] = new OTRExporter_Blob();
 	exporterSet->exporters[ZResourceType::Mtx] = new OTRExporter_MtxExporter();
+	exporterSet->exporters[ZResourceType::Audio] = new OTRExporter_Audio();
 
 	Globals::AddExporter("OTR", exporterSet);
 

OTRExporter/OTRExporter/Main.h

@@ -2,4 +2,7 @@
 
 #include <Archive.h>
 
-extern std::shared_ptr<Ship::Archive> otrArchive;
+extern std::shared_ptr<Ship::Archive> otrArchive;
+extern std::map<std::string, std::vector<char>> files;
+
+void AddFile(std::string fName, std::vector<char> data);

OTRExporter/OTRExporter/Makefile

@@ -1,6 +1,6 @@
 # Only used for standalone compilation, usually inherits these from the main makefile
 
-CXX := g++
+CXX ?= g++
 AR	:= ar
 FORMAT := clang-format-11
 
@@ -12,7 +12,8 @@ LTO ?= 0
 WARN := -Wall -Wextra -Werror \
 	-Wno-unused-parameter \
 	-Wno-unused-function \
-	-Wno-unused-variable
+	-Wno-unused-variable \
+	-Wno-error=multichar
 
 
 CXXFLAGS := $(WARN) -std=c++17 
@@ -30,7 +31,7 @@ ifneq ($(LTO),0)
 	CXXFLAGS += -flto
 endif
 
-SRC_DIRS  := $(shell find -type d -not -path "*build*")
+SRC_DIRS  := $(shell find . -type d -not -path "*build*")
 CXX_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp))
 H_FILES   := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h))
 
@@ -39,13 +40,14 @@ D_FILES   := $(O_FILES:%.o=%.d)
 LIB       := OTRExporter.a
 
 INC_DIRS := $(addprefix -I, \
-	../../ZAPD/ZAPD \
-	../../ZAPD/lib/tinyxml2 \
-	../../ZAPD/lib/libgfxd \
-	../../ZAPD/ZAPDUtils \
-	../../OtrLib/otrlib \
-	../../OtrLib/otrlib/Lib/spdlog/include \
-	../../OtrLib/otrlib/Lib/Fast3D/U64 \
+	../../ZAPDTR/ZAPD \
+	../../ZAPDTR/lib/tinyxml2 \
+	../../ZAPDTR/lib/libgfxd \
+	../../ZAPDTR/ZAPDUtils \
+	../../libultraship/libultraship \
+	../../libultraship/libultraship/Lib/spdlog/include \
+	../../libultraship/libultraship/Lib/Fast3D/U64 \
+	../../StormLib/src \
 )
 
 # create build directories
@@ -67,4 +69,4 @@ build/%.o: %.cpp
 $(LIB): $(O_FILES)
 	$(AR) rcs $@ $^
 
--include $(D_FILES)
+-include $(D_FILES)

OTRExporter/OTRExporter/OTRExporter.vcxproj

@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ArrayExporter.h" />
+    <ClInclude Include="AudioExporter.h" />
     <ClInclude Include="BackgroundExporter.h" />
     <ClInclude Include="BlobExporter.h" />
     <ClInclude Include="CollisionExporter.h" />
@@ -44,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ArrayExporter.cpp" />
+    <ClCompile Include="AudioExporter.cpp" />
     <ClCompile Include="BackgroundExporter.cpp" />
     <ClCompile Include="BlobExporter.cpp" />
     <ClCompile Include="CollisionExporter.cpp" />
@@ -63,6 +65,12 @@
     <ClCompile Include="VersionInfo.cpp" />
     <ClCompile Include="VtxExporter.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
+      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -118,19 +126,31 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)otrlib;$(SolutionDir)\ZAPD\ZAPD\;$(SolutionDir)\ZAPD\lib\tinyxml2;$(SolutionDir)\ZAPD\lib\libgfxd;$(SolutionDir)\ZAPD\lib\elfio;$(SolutionDir)\ZAPD\lib\assimp\include;$(SolutionDir)\ZAPD\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
     <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
     <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

OTRExporter/OTRExporter/OTRExporter.vcxproj.filters

@@ -81,6 +81,9 @@
     <ClInclude Include="VersionInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="AudioExporter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CollisionExporter.cpp">
@@ -140,5 +143,8 @@
     <ClCompile Include="VersionInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="AudioExporter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

OTRExporter/OTRExporter/PathExporter.cpp

@@ -9,11 +9,11 @@ void OTRExporter_Path::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 	
 	writer->Write((uint32_t)path->pathways.size());
 
-	for (int k = 0; k < path->pathways.size(); k++)
+	for (size_t k = 0; k < path->pathways.size(); k++)
 	{
 		writer->Write((uint32_t)path->pathways[k].points.size());
 
-		for (int i = 0; i < path->pathways[k].points.size(); i++)
+		for (size_t i = 0; i < path->pathways[k].points.size(); i++)
 		{
 			writer->Write(path->pathways[k].points[i].scalars[0].scalarData.s16);
 			writer->Write(path->pathways[k].points[i].scalars[1].scalarData.s16);

OTRExporter/OTRExporter/RoomExporter.cpp

@@ -46,7 +46,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 	for (size_t i = 0; i < room->commands.size(); i++)
 	{
 		ZRoomCommand* cmd = room->commands[i];
-				
+
 		writer->Write((uint32_t)cmd->cmdID);
 
 		switch (cmd->cmdID)
@@ -172,7 +172,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 
 			writer->Write((uint32_t)cmdCsCam->points.size());
 
-			for (int i = 0; i < cmdCsCam->points.size(); i++)
+			for (size_t i = 0; i < cmdCsCam->points.size(); i++)
 			{
 				writer->Write(cmdCsCam->points[i].scalars[0].scalarData.s16);
 				writer->Write(cmdCsCam->points[i].scalars[1].scalarData.s16);
@@ -183,7 +183,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 		case RoomCommand::SetMesh:
 		{
 			SetMesh* cmdMesh = (SetMesh*)cmd;
-			
+
 			writer->Write((uint8_t)cmdMesh->data); // 0x01
 			writer->Write(cmdMesh->meshHeaderType);
 
@@ -207,12 +207,12 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 				Declaration* dListDeclXlu = poly->parent->GetDeclaration(GETSEGOFFSET(test->xlu));
 
 				if (test->opa != 0)
-					writer->Write(StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str()));
+					writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str()));
 				else
 					writer->Write("");
-				
+
 				if (test->xlu != 0)
-					writer->Write(StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclXlu->varName.c_str()));
+					writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclXlu->varName.c_str()));
 				else
 					writer->Write("");
 
@@ -228,7 +228,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 						Declaration* bgDecl = poly->parent->GetDeclarationRanged(GETSEGOFFSET(poly->multiList[i].source));
 
 						writer->Write(OTRExporter_DisplayList::GetPathToRes(poly->multiList[i].sourceBackground, bgDecl->varName));
-						
+
 						writer->Write(poly->multiList[i].unk_0C);
 						writer->Write(poly->multiList[i].tlut);
 						writer->Write(poly->multiList[i].width);
@@ -338,7 +338,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 
 			for (size_t i = 0;i < cmdRoom->romfile->numRooms; i++)
 			{
-				//std::string roomName = StringHelper::Sprintf("%s\\%s_room_%i", (StringHelper::Split(room->GetName(), "_")[0] + "_scene").c_str(), StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i);
+				//std::string roomName = StringHelper::Sprintf("%s/%s_room_%i", (StringHelper::Split(room->GetName(), "_")[0] + "_scene").c_str(), StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i);
 				std::string roomName = OTRExporter_DisplayList::GetPathToRes(room, StringHelper::Sprintf("%s_room_%i", StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i));
 				writer->Write(roomName);
 				writer->Write(cmdRoom->romfile->rooms[i].virtualAddressStart);
@@ -383,7 +383,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			uint32_t baseStreamEnd = writer->GetStream().get()->GetLength();
 
 			writer->Write((uint32_t)cmdStartPos->actors.size()); // 0x01
-			
+
 			for (const ActorSpawnEntry& entry : cmdStartPos->actors)
 			{
 				writer->Write(entry.actorNum);
@@ -407,7 +407,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			{
 				uint32_t seg = cmdHeaders->headers[i] & 0xFFFFFFFF;
 				std::string headerName = "";
-				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName);
+				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName, res->parent->workerID);
 				if (headerName == "NULL")
 					writer->Write("");
 				else
@@ -441,9 +441,9 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 		case RoomCommand::SetCutscenes:
 		{
 			SetCutscenes* cmdSetCutscenes = (SetCutscenes*)cmd;
-			
+
 			std::string listName;
-			Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName);
+			Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName, res->parent->workerID);
 			std::string fName = OTRExporter_DisplayList::GetPathToRes(room, listName);
 			//std::string fName = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), listName.c_str());
 			writer->Write(fName);
@@ -453,10 +453,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			OTRExporter_Cutscene cs;
 			cs.Save(cmdSetCutscenes->cutscenes[0], "", &csWriter);
 
-			File::WriteAllBytes("Extract\\" + fName, csStream->ToVector());
-
-			//std::string fName = OTRExporter_DisplayList::GetPathToRes(res, vtxDecl->varName);
-			//otrArchive->AddFile(fName, (uintptr_t)csStream->ToVector().data(), csWriter.GetBaseAddress());
+			AddFile(fName, csStream->ToVector());
 		}
 			break;
 		case RoomCommand::SetPathways:
@@ -465,7 +462,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 
 			writer->Write((uint32_t)cmdSetPathways->pathwayList.pathways.size());
 
-			for (int i = 0; i < cmdSetPathways->pathwayList.pathways.size(); i++)
+			for (size_t i = 0; i < cmdSetPathways->pathwayList.pathways.size(); i++)
 			{
 				Declaration* decl = room->parent->GetDeclaration(GETSEGOFFSET(cmdSetPathways->pathwayList.pathways[i].listSegmentAddress));
 				//std::string path = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), decl->varName.c_str());
@@ -477,11 +474,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 				OTRExporter_Path pathExp;
 				pathExp.Save(&cmdSetPathways->pathwayList, outPath, &pathWriter);
 
-				File::WriteAllBytes("Extract\\" + path, pathStream->ToVector());
-
-				//otrArchive->AddFile(path, (uintptr_t)pathStream->ToVector().data(), pathWriter.GetBaseAddress());
-
-				int bp = 0;
+				AddFile(path, pathStream->ToVector());
 			}
 		}
 			break;
@@ -508,12 +501,12 @@ void OTRExporter_Room::WritePolyDList(BinaryWriter* writer, ZRoom* room, Polygon
 		writer->Write(dlist->unk_06);
 		[[fallthrough]];
 	default:
-		//writer->Write(StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str()));
+		//writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str()));
 
 		if (dlist->opaDList != nullptr)
 		{
 			auto opaDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->opaDList->GetRawDataIndex()));
-			writer->Write(StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), opaDecl->varName.c_str()));
+			writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), opaDecl->varName.c_str()));
 		}
 		else
 			writer->Write("");
@@ -521,7 +514,7 @@ void OTRExporter_Room::WritePolyDList(BinaryWriter* writer, ZRoom* room, Polygon
 		if (dlist->xluDList != nullptr)
 		{
 			auto xluDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->xluDList->GetRawDataIndex()));
-			writer->Write(StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), xluDecl->varName.c_str()));
+			writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), xluDecl->varName.c_str()));
 		}
 		else
 			writer->Write("");

OTRExporter/OTRExporter/SkeletonExporter.cpp

@@ -23,7 +23,7 @@ void OTRExporter_Skeleton::Save(ZResource* res, const fs::path& outPath, BinaryW
 		Declaration* skelDecl = skel->parent->GetDeclarationRanged(GETSEGOFFSET(skel->limbsTable.limbsAddresses[i]));
 
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable.limbsAddresses[i], skel->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable.limbsAddresses[i], skel->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')

OTRExporter/OTRExporter/SkeletonLimbExporter.cpp

@@ -86,7 +86,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->childPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@@ -107,7 +107,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->siblingPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@@ -128,7 +128,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->dListPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@@ -149,7 +149,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->dList2Ptr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')

OTRExporter/OTRExporter/TextExporter.cpp

@@ -8,8 +8,8 @@ void OTRExporter_Text::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 	WriteHeader(txt, outPath, writer, Ship::ResourceType::Text);
 
 	writer->Write((uint32_t)txt->messages.size());
-	
-	for (int i = 0; i < txt->messages.size(); i++)
+
+	for (size_t i = 0; i < txt->messages.size(); i++)
 	{
 		writer->Write(txt->messages[i].id);
 		writer->Write(txt->messages[i].textboxType);

OTRExporter/OTRExporter/VersionInfo.cpp

@@ -5,21 +5,23 @@ std::map<Ship::ResourceType, uint32_t> resourceVersions;
 
 void InitVersionInfo()
 {
-	resourceVersions[Ship::ResourceType::Animation] = 0;
-	resourceVersions[Ship::ResourceType::Model] = 0;
-	resourceVersions[Ship::ResourceType::Texture] = 0;
-	resourceVersions[Ship::ResourceType::Material] = 0;
-	resourceVersions[Ship::ResourceType::PlayerAnimation] = 0;
-	resourceVersions[Ship::ResourceType::DisplayList] = 0;
-	resourceVersions[Ship::ResourceType::Room] = 0;
-	resourceVersions[Ship::ResourceType::CollisionHeader] = 0;
-	resourceVersions[Ship::ResourceType::Skeleton] = 0;
-	resourceVersions[Ship::ResourceType::SkeletonLimb] = 0;
-	resourceVersions[Ship::ResourceType::Matrix] = 0;
-	resourceVersions[Ship::ResourceType::Path] = 0;
-	resourceVersions[Ship::ResourceType::Vertex] = 0;
-	resourceVersions[Ship::ResourceType::Cutscene] = 0;
-	resourceVersions[Ship::ResourceType::Array] = 0;
-	resourceVersions[Ship::ResourceType::Text] = 0;
-	resourceVersions[Ship::ResourceType::Blob] = 0;
-}
+	resourceVersions = std::map<Ship::ResourceType, uint32_t> {
+	{ Ship::ResourceType::Animation, 0 },
+	{ Ship::ResourceType::Model, 0 },
+	{ Ship::ResourceType::Texture, 0 },
+	{ Ship::ResourceType::Material, 0 },
+	{ Ship::ResourceType::PlayerAnimation, 0 },
+	{ Ship::ResourceType::DisplayList, 0 },
+	{ Ship::ResourceType::Room, 0 },
+	{ Ship::ResourceType::CollisionHeader, 0 },
+	{ Ship::ResourceType::Skeleton, 0 },
+	{ Ship::ResourceType::SkeletonLimb, 0 },
+	{ Ship::ResourceType::Matrix, 0 },
+	{ Ship::ResourceType::Path, 0 },
+	{ Ship::ResourceType::Vertex, 0 },
+	{ Ship::ResourceType::Cutscene, 0 },
+	{ Ship::ResourceType::Array, 0 },
+	{ Ship::ResourceType::Text, 0 },
+	{ Ship::ResourceType::Blob, 0 },
+	};
+}

OTRExporter/extract_assets.py

@@ -1,24 +1,20 @@
 #!/usr/bin/env python3
 
-import argparse, json, os, signal, time, sys, shutil
-from multiprocessing import Pool, cpu_count, Event, Manager, ProcessError
+import os, sys, shutil
 import shutil
+from rom_info import Z64Rom
+import rom_chooser
+import struct
 
-def SignalHandler(sig, frame):
-    print(f'Signal {sig} received. Aborting...')
-    mainAbort.set()
-    # Don't exit immediately to update the extracted assets file.
-
-def BuildOTR():
-    shutil.copyfile("baserom/Audiobank", "Extract/Audiobank")
-    shutil.copyfile("baserom/Audioseq", "Extract/Audioseq")
-    shutil.copyfile("baserom/Audiotable", "Extract/Audiotable")
-
+def BuildOTR(xmlPath, rom):
     shutil.copytree("assets", "Extract/assets")
 
-    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out"
+    checksum = int(Z64Rom(rom).checksum.value, 16)
+    with open("Extract/version", "wb") as f:
+        f.write(struct.pack('<L', checksum))
 
-    execStr += " botr -se OTR"
+    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
+    execStr += " ed -i %s -b %s -fl CFG/filelists -o placeholder -osf placeholder -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, rom)
 
     print(execStr)
     exitValue = os.system(execStr)
@@ -28,90 +24,14 @@ def BuildOTR():
         print("Aborting...", file=os.sys.stderr)
         print("\n")
 
-def ExtractFile(xmlPath, outputPath, outputSourcePath):
-    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out"
-    execStr += " e -eh -i %s -b baserom/ -o %s -osf %s -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, outputPath, outputSourcePath)
-
-    if "overlays" in xmlPath:
-        execStr += " --static"
-
-    print(execStr)
-    exitValue = os.system(execStr)
-    #exitValue = 0
-    if exitValue != 0:
-        print("\n")
-        print("Error when extracting from file " + xmlPath, file=os.sys.stderr)
-        print("Aborting...", file=os.sys.stderr)
-        print("\n")
-
-def ExtractFunc(fullPath):
-    *pathList, xmlName = fullPath.split(os.sep)
-    objectName = os.path.splitext(xmlName)[0]
-
-    outPath = os.path.join("..\\soh\\assets\\", *pathList[4:], objectName)
-    os.makedirs(outPath, exist_ok=True)
-    outSourcePath = outPath
-
-    ExtractFile(fullPath, outPath, outSourcePath)
-
-def initializeWorker(abort, test):
-    global globalAbort
-    globalAbort = abort
-
-
 def main():
-    parser = argparse.ArgumentParser(description="baserom asset extractor")
-    parser.add_argument("-s", "--single", help="asset path relative to assets/, e.g. objects/gameplay_keep")
-    parser.add_argument("-f", "--force", help="Force the extraction of every xml instead of checking the touched ones.", action="store_true")
-    parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true")
-    args = parser.parse_args()
+    rom_path = rom_chooser.chooseROM()
+    rom = Z64Rom(rom_path)
 
-    global mainAbort
-    mainAbort = Event()
-    manager = Manager()
-    signal.signal(signal.SIGINT, SignalHandler)
-
-    extractedAssetsTracker = manager.dict()
-
-    asset_path = args.single
-    if asset_path is not None:
-        fullPath = os.path.join("..\\soh\\assets", "xml", asset_path + ".xml")
-        if not os.path.exists(fullPath):
-            print(f"Error. File {fullPath} doesn't exists.", file=os.sys.stderr)
-            exit(1)
-
-        ExtractFunc(fullPath)
-    else:
-        extract_text_path = "assets/text/message_data.h"
-        if os.path.isfile(extract_text_path):
-            extract_text_path = None
-        extract_staff_text_path = "assets/text/message_data_staff.h"
-        if os.path.isfile(extract_staff_text_path):
-            extract_staff_text_path = None
-
-        xmlFiles = []
-        for currentPath, _, files in os.walk(os.path.join("..\\soh\\assets", "xml")):
-            for file in files:
-                fullPath = os.path.join(currentPath, file)
-                if file.endswith(".xml"):
-                    xmlFiles.append(fullPath)
-
-        try:
-            numCores = 2
-            print("Extracting assets with " + str(numCores) + " CPU cores.")
-            with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, 0)) as p:
-                p.map(ExtractFunc, xmlFiles)
-        except Exception as e:
-            print("Warning: Multiprocessing exception ocurred.", file=os.sys.stderr)
-            print("Disabling mutliprocessing.", file=os.sys.stderr)
-
-            initializeWorker(mainAbort, 0)
-            for singlePath in xmlFiles:
-                ExtractFunc(singlePath)
-
-
-        BuildOTR()
+    if (os.path.exists("Extract")):
         shutil.rmtree("Extract")
 
+    BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom_path)
+
 if __name__ == "__main__":
-    main()
+    main()

OTRExporter/extract_baserom.py

@@ -0,0 +1,53 @@
+#!/usr/bin/python3
+
+import os
+import sys
+import struct
+from multiprocessing import Pool, cpu_count
+from rom_info import Z64Rom
+import rom_chooser
+
+
+rom = None
+
+def initialize_worker(input_rom):
+    global rom
+    rom = input_rom
+
+def ExtractFunc(i):
+
+    dma_file = rom.getDmaEntryByIndex(i)
+    dma_data = rom.readDmaEntry(dma_file)
+
+    filename = '../soh/baserom/' + rom.version.file_table[i]
+    print('extracting ' + filename + " (0x%08X, 0x%08X)" % (dma_file.virtStart, dma_file.virtEnd))
+
+    try:
+        with open(filename, 'wb') as f:
+            f.write(dma_data)
+    except IOError:
+        print('failed to write file ' + filename)
+
+    # TODO: handle this better
+    if dma_file.compressed:
+        os.system('tools/yaz0 -d ' + filename + ' ' + filename)
+
+#####################################################################
+
+def main():
+    try:
+        os.mkdir('../soh/baserom')
+    except:
+        pass
+
+    rom_path = rom_chooser.chooseROM()
+    input_rom = Z64Rom(rom_path)
+
+    # extract files
+    num_cores = cpu_count()
+    print("Extracting baserom with " + str(num_cores) + " CPU cores.")
+    with Pool(num_cores, initialize_worker, (input_rom,)) as p:
+        p.map(ExtractFunc, range(len(input_rom.version.file_table)))
+
+if __name__ == "__main__":
+    main()

OTRExporter/rom_chooser.py

@@ -0,0 +1,37 @@
+import os, sys, glob
+
+from rom_info import Z64Rom
+
+def chooseROM():
+    roms = []
+
+    for file in glob.glob("*.z64"):
+        if Z64Rom.isValidRom(file):
+            roms.append(file)
+
+    if not (roms):
+        print("Error: No roms located, place one in the OTRExporter directory", file=os.sys.stderr)
+        sys.exit(1)
+
+    if (len(roms) == 1):
+        return roms[0]
+
+    print(str(len(roms))+ " roms found, please select one by pressing 1-"+str(len(roms)))
+
+    for i in range(len(roms)):
+        print(str(i+1)+ ". " + roms[i])
+
+    while(1):
+        try:
+            selection = int(input())
+        except:
+            print("Bad input. Try again with the number keys.")
+            continue
+
+        if (selection < 1 or selection > len(roms)):
+            print("Bad input. Try again.")
+            continue
+
+        else: break
+
+    return roms[selection - 1]

OTRExporter/rom_info.py

@@ -0,0 +1,87 @@
+from enum import Enum
+from tabnanny import check
+import struct
+
+class Checksums(Enum):
+    OOT_NTSC_10 = "EC7011B7"
+    OOT_NTSC_11 = "D43DA81F"
+    OOT_NTSC_12 = "693BA2AE"
+    OOT_PAL_10 = "B044B569"
+    OOT_PAL_11 = "B2055FBD"
+    OOT_NTSC_JP_GC_CE = "F7F52DB8"
+    OOT_NTSC_JP_GC = "F611F4BA"
+    OOT_NTSC_US_GC = "F3DD35BA"
+    OOT_PAL_GC = "09465AC3"
+    OOT_NTSC_JP_MQ = "F43B45BA"
+    OOT_NTSC_US_MQ = "F034001A"
+    OOT_PAL_MQ = "1D4136F3"
+    OOT_PAL_GC_DBG1 = "871E1C92"
+    OOT_PAL_GC_DBG2 = "87121EFE"
+    OOT_PAL_GC_MQ_DBG = "917D18F6"
+    OOT_IQUE_TW = "3D81FB3E"
+    OOT_IQUE_CN = "B1E1E07B"
+    OOT_UNKNOWN = "FFFFFFFF"
+
+    @classmethod
+    def has_value(self, value):
+        return value in self._value2member_map_
+
+class RomVersion:
+    def __init__(self, file_table_path, file_table_off, xml_ver):
+        self.file_table_off = file_table_off
+        self.xml_ver = xml_ver
+        with open(file_table_path, 'r') as f:
+            self.file_table = [line.strip('\n') for line in f]
+
+ROM_INFO_TABLE = dict()
+ROM_INFO_TABLE[Checksums.OOT_PAL_GC] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_NMQ_PAL_F")
+ROM_INFO_TABLE[Checksums.OOT_PAL_GC_DBG1] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_NMQ_D")
+
+class RomDmaEntry:
+    def __init__(self, rom, i):
+
+        off = rom.version.file_table_off + 16 * i
+
+        (self.virtStart, \
+        self.virtEnd, \
+        self.physStart, \
+        self.physEnd) = struct.unpack('>IIII', rom.rom_data[off:off+4*4])
+
+        self.compressed = self.physEnd != 0
+        self.size = self.physEnd - self.physStart \
+                if self.compressed \
+                else self.virtEnd - self.virtStart
+        self.name = rom.version.file_table[i]
+
+
+class Z64Rom:
+    def __init__(self, file_path):
+        self.file_path = file_path
+        with open(file_path, 'rb') as f:
+            self.rom_data = f.read()
+
+        self.is_valid = len(self.rom_data) > 20 * 1024 * 1024
+
+        if not self.is_valid:
+            return
+
+        # get checkum
+        checksum_str = self.rom_data[16:16+4].hex().upper()
+        self.checksum = Checksums(checksum_str) if Checksums.has_value(checksum_str) else Checksums.OOT_UNKNOWN
+
+        if self.checksum == Checksums.OOT_UNKNOWN:
+            self.is_valid = False
+            return
+
+        # get rom version
+        self.version = ROM_INFO_TABLE[self.checksum]
+
+    def getDmaEntryByIndex(self, i):
+        return RomDmaEntry(self, i)
+
+    def readDmaEntry(self, entry):
+        return self.rom_data[entry.physStart:entry.physStart + entry.size]
+
+    @staticmethod
+    def isValidRom(rom_path):
+        return Z64Rom(rom_path).is_valid

OTRGui/assets/extractor/Config_GC_MQ_D.xml

@@ -2,7 +2,7 @@
     <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
     <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
     <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_MQ_D/"/>
 	<TexturePool File="TexturePool.xml"/>
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>

OTRGui/assets/extractor/Config_GC_NMQ_D.xml

@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_D/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>

OTRGui/assets/extractor/Config_GC_NMQ_PAL_F.xml

@@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_PAL_F/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>

OTRGui/src/game/game.cpp

@@ -18,6 +18,7 @@ Shader shader = { 0 };
 Light light = { 0 };
 Vector3 lightPos = { -5.0f, 10.0f, 10.0f };
 Vector2 dragOffset;
+bool isDragging = false;
 std::string sohFolder = NULLSTR;
 bool extracting = false;
 bool rom_ready = false;
@@ -25,6 +26,7 @@ bool single_thread = false;
 bool hide_second_btn = false;
 RomVersion version;
 const char* patched_rom = "tmp/rom.z64";
+extern bool oldExtractMode;
 
 static std::string currentStep = "None";
 
@@ -65,17 +67,35 @@ void OTRGame::init(){
 		mat.shader = shader;
 	}
 
-	if(fs::exists("soh.exe") && !fs::exists("oot.otr")) {
+	if((fs::exists("soh.exe") || fs::exists("soh.elf")) && !fs::exists("oot.otr")) {
 		hide_second_btn = true;
 		sohFolder = ".";
 	}
 }
 
-void ExtractRom() {
-	const WriteResult result = ExtractBaserom(patched_rom);
+void ExtractRom()
+{
+	WriteResult result;
+
+	if (oldExtractMode)
+		ExtractBaserom(patched_rom);
+	else
+		result.error = NULLSTR;
+
 	if (result.error == NULLSTR) {
 		if (MoonUtils::exists("oot.otr")) MoonUtils::rm("oot.otr");
-		startWorker();
+		if (MoonUtils::exists("Extract")) MoonUtils::rm("Extract");
+
+		MoonUtils::mkdir("Extract");
+		//MoonUtils::copy("tmp/baserom/Audiobank", "Extract/Audiobank");
+		//MoonUtils::copy("tmp/baserom/Audioseq", "Extract/Audioseq");
+		//MoonUtils::copy("tmp/baserom/Audiotable", "Extract/Audiotable");
+		//MoonUtils::copy("tmp/baserom/version", "Extract/version");
+		MoonUtils::write("Extract/version", (char*)&version.crc, sizeof(version.crc));
+
+		MoonUtils::copy("assets/game/", "Extract/assets/");
+
+		startWorker(version);
 		extracting = true;
 	}
 }
@@ -95,69 +115,103 @@ void OTRGame::update(){
 }
 
 void OTRGame::draw() {
+	Vector2 windowSize(GetScreenWidth(), GetScreenHeight());
+	Rectangle titlebar = Rectangle(0, 0, windowSize.x - 50, 35);
+	Vector2 mousePos = GetMousePosition();
+	Vector2 mouseDelta = GetMouseDelta();
+
+	if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && !isDragging &&
+		mousePos.x >= titlebar.x && mousePos.y >= titlebar.y && mousePos.x <= titlebar.x + titlebar.width && mousePos.y <= titlebar.y + titlebar.height) {
+		isDragging = true;
+		dragOffset = mousePos;
+	}
+	else if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT) && isDragging) {
+		isDragging = false;
+		dragOffset = Vector2(0, 0);
+	}
+
+	if (isDragging && (mouseDelta.x != 0.0f || mouseDelta.y != 0.0f)) {
+		Vector2 wndPos = GetWindowPosition();
+		wndPos = Vector2(wndPos.x + (mousePos.x - dragOffset.x), wndPos.y + (mousePos.y - dragOffset.y));
+
+		// Calculate virtual screen total size in case there are multiple monitors
+
+		int vsX1 = 0, vsY1 = 0, vsX2 = 0, vsY2 = 0;
+		int monitorCount = GetMonitorCount();
+
+		for (int m = 0; m < monitorCount; m++) {
+			Vector2 monitorPos = GetMonitorPosition(m);
+			Vector2 monitorSize = Vector2(GetMonitorWidth(m), GetMonitorHeight(m));
+
+			if (monitorPos.x < vsX1) vsX1 = monitorPos.x;
+			if (monitorPos.y < vsY1) vsY1 = monitorPos.y;
+			if (monitorPos.x + monitorSize.x > vsX2) vsX2 = monitorPos.x + monitorSize.x;
+			if (monitorPos.y + monitorSize.y > vsY2) vsY2 = monitorPos.y + monitorSize.y;
+		}
+
+		// Clamp the window to the borders of the monitors
+		if (wndPos.x < vsX1) wndPos.x = vsX1;
+		if (wndPos.x < vsX1) wndPos.x = vsX1;
+		if (wndPos.y < vsY1) wndPos.y = vsY1;
+		if (wndPos.x + windowSize.x > vsX2) wndPos.x = vsX2 - windowSize.x;
+		if (wndPos.y + windowSize.y > vsY2) wndPos.y = vsY2 - windowSize.y;
+
+		SetWindowPosition(wndPos.x, wndPos.y);
+	}
+
 	BeginDrawing();
-		ClearBackground(Color(40, 40, 40, 255));
-		Vector3 windowSize(GetScreenWidth(), GetScreenHeight());
-		Rectangle titlebar = Rectangle(0, 0, windowSize.x - 50, 35);
-		Vector2 mousePos = Vector2(GetMouseX(), GetMouseY());
-		bool hoveredTitlebar = mousePos.x >= titlebar.x && mousePos.y >= titlebar.y && mousePos.x <= titlebar.x + titlebar.width && mousePos.y <= titlebar.y + titlebar.height;
+	ClearBackground(Color(40, 40, 40, 255));
 
-		if (hoveredTitlebar && IsMouseButtonDown(MOUSE_BUTTON_LEFT)) {
-			if (dragOffset.x == 0 && dragOffset.y == 0) dragOffset = mousePos;
-			Vector2 wndPos = GetWindowPosition();
+	DrawTexture(Textures["Frame"], 0, 0, WHITE);
 
-			SetWindowPosition(wndPos.x + (mousePos.x - dragOffset.x), wndPos.y + (mousePos.y - dragOffset.y));
-		}
-		else dragOffset = Vector2(0, 0);
+	Texture2D titleTex = Textures["Title"];
+	DrawTexture(titleTex, windowSize.x / 2 - titleTex.width / 2, titlebar.height / 2 - titleTex.height / 2, WHITE);
 
-		DrawTexture(Textures["Frame"], 0, 0, WHITE);
+	if (UIUtils::GuiIcon("Exit", windowSize.x - 36, titlebar.height / 2 - 10) && (extracting && currentStep.find("Done") != std::string::npos || !extracting)) {
+		closeRequested = true;
+	}
 
-		Texture2D titleTex = Textures["Title"];
-		DrawTexture(titleTex, windowSize.x / 2 - titleTex.width / 2, titlebar.height / 2 - titleTex.height / 2, WHITE);
+	BeginMode3D(camera);
+	DrawModelEx(Models["Ship"], Vector3Zero(), Vector3(.0f, 1.0f, .0f), this->ModelRotation, SCALE(1.0f), WHITE);
+	EndMode3D();
 
-		if (UIUtils::GuiIcon("Exit", windowSize.x - 36, titlebar.height / 2 - 10) && (extracting && currentStep.find("Done") != std::string::npos || !extracting)) {
-			CloseWindow();
-		}
+	constexpr float text_y = 125.f;
+	UIUtils::GuiShadowText(("Rom Type: " + version.version).c_str(), 32, text_y, 10, WHITE, BLACK);
+	UIUtils::GuiShadowText("Tool Version: 1.0", 32, text_y + 15, 10, WHITE, BLACK);
+	UIUtils::GuiShadowText("OTR Version: 1.0", 32, text_y + 30, 10, WHITE, BLACK);
 
-		BeginMode3D(camera);
-			DrawModelEx(Models["Ship"] ,Vector3Zero(), Vector3(.0f, 1.0f, .0f), this->ModelRotation, SCALE(1.0f), WHITE);
-		EndMode3D();
-
-		constexpr float text_y = 125.f;
-		UIUtils::GuiShadowText(("Rom Type: " + version.version).c_str(), 32, text_y, 10, WHITE, BLACK);
-		UIUtils::GuiShadowText("Tool Version: 1.0", 32, text_y + 15, 10, WHITE, BLACK);
-		UIUtils::GuiShadowText("OTR Version: 1.0", 32, text_y + 30, 10, WHITE, BLACK);
+	if (oldExtractMode)
 		UIUtils::GuiToggle(&single_thread, "Single Thread", 32, text_y + 40, currentStep != NULLSTR);
-		
-		if(!hide_second_btn && UIUtils::GuiIconButton("Folder", "Open\nShip Folder", 109, 50, currentStep != NULLSTR, "Select your Ship of Harkinian Folder\n\nYou could use another folder\nfor development purposes")) {
-			const std::string path = NativeFS->LaunchFileExplorer(LaunchType::FOLDER);
-			sohFolder = path;
-		}
 
-		if (UIUtils::GuiIconButton("Cartridge", "Open\nOoT Rom", 32, 50, currentStep != NULLSTR, "Select an Ocarina of Time\nMaster Quest or Vanilla Debug Rom\n\nYou can dump it or lend one from Nintendo")) {
-			const std::string path = NativeFS->LaunchFileExplorer(LaunchType::FILE);
-			if (path != NULLSTR) {
-				const std::string patched_n64 = std::string(patched_rom);
-				MoonUtils::rm(patched_n64);
-				version = GetVersion(fopen(path.c_str(), "r"));
-				if (version.version != NULLSTR) {
-					MoonUtils::copy(path, patched_n64);
-					rom_ready = true;
-					return;
-				}
-				fix_baserom(path.c_str(), patched_rom);
-				version = GetVersion(fopen(patched_rom, "r"));
-				if (version.version != NULLSTR) rom_ready = true;
+	if (!hide_second_btn && UIUtils::GuiIconButton("Folder", "Open\nShip Folder", 109, 50, currentStep != NULLSTR, "Select your Ship of Harkinian Folder\n\nYou could use another folder\nfor development purposes")) {
+		const std::string path = NativeFS->LaunchFileExplorer(LaunchType::FOLDER);
+		sohFolder = path;
+	}
+
+	if (UIUtils::GuiIconButton("Cartridge", "Open\nOoT Rom", 32, 50, currentStep != NULLSTR, "Select an Ocarina of Time\nGameCube PAL or Vanilla Debug Rom\n\nYou can dump it or lend one from Nintendo")) {
+		const std::string path = NativeFS->LaunchFileExplorer(LaunchType::FILE);
+		if (path != NULLSTR) {
+			const std::string patched_n64 = std::string(patched_rom);
+			MoonUtils::rm(patched_n64);
+			version = GetVersion(fopen(path.c_str(), "r"));
+			if (version.version != NULLSTR) {
+				MoonUtils::copy(path, patched_n64);
+				rom_ready = true;
+				return;
 			}
+			fix_baserom(path.c_str(), patched_rom);
+			version = GetVersion(fopen(patched_rom, "r"));
+			if (version.version != NULLSTR) rom_ready = true;
 		}
+	}
 
-		if(currentStep != NULLSTR) {
-			DrawRectangle(0, 0, windowSize.x, windowSize.y, Color(0, 0, 0, 160));
-			DrawTexture(Textures["Modal"], windowSize.x / 2 - Textures["Modal"].width / 2, windowSize.y / 2 - Textures["Modal"].height / 2, WHITE);
-			UIUtils::GuiShadowText(currentStep.c_str(), 0, windowSize.y / 2, 10, WHITE, BLACK, windowSize.x, true);
-		}
+	if (currentStep != NULLSTR) {
+		DrawRectangle(0, 0, windowSize.x, windowSize.y, Color(0, 0, 0, 160));
+		DrawTexture(Textures["Modal"], windowSize.x / 2 - Textures["Modal"].width / 2, windowSize.y / 2 - Textures["Modal"].height / 2, WHITE);
+		UIUtils::GuiShadowText(currentStep.c_str(), 0, windowSize.y / 2, 10, WHITE, BLACK, windowSize.x, true);
+	}
 
-    EndDrawing();
+	EndDrawing();
 }
 
 void setCurrentStep(const std::string& step) {
@@ -166,4 +220,4 @@ void setCurrentStep(const std::string& step) {
 
 void OTRGame::exit(){
 
-}
+}

OTRGui/src/game/game.h

@@ -19,6 +19,8 @@ public:
     void update();
     void draw();
     void exit();
+
+    inline bool CloseRequested() { return closeRequested; }
 protected:
     void LoadTexture(const std::string& name, const std::string& path) {
         const Image tmp = LoadImage(path.c_str());
@@ -32,6 +34,9 @@ protected:
         SetTextureFilter(font.texture, TEXTURE_FILTER_POINT);
         Fonts[name] = font;
     }
+
+private:
+    bool closeRequested = false;
 };
 
 extern OTRGame* Game;

OTRGui/src/impl/baserom_extractor/baserom_extractor.cpp

@@ -83,37 +83,37 @@ RomVersion GetVersion(FILE* rom) {
         break;
     case OOT_NTSC_JP_GC:
         version.version = "JP GameCube (MQ Disk)";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
         version.offset = OOT_OFF_JP_GC;
         break;
     case OOT_NTSC_JP_GC_CE:
         version.version = "GameCube (Collectors Edition Disk)";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
         version.offset = OOT_OFF_JP_GC_CE;
         break;
     case OOT_NTSC_JP_MQ:
         version.version = "JP Master Quest";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
         version.offset = OOT_OFF_JP_MQ;
         break;
     case OOT_NTSC_US_MQ:
         version.version = "NTSC Master Quest";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
         version.offset = OOT_OFF_JP_MQ;
         break;
     case OOT_NTSC_US_GC:
         version.version = "NTSC GameCube";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
         version.offset = OOT_OFF_US_MQ;
         break;
     case OOT_PAL_GC:
         version.version = "PAL GameCube";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube_pal.txt";
         version.offset = OOT_OFF_PAL_GC;
         break;
     case OOT_PAL_MQ:
         version.version = "PAL Master Quest";
-        version.listPath = "pal_mq.txt";
+        version.listPath = "gamecube_pal.txt";
         version.offset = OOT_OFF_PAL_MQ;
         break;
     case OOT_PAL_GC_DBG1:
@@ -179,6 +179,8 @@ WriteResult ExtractBaserom(const char* romPath) {
 
     const std::vector<std::string> lines = MoonUtils::split(read(MoonUtils::join("assets/extractor/filelists", version.listPath)), '\n');
 
+    std::vector<uint8_t> decompressedData(1);
+
     for (int i = 0; i < lines.size(); i++) {
         FILE* outFile = fopen(MoonUtils::join("tmp/baserom", lines[i]).c_str(), "wb");
         const int romOffset = version.offset + (DMA_ENTRY_SIZE * i);
@@ -196,10 +198,13 @@ WriteResult ExtractBaserom(const char* romPath) {
         auto outData = new uint8_t[size];
         memcpy(outData, romData + physStart, size);
 
+
         if (compressed) {
-            std::vector<uint8_t> compressedData = yaz0_encode(outData, size);
-            outData = compressedData.data();
-            size = compressedData.size();
+            int decSize = virtEnd - virtStart;
+            decompressedData = std::vector<uint8_t>(decSize);
+            yaz0_decode(outData, decompressedData.data(), decSize);
+            outData = decompressedData.data();
+            size = decSize;
         }
 
         fwrite(outData, sizeof(char), size, outFile);

OTRGui/src/impl/baserom_extractor/baserom_extractor.h

@@ -1,23 +1,7 @@
 #ifndef EXTRACT_BASEROM_H_
 #define EXTRACT_BASEROM_H_
 
-#define OOT_NTSC_10 0xEC7011B7
-#define OOT_NTSC_11 0xD43DA81F
-#define OOT_NTSC_12 0x693BA2AE
-#define OOT_PAL_10 0xB044B569
-#define OOT_PAL_11 0xB2055FBD
-#define OOT_NTSC_JP_GC_CE 0xF7F52DB8
-#define OOT_NTSC_JP_GC 0xF611F4BA
-#define OOT_NTSC_US_GC 0xF3DD35BA
-#define OOT_PAL_GC 0x09465AC3
-#define OOT_NTSC_JP_MQ 0xF43B45BA
-#define OOT_NTSC_US_MQ 0xF034001A
-#define OOT_PAL_MQ 0x1D4136F3
-#define OOT_PAL_GC_DBG1 0x871E1C92 // 03-21-2002 build
-#define OOT_PAL_GC_DBG2 0x87121EFE // 03-13-2002 build
-#define OOT_PAL_GC_MQ_DBG 0x917D18F6
-#define OOT_IQUE_TW 0x3D81FB3E
-#define OOT_IQUE_CN 0xB1E1E07B
+#include "../../libultraship/libultraship/GameVersions.h"
 #include <cstdio>
 #include <string>
 

OTRGui/src/impl/extractor/extractor.cpp

@@ -5,6 +5,7 @@
 #include "utils/mutils.h"
 #include "ctpl/ctpl_stl.h"
 #include <thread>
+#include <impl/baserom_extractor/baserom_extractor.h>
 
 #ifdef _WIN32
 #define PLATFORM Platforms::WINDOWS
@@ -13,6 +14,7 @@
 #endif
 namespace Util = MoonUtils;
 
+bool oldExtractMode = false;
 static int maxResources = 0;
 static int extractedResources = 0;
 bool buildingOtr = false;
@@ -22,19 +24,29 @@ bool isWindows() {
 	return (PLATFORM == Platforms::WINDOWS);
 }
 
-void BuildOTR(const std::string output) {
-	Util::copy("tmp/baserom/Audiobank", "Extract/Audiobank");
-	Util::copy("tmp/baserom/Audioseq", "Extract/Audioseq");
-	Util::copy("tmp/baserom/Audiotable", "Extract/Audiotable");
-
-	Util::copy("assets/game/", "Extract/assets/");
-
-	std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out") + " botr -se OTR";
-	ProcessResult result = NativeFS->LaunchProcess(execStr);
-	if(result.exitCode != 0) {
-		std::cout << "\nError when building the OTR file with error code: " << result.exitCode << " !" << std::endl;
-		std::cout << "Aborting...\n" << std::endl;
+std::string GetXMLVersion(RomVersion version)
+{
+	switch (version.crc)
+	{
+	case OOT_PAL_GC_DBG1: return "GC_NMQ_D";
+	case OOT_PAL_GC_DBG2: return "GC_MQ_D";
+	case OOT_PAL_GC:	  return "GC_NMQ_PAL_F";
 	}
+
+	return "ERROR";
+}
+
+void BuildOTR(const std::string output) {
+	if (oldExtractMode)
+	{
+		std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out") + " botr -se OTR";
+		ProcessResult result = NativeFS->LaunchProcess(execStr);
+		if (result.exitCode != 0) {
+			std::cout << "\nError when building the OTR file with error code: " << result.exitCode << " !" << std::endl;
+			std::cout << "Aborting...\n" << std::endl;
+		}
+	}
+
 	setCurrentStep("Done!");
 
 	if (output == ".") return;
@@ -44,9 +56,9 @@ void BuildOTR(const std::string output) {
 	MoonUtils::copy("oot.otr", outputPath);
 }
 
-void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPath) {
+void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPath, RomVersion version) {
 	std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out");
-	std::string args = Util::format(" e -eh -i %s -b tmp/baserom/ -o %s -osf %s -gsf 1 -rconf assets/extractor/Config.xml -se OTR %s", xmlPath.c_str(), outPath.c_str(), outSrcPath.c_str(), xmlPath.find("overlays") != std::string::npos ? "--static" : "");
+	std::string args = Util::format(" e -eh -i %s -b tmp/baserom/ -o %s -osf %s -gsf 1 -rconf assets/extractor/Config_%s.xml -se OTR %s", xmlPath.c_str(), outPath.c_str(), outSrcPath.c_str(), GetXMLVersion(version).c_str(), xmlPath.find("overlays") != std::string::npos ? "--static" : "");
 	ProcessResult result = NativeFS->LaunchProcess(execStr + args);
 
 	if (result.exitCode != 0) {
@@ -55,49 +67,77 @@ void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPat
 	}
 }
 
-void ExtractFunc(std::string fullPath) {
+void ExtractFunc(std::string fullPath, RomVersion version) {
 	std::vector<std::string> path = Util::split(fullPath, Util::pathSeparator());
 	std::string outPath = Util::join(Util::join("assets/extractor/xmls/output", path[4]), Util::basename(fullPath));
 	Util::mkdir(outPath);
-	ExtractFile(fullPath, outPath, outPath);
+	ExtractFile(fullPath, outPath, outPath, version);
 	setCurrentStep("Extracting: " + Util::basename(fullPath));
 	extractedResources++;
 }
 
-void startWorker() {
-	std::string path = "assets/extractor/xmls";
-	std::vector<std::string> files;
-	Util::dirscan(path, files);
-	std::vector<std::string> xmlFiles;
+void startWorker(RomVersion version) {
+	std::string path = "assets/extractor/xmls/";
 
-	const int num_threads = std::thread::hardware_concurrency();
-	ctpl::thread_pool pool(num_threads / 2);
-	for(auto &file : files) {
-		if (file.find(".xml") != std::string::npos) xmlFiles.push_back(file);
-	}
+	path += GetXMLVersion(version);
 
-	for (auto& file : xmlFiles) {
-		if(single_thread) {
-			ExtractFunc(file);
-		} else {
-			pool.push([file](int) {
-				ExtractFunc(file);
-			});
+	Util::write("tmp/baserom/version", (char*)&version.crc, sizeof(version.crc));
+
+	if (oldExtractMode)
+	{
+		std::vector<std::string> files;
+		Util::dirscan(path, files);
+		std::vector<std::string> xmlFiles;
+
+		const int num_threads = std::thread::hardware_concurrency();
+		ctpl::thread_pool pool(num_threads / 2);
+		for (auto& file : files) {
+			if (file.find(".xml") != std::string::npos) xmlFiles.push_back(file);
 		}
-	}
 
-	maxResources = xmlFiles.size();
+		for (auto& file : xmlFiles) {
+			if (single_thread) {
+				ExtractFunc(file, version);
+			}
+			else {
+				pool.push([file, version](int) {
+					ExtractFunc(file, version);
+					});
+			}
+		}
+
+		maxResources = xmlFiles.size();
+	}
+	else
+	{
+		std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out");
+		std::string args = Util::format(" ed -eh -i %s -b tmp/rom.z64 -fl assets/extractor/filelists -o %s -osf %s -gsf 1 -rconf assets/extractor/Config_%s.xml -se OTR %s", path.c_str(), path + "../", path + "../", GetXMLVersion(version).c_str(), "");
+		ProcessResult result = NativeFS->LaunchProcess(execStr + args);
+
+		if (result.exitCode != 0) {
+			std::cout << "\nError when extracting the ROM with error code: " << result.exitCode << " !" << std::endl;
+			std::cout << "Aborting...\n" << std::endl;
+		}
+		else
+		{
+			printf("All done?\n");
+		}
+
+		maxResources = 1;
+	}
 }
 
 void updateWorker(const std::string& output) {
-	if (maxResources > 0 && !buildingOtr && extractedResources >= maxResources) {
+	if (maxResources > 0 && !buildingOtr && (extractedResources >= maxResources || !oldExtractMode)) 
+	{
 		setCurrentStep("Building OTR...");
 		if (skipFrames < 3) {
 			skipFrames++;
 			return;
 		}
 		buildingOtr = true;
-		if (single_thread){
+		
+		if (single_thread || !oldExtractMode){
 			BuildOTR(output);
 			return;
 		}

OTRGui/src/impl/extractor/extractor.h

@@ -5,5 +5,7 @@ enum Platforms {
 	WINDOWS, LINUX
 };
 
-void startWorker();
+struct RomVersion;
+
+void startWorker(RomVersion version);
 void updateWorker(const std::string& output);

OTRGui/src/main.cpp

@@ -17,8 +17,8 @@ void UpdateDrawFrame(void) {
 }
 
 int main() {
-	constexpr Vector2 windowSize = Vector2(400, 200);
-    SetTargetFPS(144);
+    constexpr Vector2 windowSize = Vector2(400, 200);
+    SetConfigFlags(FLAG_VSYNC_HINT);
     SetConfigFlags(FLAG_WINDOW_HIGHDPI);
     SetConfigFlags(FLAG_WINDOW_UNDECORATED);
     SetConfigFlags(FLAG_MSAA_4X_HINT);
@@ -32,7 +32,7 @@ int main() {
     Game = new OTRGame();
     Game->preload();
     Game->init();
-    while(!WindowShouldClose()) {
+    while(!WindowShouldClose() && !Game->CloseRequested()) {
         UpdateDrawFrame();
     }
     CloseWindow();

OTRGui/src/utils/mutils.cpp

@@ -72,7 +72,11 @@ namespace MoonUtils {
         vector<string> result;
         stringstream ss (s);
         string item;
-        while (getline(ss, item, delim)) {
+        while (getline(ss, item, delim)) 
+        {
+            if (item.at(item.size() - 1) == '\r')
+                item = item.substr(0, item.size() - 1);
+
             result.push_back (item);
         }
         return result;

README.md

@@ -6,15 +6,25 @@ The Ship does not include assets and as such requires a prior copy of the game t
 
 ## Quick Start
 
-1) Download [The Ship of Harkinian](https://github.com/HarbourMasters/Shipwright/releases/latest) from releases.
-2) Get a ZRET OoT Debug ROM
-```
-Build date: `zelda@srd022j 03-02-21 00:49:18`
-sha1: cee6bc3c2a634b41728f2af8da54d9bf8cc14099
-```
+1) Download The Ship of Harkinian from [Discord](https://discord.com/invite/BtBmd55HVH).
+2) Requires a supported copy of the game (See supported games below).
 3) Use the OTRGui to generate an `oot.otr` archive file.
 4) Launch `soh.exe`
 
+### Supported Games
+#### Ocarina of Time Debug (not Master Quest)
+> Currently the recommended option
+```
+Build team: `zelda@srd022j`
+Build date: `03-02-21 00:49:18` (year-month-day)
+sha1: cee6bc3c2a634b41728f2af8da54d9bf8cc14099
+```
+#### Ocarina of Time PAL GameCube
+> May lead to crashes and instability
+```
+sha1: 0227d7c0074f2d0ac935631990da8ec5914597b4
+```
+
 Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 
 ## Additional Setup Information
@@ -36,9 +46,25 @@ If you still cannot get the tool to work, join our [Discord Server](https://disc
 
 ### Running The Ship of Harkinian
 
-Launch the game. If the window immediately closes, or if there are visual artifacts, you may have selected the wrong rom in the OTRGui tool. 
+Launch the game. If the window immediately closes, or if there are visual artifacts, you may have selected the wrong rom in the OTRGui tool.
 
-Currently, DirectX 11 and OpenGL is supported. Change the renderer by opening the `shipofharkinian.ini` configuration file in notepad and add `sdl` to `gfx backend` for OpenGL or leave blank for DirectX.
+Default keyboard configuration:
+| N64 | A | B | Z | Start | Analog stick | C buttons | D-Pad |
+| - | - | - | - | - | - | - | - |
+| Keyboard | X | C | Z | Space | WASD | Arrow keys | TFGH |
+
+Other shortcuts:
+| Keys | Action |
+| - | - |
+| F1 | Toggle menubar |
+| F5 | Save state |
+| F6 | Change state |
+| F7 | Load state |
+| F10 | Fullscreen (OpenGL) |
+| Alt+Enter | Fullscreen (DirectX) |
+| Ctrl+R | Reset |
+
+Currently, DirectX 11 and OpenGL are supported. Change the renderer by opening the `shipofharkinian.json` configuration file in notepad and add `sdl` to the quotes in `"GfxBackend": ""` for OpenGL or leave blank for DirectX.
 
 ## Take The Survey
 Want to use cartridge readers in tandem with the OTRGui?
@@ -50,63 +76,55 @@ Official Discord: https://discord.com/invite/BtBmd55HVH
 
 ## Building The Ship of Harkinian
 
- 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
- 2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
- 2b. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
- 4. Clone the Ship of Harkinian repository.
- 5. Put your 2020 OoT debug rom in the `soh` folder.
- 6. Launch `soh/fixbaserom.py`.
- 7. Launch `soh/extract_baserom.py`.
- 8. Copy the `baserom` folder from the `soh` folder into the `OTRExporter` folder.
- 9. Run `OTRExporter/OTRExporter.sln`.
- 10. Switch the solution to `Release x64`.
- 11. Build the solution. 
- 12. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
- 13. Run `soh/soh.sln`
- 14. Switch the solution to `Release x86`.
- 15. Build the solution.
- 16. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
- 17. Launch `soh.exe`.
+Refer to the [building instructions](BUILDING.md) to compile SoH.
 
 ## Troubleshooting The Exporter
-- Affirm that you have an `/assets` folder filled with XMLs in the same directory as OTRGui.exe
-- Affirm that `zapd.exe` exists in the `/assets/extractor` folder
+- Confirm that you have an `/assets` folder filled with XMLs in the same directory as OTRGui.exe
+- Confirm that `zapd.exe` exists in the `/assets/extractor` folder
+
+## Nightly Builds
+Nightly builds of Ship of Harkinian are available [here](https://builds.shipofharkinian.com/job/SoH_Multibranch/job/develop)
 
 
 ## The Harbour Masters Are...
 
-    Kenix 			| Lead Developer/Public Relations - Resource Management Programmer, Audio System Programmer, and General Programmer
-    Jack Walker 		| Lead Developer - OTR Format Programmer, Resource Load Programmer, and General Programmer
-    Louist103 		| Developer - Save System Programmer and General Programmer
-    Emil 			| Developer - Fast3D Programmer
-    m4xw 			| Developer - Shipwright, Throwing Baguettes, and General Programmer
-    MelonSpeedruns 		| Developer - General Programmer
-    Rozlette 		| Developer - General Programmer
-    JoshDuMan 		| Developer - General Programmer
-    KiritoDev/Lywx 		| Developer - General Programmer
-    Theo3 			| Developer - General Programmer
-	Random06457  		| Developer - Linux Build
+    Kenix | Lead Developer/Public Relations - Resource Management Programmer, Audio System Programmer, and General Programmer
+    Jack Walker | Lead Developer - OTR Format Programmer, Resource Load Programmer, and General Programmer
+    Louist103 | Developer - Save System Programmer and General Programmer
+    Emil | Developer - Fast3D Programmer
+    m4xw | Developer - Shipwright, Throwing Baguettes, and General Programmer
+    MelonSpeedruns | Developer - General Programmer
+    Rozlette | Developer - General Programmer
+    JoshDuMan | Developer - General Programmer
+    KiritoDev/Lywx | Developer - General Programmer
+    Theo3 | Developer - General Programmer
+	Random06457 | Developer - Linux Build
 
 ## Special Thanks
 
-    Decomp & ZAPD 		| Made this project even possible in the first place!
-    MNGoldenEagle 		| Patiently explained audio data formats, encouragement, and founding ZSO which was the first source of the game's code and resource format documentation.
-    Rrrrry123 		| Speedbunner, encouragement, and community moderation
-    Fierce deity 		| Encouragement and community moderation
-    mzxrules		| For his contributions to decomp
-    Aloxado 		| Developer - General Programmer
-    MegaMech 		| Developer - General Programmer
-	Revo 			| Tester - GCC support and General Testing
-	zfg 			| Tester - General Testing
-	Horseless Headman 	| Tester - General Testing
-    Steven Pritchett        | Tester - General Testing
-	Trenton May 		| Tester - General Testing
-	Zeldaboy14 		| Tester - General Testing, encouragement, and community moderation
-	Koby Howell 		| Tester - General Testing
-	Logg 			| Tester - General Testing
-	Taylor Daley		| Graphic Design
-	Can't Sleep 		| Graphic Design
-    MicTheMicrophone 	| Voice actor for the King
-    Amphibibro		| Voice actor for Link
-
-Lemons
+    Decomp & ZAPD | Made this project even possible in the first place!
+    MNGoldenEagle | Patiently explained audio data formats, encouragement, and founding ZSO which was the first source of the game's code and resource format documentation.
+    Rrrrry123 | Speedbunner, encouragement, and community moderation
+    Fierce deity | Encouragement and community moderation
+    mzxrules | For his contributions to decomp
+    zel. | For his contributions to decomp
+    Aloxado | Developer - General Programmer
+    MegaMech | Developer - General Programmer
+	Revo | Tester - GCC support and General Testing
+	zfg | Tester - General Testing
+	Horseless Headman | Tester - General Testing
+    Steven Pritchett | Tester - General Testing
+	Trenton May | Tester - General Testing
+	Zeldaboy14 | Tester - General Testing, encouragement, and community moderation
+	Koby Howell | Tester - General Testing
+	Logg | Tester - General Testing
+	Taylor Daley | Graphic Design
+	Can't Sleep | Graphic Design
+	
+## Video Credits
+    Kenix | Producer / Writer
+	rainbow_fash | Executive Producer
+    ReveriePass | Editor
+    MicTheMicrophone | Gwonam / The King
+    Amphibibro | Link
+    AceHeart | Zelda

StormLib/.gitignore

@@ -0,0 +1,167 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+*.o
+*.dylib
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store
+**/project.xcworkspace
+**/xcuserdata

StormLib/CMakeLists.txt

@@ -0,0 +1,395 @@
+project(StormLib)
+cmake_minimum_required(VERSION 3.10)
+
+set(LIBRARY_NAME storm)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+include(CMakeDependentOption)
+
+option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+option(STORM_SKIP_INSTALL "Skip installing files" OFF)
+option(STORM_BUILD_TESTS
+    "Compile StormLib test application" OFF
+#   "BUILD_TESTING" OFF # Stay coherent with CTest variables
+)
+
+set(SRC_FILES
+           src/adpcm/adpcm.cpp
+           src/huffman/huff.cpp
+           src/jenkins/lookup3.c
+           src/lzma/C/LzFind.c
+           src/lzma/C/LzmaDec.c
+           src/lzma/C/LzmaEnc.c
+           src/pklib/explode.c
+           src/pklib/implode.c
+           src/sparse/sparse.cpp
+           src/FileStream.cpp
+           src/SBaseCommon.cpp
+           src/SBaseDumpData.cpp
+           src/SBaseFileTable.cpp
+           src/SBaseSubTypes.cpp
+           src/SCompression.cpp
+           src/SFileAddFile.cpp
+           src/SFileAttributes.cpp
+           src/SFileCompactArchive.cpp
+           src/SFileCreateArchive.cpp
+           src/SFileExtractFile.cpp
+           src/SFileFindFile.cpp
+           src/SFileGetFileInfo.cpp
+           src/SFileListFile.cpp
+           src/SFileOpenArchive.cpp
+           src/SFileOpenFileEx.cpp
+           src/SFilePatchArchives.cpp
+           src/SFileReadFile.cpp
+           src/SFileVerify.cpp
+           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
+           src/libtomcrypt/src/misc/crypt_libc.c
+)
+
+if(MSVC)
+    # This file is used to create a DLL on windows
+    # Use BUILD_SHARED_LIBS to create StormLib.dll
+    set(STORM_DEF_FILES
+           src/DllMain.def
+    )
+endif()
+
+set(TOMCRYPT_FILES
+           src/libtomcrypt/src/hashes/hash_memory.c
+           src/libtomcrypt/src/hashes/md5.c
+           src/libtomcrypt/src/hashes/sha1.c
+           src/libtomcrypt/src/math/ltm_desc.c
+           src/libtomcrypt/src/math/multi.c
+           src/libtomcrypt/src/math/rand_prime.c
+           src/libtomcrypt/src/misc/base64_decode.c
+           src/libtomcrypt/src/misc/crypt_argchk.c
+           src/libtomcrypt/src/misc/crypt_find_hash.c
+           src/libtomcrypt/src/misc/crypt_find_prng.c
+           src/libtomcrypt/src/misc/crypt_hash_descriptor.c
+           src/libtomcrypt/src/misc/crypt_hash_is_valid.c
+           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
+           src/libtomcrypt/src/misc/crypt_prng_descriptor.c
+           src/libtomcrypt/src/misc/crypt_prng_is_valid.c
+           src/libtomcrypt/src/misc/crypt_register_hash.c
+           src/libtomcrypt/src/misc/crypt_register_prng.c
+           src/libtomcrypt/src/misc/zeromem.c
+           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
+           src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
+           src/libtomcrypt/src/pk/asn1/der_decode_choice.c
+           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
+           src/libtomcrypt/src/pk/asn1/der_decode_integer.c
+           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
+           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
+           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
+           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
+           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
+           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
+           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
+           src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
+           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
+           src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c
+           src/libtomcrypt/src/pk/asn1/der_encode_boolean.c
+           src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c
+           src/libtomcrypt/src/pk/asn1/der_encode_integer.c
+           src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c
+           src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c
+           src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c
+           src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c
+           src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c
+           src/libtomcrypt/src/pk/asn1/der_encode_set.c
+           src/libtomcrypt/src/pk/asn1/der_encode_setof.c
+           src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c
+           src/libtomcrypt/src/pk/asn1/der_encode_utctime.c
+           src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_boolean.c
+           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_integer.c
+           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
+           src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_sequence.c
+           src/libtomcrypt/src/pk/asn1/der_length_utctime.c
+           src/libtomcrypt/src/pk/asn1/der_sequence_free.c
+           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
+           src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
+           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
+           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c
+           src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
+           src/libtomcrypt/src/pk/rsa/rsa_free.c
+           src/libtomcrypt/src/pk/rsa/rsa_import.c
+           src/libtomcrypt/src/pk/rsa/rsa_make_key.c
+           src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c
+           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
+)
+
+set(TOMMATH_FILES
+           src/libtommath/bncore.c
+           src/libtommath/bn_fast_mp_invmod.c
+           src/libtommath/bn_fast_mp_montgomery_reduce.c
+           src/libtommath/bn_fast_s_mp_mul_digs.c
+           src/libtommath/bn_fast_s_mp_mul_high_digs.c
+           src/libtommath/bn_fast_s_mp_sqr.c
+           src/libtommath/bn_mp_2expt.c
+           src/libtommath/bn_mp_abs.c
+           src/libtommath/bn_mp_add.c
+           src/libtommath/bn_mp_addmod.c
+           src/libtommath/bn_mp_add_d.c
+           src/libtommath/bn_mp_and.c
+           src/libtommath/bn_mp_clamp.c
+           src/libtommath/bn_mp_clear.c
+           src/libtommath/bn_mp_clear_multi.c
+           src/libtommath/bn_mp_cmp.c
+           src/libtommath/bn_mp_cmp_d.c
+           src/libtommath/bn_mp_cmp_mag.c
+           src/libtommath/bn_mp_cnt_lsb.c
+           src/libtommath/bn_mp_copy.c
+           src/libtommath/bn_mp_count_bits.c
+           src/libtommath/bn_mp_div.c
+           src/libtommath/bn_mp_div_2.c
+           src/libtommath/bn_mp_div_2d.c
+           src/libtommath/bn_mp_div_3.c
+           src/libtommath/bn_mp_div_d.c
+           src/libtommath/bn_mp_dr_is_modulus.c
+           src/libtommath/bn_mp_dr_reduce.c
+           src/libtommath/bn_mp_dr_setup.c
+           src/libtommath/bn_mp_exch.c
+           src/libtommath/bn_mp_exptmod.c
+           src/libtommath/bn_mp_exptmod_fast.c
+           src/libtommath/bn_mp_expt_d.c
+           src/libtommath/bn_mp_exteuclid.c
+           src/libtommath/bn_mp_fread.c
+           src/libtommath/bn_mp_fwrite.c
+           src/libtommath/bn_mp_gcd.c
+           src/libtommath/bn_mp_get_int.c
+           src/libtommath/bn_mp_grow.c
+           src/libtommath/bn_mp_init.c
+           src/libtommath/bn_mp_init_copy.c
+           src/libtommath/bn_mp_init_multi.c
+           src/libtommath/bn_mp_init_set.c
+           src/libtommath/bn_mp_init_set_int.c
+           src/libtommath/bn_mp_init_size.c
+           src/libtommath/bn_mp_invmod.c
+           src/libtommath/bn_mp_invmod_slow.c
+           src/libtommath/bn_mp_is_square.c
+           src/libtommath/bn_mp_jacobi.c
+           src/libtommath/bn_mp_karatsuba_mul.c
+           src/libtommath/bn_mp_karatsuba_sqr.c
+           src/libtommath/bn_mp_lcm.c
+           src/libtommath/bn_mp_lshd.c
+           src/libtommath/bn_mp_mod.c
+           src/libtommath/bn_mp_mod_2d.c
+           src/libtommath/bn_mp_mod_d.c
+           src/libtommath/bn_mp_montgomery_calc_normalization.c
+           src/libtommath/bn_mp_montgomery_reduce.c
+           src/libtommath/bn_mp_montgomery_setup.c
+           src/libtommath/bn_mp_mul.c
+           src/libtommath/bn_mp_mulmod.c
+           src/libtommath/bn_mp_mul_2.c
+           src/libtommath/bn_mp_mul_2d.c
+           src/libtommath/bn_mp_mul_d.c
+           src/libtommath/bn_mp_neg.c
+           src/libtommath/bn_mp_n_root.c
+           src/libtommath/bn_mp_or.c
+           src/libtommath/bn_mp_prime_fermat.c
+           src/libtommath/bn_mp_prime_is_divisible.c
+           src/libtommath/bn_mp_prime_is_prime.c
+           src/libtommath/bn_mp_prime_miller_rabin.c
+           src/libtommath/bn_mp_prime_next_prime.c
+           src/libtommath/bn_mp_prime_rabin_miller_trials.c
+           src/libtommath/bn_mp_prime_random_ex.c
+           src/libtommath/bn_mp_radix_size.c
+           src/libtommath/bn_mp_radix_smap.c
+           src/libtommath/bn_mp_rand.c
+           src/libtommath/bn_mp_read_radix.c
+           src/libtommath/bn_mp_read_signed_bin.c
+           src/libtommath/bn_mp_read_unsigned_bin.c
+           src/libtommath/bn_mp_reduce.c
+           src/libtommath/bn_mp_reduce_2k.c
+           src/libtommath/bn_mp_reduce_2k_l.c
+           src/libtommath/bn_mp_reduce_2k_setup.c
+           src/libtommath/bn_mp_reduce_2k_setup_l.c
+           src/libtommath/bn_mp_reduce_is_2k.c
+           src/libtommath/bn_mp_reduce_is_2k_l.c
+           src/libtommath/bn_mp_reduce_setup.c
+           src/libtommath/bn_mp_rshd.c
+           src/libtommath/bn_mp_set.c
+           src/libtommath/bn_mp_set_int.c
+           src/libtommath/bn_mp_shrink.c
+           src/libtommath/bn_mp_signed_bin_size.c
+           src/libtommath/bn_mp_sqr.c
+           src/libtommath/bn_mp_sqrmod.c
+           src/libtommath/bn_mp_sqrt.c
+           src/libtommath/bn_mp_sub.c
+           src/libtommath/bn_mp_submod.c
+           src/libtommath/bn_mp_sub_d.c
+           src/libtommath/bn_mp_toom_mul.c
+           src/libtommath/bn_mp_toom_sqr.c
+           src/libtommath/bn_mp_toradix.c
+           src/libtommath/bn_mp_toradix_n.c
+           src/libtommath/bn_mp_to_signed_bin.c
+           src/libtommath/bn_mp_to_signed_bin_n.c
+           src/libtommath/bn_mp_to_unsigned_bin.c
+           src/libtommath/bn_mp_to_unsigned_bin_n.c
+           src/libtommath/bn_mp_unsigned_bin_size.c
+           src/libtommath/bn_mp_xor.c
+           src/libtommath/bn_mp_zero.c
+           src/libtommath/bn_prime_tab.c
+           src/libtommath/bn_reverse.c
+           src/libtommath/bn_s_mp_add.c
+           src/libtommath/bn_s_mp_exptmod.c
+           src/libtommath/bn_s_mp_mul_digs.c
+           src/libtommath/bn_s_mp_mul_high_digs.c
+           src/libtommath/bn_s_mp_sqr.c
+           src/libtommath/bn_s_mp_sub.c
+)
+
+set(BZIP2_FILES
+           src/bzip2/blocksort.c
+           src/bzip2/bzlib.c
+           src/bzip2/compress.c
+           src/bzip2/crctable.c
+           src/bzip2/decompress.c
+           src/bzip2/huffman.c
+           src/bzip2/randtable.c
+)
+
+set(ZLIB_FILES
+           src/zlib/adler32.c
+           src/zlib/compress.c
+           src/zlib/crc32.c
+           src/zlib/deflate.c
+           src/zlib/inffast.c
+           src/zlib/inflate.c
+           src/zlib/inftrees.c
+           src/zlib/trees.c
+           src/zlib/zutil.c
+)
+
+set(TEST_SRC_FILES
+           test/StormTest.cpp
+)
+
+add_definitions(-D_7ZIP_ST -DBZ_STRICT_ANSI)
+set(LINK_LIBS)
+
+find_package(ZLIB)
+if (ZLIB_FOUND)
+	set(LINK_LIBS ${LINK_LIBS} ZLIB::ZLIB)
+    add_definitions(-D__SYS_ZLIB)
+else()
+	set(SRC_FILES ${SRC_FILES} ${ZLIB_FILES})
+endif()
+
+find_package(BZip2)
+if (BZIP2_FOUND)
+	set(LINK_LIBS ${LINK_LIBS} BZip2::BZip2)
+    add_definitions(-D__SYS_BZLIB)
+else()
+	set(SRC_FILES ${SRC_FILES} ${BZIP2_FILES})
+endif()
+
+if(WIN32)
+    set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES})
+	set(LINK_LIBS ${LINK_LIBS} wininet)
+else()
+    option(WITH_LIBTOMCRYPT "Use system LibTomCrypt library" OFF)
+    if(WITH_LIBTOMCRYPT)
+        include(FindPkgConfig)
+        pkg_check_modules(PC_LIBTOMCRYPT libtomcrypt REQUIRED)
+        find_path(LIBTOMCRYPT_INCLUDE_DIR NAMES tomcrypt.h HINTS ${PC_LIBTOMCRYPT_INCLUDE_DIRS} REQUIRED)
+        find_library(LIBTOMCRYPT_LIBRARY NAMES tomcrypt HINTS ${PC_LIBTOMCRYPT_LIBRARY_DIRS} REQUIRED)
+        set(LINK_LIBS ${LINK_LIBS} ${LIBTOMCRYPT_LIBRARY})
+        include_directories(${LIBTOMCRYPT_INCLUDE_DIR})
+    else()
+        set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES})
+    endif()
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
+    message(STATUS "Using FreeBSD port")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
+endif()
+
+add_library(${LIBRARY_NAME} ${LIB_TYPE} ${SRC_FILES} ${SRC_ADDITIONAL_FILES} ${STORM_DEF_FILES})
+if(WIN32)
+    set_target_properties(${LIBRARY_NAME} PROPERTIES OUTPUT_NAME "StormLib")
+endif()
+
+target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
+target_compile_definitions(${LIBRARY_NAME} INTERFACE STORMLIB_NO_AUTO_LINK) #CMake will take care of the linking
+target_include_directories(${LIBRARY_NAME} PUBLIC src/)
+set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h")
+if(BUILD_SHARED_LIBS)
+    message(STATUS "Linking against dependent libraries dynamically")
+
+    if(APPLE)
+        set_target_properties(${LIBRARY_NAME} PROPERTIES FRAMEWORK true)
+        set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-framework Carbon")
+    endif()
+    if(UNIX)
+        SET(VERSION_MAJOR "9")
+        SET(VERSION_MINOR "22")
+        SET(VERSION_PATCH "0")
+        SET(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+        set_target_properties(${LIBRARY_NAME} PROPERTIES VERSION "${VERSION_STRING}")
+        set_target_properties(${LIBRARY_NAME} PROPERTIES SOVERSION "${VERSION_MAJOR}")
+    endif()
+else()
+    message(STATUS "Linking against dependent libraries statically")
+endif()
+
+if (NOT STORM_SKIP_INSTALL)
+    install(TARGETS ${LIBRARY_NAME}
+	    RUNTIME DESTINATION bin
+	    LIBRARY DESTINATION lib
+	    ARCHIVE DESTINATION lib
+	    FRAMEWORK DESTINATION /Library/Frameworks
+	    PUBLIC_HEADER DESTINATION include
+	    INCLUDES DESTINATION include)
+
+        #CPack configurtion
+        SET(CPACK_GENERATOR "DEB" "RPM")
+        SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+        SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPQ manipulation library")
+        SET(CPACK_PACKAGE_VENDOR "Ladislav Zezula")
+        SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+        SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+        SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+        SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+        SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
+
+        #DEB configuration
+        SET(CPACK_DEBIAN_PACKAGE_SECTION "libs")
+        SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.zezula.net/en/mpq/stormlib.html")
+        SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "imbacen@gmail.com")
+        SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+        SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g,bzip2")
+
+        #RPM configuration
+        SET(CPACK_RPM_PACKAGE_RELEASE 1)
+        SET(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+        SET(CPACK_RPM_PACKAGE_GROUP "${PROJECT_NAME}")
+        SET(CPACK_RPM_PACKAGE_URL "http://www.zezula.net/en/mpq/stormlib.html")
+        SET(CPACK_RPM_PACKAGE_REQUIRES "zlib,bzip2")
+
+        INCLUDE(CPack)
+endif()
+
+if(STORM_BUILD_TESTS)
+    add_executable(StormLib_test ${TEST_SRC_FILES})
+    target_link_libraries(StormLib_test ${LIBRARY_NAME})
+    install(TARGETS StormLib_test RUNTIME DESTINATION bin)
+endif()

StormLib/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.zezula.${PRODUCT_NAME:rfc1034Identifier}</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>8.01</string>
+</dict>
+</plist>

StormLib/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 1999-2013 Ladislav Zezula
+
+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.

StormLib/PostBuild.bat

@@ -0,0 +1,34 @@
+@echo off
+rem Post-build batch for StormLib project
+rem Called as PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) [vs2008]
+rem Example: PostBuild.bat StormLib_dll x64 Debug vs2008
+
+rem Select build type
+if "%1" == "StormLib_dll" goto PostBuild_DLL
+if "%1" == "StormLib"     goto PostBuild_LIB
+goto:eof
+
+:PostBuild_DLL
+
+rem Build steps for the DLL. On 32-bit Release version, increment the build number
+if not "x%2" == "xWin32" goto:eof
+if not "x%3" == "xRelease" goto:eof
+PostBuild.exe .\src\DllMain.rc
+goto:eof
+
+:PostBuild_LIB
+
+rem Set target folders
+if "x%2" == "xWin32"  set TARGET_DIR_LEVEL2=lib32
+if "x%2" == "xx64"    set TARGET_DIR_LEVEL2=lib64
+if "x%4" == "xvs2008" set TARGET_DIR_LEVEL3=vs2008
+
+rem Check & create target folder structure
+if not exist ..\aaa goto:eof
+if not exist ..\aaa\%TARGET_DIR_LEVEL2% md ..\aaa\%TARGET_DIR_LEVEL2%
+if not exist ..\aaa\%TARGET_DIR_LEVEL2%\%TARGET_DIR_LEVEL3% md ..\aaa\%TARGET_DIR_LEVEL2%\%TARGET_DIR_LEVEL3%
+
+rem Copy include and LIB files to the target folder
+copy /Y .\src\StormLib.h  ..\aaa\inc >nul
+copy /Y .\src\StormPort.h ..\aaa\inc >nul
+copy /Y .\bin\%1\%2\%3\StormLib???.lib ..\aaa\%TARGET_DIR_LEVEL2%\%TARGET_DIR_LEVEL3% >nul

StormLib/Premake5.lua

@@ -0,0 +1,132 @@
+
+solution 'StormLib'
+    location 'build'
+    language 'C++'
+    configurations { 'Debug', 'Release', }
+    platforms { 'x32', 'x64' }
+
+    targetdir 'bin'
+    objdir 'bin'
+
+    files {
+        'src/**.h',
+        'src/**.c',
+        'src/**.cpp',
+        'doc/*.txt',
+    }
+
+    removefiles {
+        'src/adpcm/*_old.*',
+        'src/huffman/*_old.*',
+        'src/huffman/huff_patch.*',
+        'src/pklib/crc32.c',
+        'src/zlib/compress.c',
+    }
+	
+    filter 'configurations:Debug*'
+        flags { 'Symbols' }
+        defines { '_DEBUG' }
+        optimize 'Debug'
+
+    filter 'configurations:Release*'
+        defines { 'NDEBUG' }
+        optimize 'Full'
+
+    filter 'system:windows'
+        links { 'wininet', }
+        defines { 'WINDOWS', '_WINDOWS' }
+
+    filter { 'system:windows', 'platforms:x32' }
+        defines { 'WIN32', '_WIN32' }
+
+    filter { 'system:windows', 'platforms:x64' }
+        defines { 'WIN64', '_WIN64' }
+
+    filter 'system:linux'
+        defines { '_7ZIP_ST', 'BZ_STRICT_ANSI' }
+        removefiles {
+            'src/lzma/C/LzFindMt.*',
+            'src/lzma/C/Threads.*',
+        }
+
+--------------------------------------------------------------------------------
+
+project 'StormLib'
+    kind 'StaticLib'
+
+    removefiles 'src/SBaseDumpData.cpp'
+
+    configurations {
+        'DebugAD',      -- Debug Ansi Dynamic
+        'DebugAS',      -- Debug Ansi Static
+        'DebugUD',      -- Debug Unicode Dynamic
+        'DebugUS',      -- Debug Unicode Static
+        'ReleaseAD',    -- Release Ansi Dynamic
+        'ReleaseAS',    -- Release Ansi Static
+        'ReleaseUD',    -- Release Unicode Dynamic'
+        'ReleaseUS',    -- Release Unicode Static
+    }
+
+    configmap {
+        ['Debug']   = 'DebugUS',
+        ['Release'] = 'ReleaseUS',
+    }
+
+    filter 'configurations:*S'
+        flags { 'StaticRuntime' }
+
+    filter { 'configurations:*U*', 'action:vs*' }
+        flags { 'Unicode' }
+
+    filter { 'configurations:*U*', 'not action:vs*' }
+        defines { 'UNICODE', '_UNICODE' }
+
+    filter 'DebugAD'
+        targetsuffix 'DAD'
+    filter 'ReleaseAD'
+        targetsuffix 'RAD'
+    filter 'DebugAS'
+        targetsuffix 'DAS'
+    filter 'ReleaseAS'
+        targetsuffix 'RAS'
+    filter 'DebugUD'
+        targetsuffix 'DUD'
+    filter 'ReleaseUD'
+        targetsuffix 'RUD'
+    filter 'DebugUS'
+        targetsuffix 'DUS'
+    filter 'ReleaseUS'
+        targetsuffix 'RUS'
+
+--------------------------------------------------------------------------------
+
+project 'StormLib_dll'
+    kind 'SharedLib'
+
+    targetname 'Stormlib'
+
+    files {
+        'stormlib_dll/DllMain.c',
+        'stormlib_dll/StormLib.def',
+    }
+
+    removefiles 'src/SBaseDumpData.cpp'
+
+    filter { 'system:windows', 'action:gmake' }
+        linkoptions {
+            '-Xlinker --enable-stdcall-fixup',
+            '../stormlib_dll/StormLib.def',
+        }
+
+    filter 'Debug'
+        targetsuffix '_d'
+
+--------------------------------------------------------------------------------
+
+project 'StormLib_test'
+    kind 'ConsoleApp'
+
+    files {
+        'test/StormTest.cpp',
+    }
+

StormLib/Publish.bat

@@ -0,0 +1,25 @@
+@echo off
+rem This BAT file updates the ZIP file that is to be uploaded to web
+rem Only use when both 32-bit and 64-bit are properly compiled
+
+set STORMLIB_NAME=stormlib-9.00
+
+echo Creating %STORMLIB_NAME%.zip ...
+cd \Ladik\Appdir
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\doc\*
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\src\*
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\storm_dll\*
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\StormLib.xcodeproj\*
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\stormlib_dll\*
+zip.exe -ur9 ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\test\*
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\CMakeLists.txt
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\makefile.*
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\Info.plist
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\*.bat
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\*.sln
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\*.vcproj
+zip.exe -u9  ..\WWW\web\download\%STORMLIB_NAME%.zip StormLib\*.vcxproj
+echo.
+
+echo Press any key to exit ...
+pause >nul

StormLib/README.md

@@ -0,0 +1,39 @@
+# StormLib
+
+This is official repository for the StomLib library, an open-source project that can work with Blizzard MPQ archives.
+
+## Installation and basic usage
+### Linux
+1. Download latest release
+2. Install StormLib:
+```
+$ cd <path-to-StormLib>
+$ cmake CMakeLists.txt
+$ make
+$ make install
+```
+3. Include StormLib in your project: `#include <StormLib.h>`
+4. Make sure you compile your project with `-lstorm -lz -lbz2`
+
+### Windows (Visual Studio 2008)
+1. Download the latest release of StormLib
+2. Open the solution file `StormLib_vs08.sln` in Visual Studio 2008
+3. Choose "Build / Batch Build" and select every build of "StormLib"
+4. Choose "Rebuild"
+5. The result libraries are in `.\bin\Win32` and `.\bin\x64`
+
+### Windows (Visual Studio 2017 or 2019)
+0. Make sure you have SDK 10.0.17134.0 installed
+1. Download the latest release of StormLib
+2. Open the solution file `StormLib_vs19.sln` in Visual Studio 2017/2019
+3. Choose "Build / Batch Build" and select every build of "StormLib"
+4. Choose "Rebuild"
+5. The result libraries are in `.\bin\Win32` and `.\bin\x64`
+
+### Windows (Test Project)
+1. Include the main StormLib header: `#include <StormLib.h>`
+2. Set the correct library directory for StormLibXYZ.lib:
+   * X: D = Debug, R = Release
+   * Y: A = ANSI build, U = Unicode build
+   * Z: S = Using static CRT library, D = Using Dynamic CRT library
+3. Rebuild

StormLib/StormLib.kdev4

@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=StormLib

StormLib/StormLib_vs08.sln

@@ -0,0 +1,139 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs08.vcproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs08_dll.vcproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs08_test.vcproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		DebugAD|Win32 = DebugAD|Win32
+		DebugAD|x64 = DebugAD|x64
+		DebugAS|Win32 = DebugAS|Win32
+		DebugAS|x64 = DebugAS|x64
+		DebugUD|Win32 = DebugUD|Win32
+		DebugUD|x64 = DebugUD|x64
+		DebugUS|Win32 = DebugUS|Win32
+		DebugUS|x64 = DebugUS|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseAD|Win32 = ReleaseAD|Win32
+		ReleaseAD|x64 = ReleaseAD|x64
+		ReleaseAS|Win32 = ReleaseAS|Win32
+		ReleaseAS|x64 = ReleaseAS|x64
+		ReleaseUD|Win32 = ReleaseUD|Win32
+		ReleaseUD|x64 = ReleaseUD|x64
+		ReleaseUS|Win32 = ReleaseUS|Win32
+		ReleaseUS|x64 = ReleaseUS|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.ActiveCfg = DebugUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.Build.0 = DebugUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.ActiveCfg = DebugUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.Build.0 = DebugUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.ActiveCfg = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.Build.0 = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.Build.0 = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.ActiveCfg = ReleaseUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.Build.0 = ReleaseUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.ActiveCfg = ReleaseUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.Build.0 = ReleaseUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.ActiveCfg = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.Build.0 = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.Build.0 = ReleaseUS|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|Win32.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|Win32.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|Win32.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|Win32.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|Win32.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|Win32.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|Win32.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|Win32.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|Win32.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|Win32.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|Win32.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|Win32.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

StormLib/StormLib_vs19.sln

@@ -0,0 +1,162 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2050
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs19_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs19_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		DebugAD|Win32 = DebugAD|Win32
+		DebugAD|x64 = DebugAD|x64
+		DebugAS|Win32 = DebugAS|Win32
+		DebugAS|x64 = DebugAS|x64
+		DebugUD|Win32 = DebugUD|Win32
+		DebugUD|x64 = DebugUD|x64
+		DebugUS|Win32 = DebugUS|Win32
+		DebugUS|x64 = DebugUS|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseAD|Win32 = ReleaseAD|Win32
+		ReleaseAD|x64 = ReleaseAD|x64
+		ReleaseAS|Win32 = ReleaseAS|Win32
+		ReleaseAS|x64 = ReleaseAS|x64
+		ReleaseUD|Win32 = ReleaseUD|Win32
+		ReleaseUD|x64 = ReleaseUD|x64
+		ReleaseUS|Win32 = ReleaseUS|Win32
+		ReleaseUS|x64 = ReleaseUS|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.ActiveCfg = DebugUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.Build.0 = DebugUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.ActiveCfg = DebugUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.Build.0 = DebugUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.ActiveCfg = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.Build.0 = DebugUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.ActiveCfg = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.Build.0 = DebugUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.ActiveCfg = ReleaseUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.Build.0 = ReleaseUD|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.ActiveCfg = ReleaseUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.Build.0 = ReleaseUD|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.ActiveCfg = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.Build.0 = ReleaseUS|Win32
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.ActiveCfg = ReleaseUS|x64
+		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.Build.0 = ReleaseUS|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|Win32.ActiveCfg = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|Win32.Build.0 = Debug|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.ActiveCfg = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.Build.0 = Debug|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.Build.0 = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|Win32.ActiveCfg = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|Win32.Build.0 = Release|Win32
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.ActiveCfg = Release|x64
+		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|Win32.ActiveCfg = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|Win32.Build.0 = Debug|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.ActiveCfg = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.Build.0 = Debug|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.Build.0 = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|Win32.ActiveCfg = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|Win32.Build.0 = Release|Win32
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.ActiveCfg = Release|x64
+		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {04583FA5-D423-4B0D-A42B-F7D44C70991C}
+	EndGlobalSection
+EndGlobal

StormLib/StormLib_vs19.vcxproj.filters

@@ -0,0 +1,830 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Doc Files">
+      <UniqueIdentifier>{595d6bc1-89d0-4fb8-98f6-be35e73727c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{721663d8-8692-476f-b0fd-71fdadf69929}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{9cc24144-d198-4bd1-b941-b946bd61b982}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\adpcm">
+      <UniqueIdentifier>{be0080d3-fc04-4442-9e28-b4cc2641177d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\bzip2">
+      <UniqueIdentifier>{adb84a97-8a0c-4988-9473-452326110dff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\huffman">
+      <UniqueIdentifier>{87256d6a-e658-4f60-8759-6bff32a35eb2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt">
+      <UniqueIdentifier>{d730d7c1-2960-49d2-ba0d-d1a91dd08964}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\hashes">
+      <UniqueIdentifier>{13e5ccb1-06f1-4d10-bdc1-825b51c64dbf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\math">
+      <UniqueIdentifier>{73f7f025-7366-4d76-8d60-4327e00b9d18}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\misc">
+      <UniqueIdentifier>{be21c641-7727-4d7b-919e-c895d801db17}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk">
+      <UniqueIdentifier>{694a7758-f909-4b8e-aa13-4d06a8c70eff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\asn1">
+      <UniqueIdentifier>{3f01cae6-5676-4f33-bb38-215341eedfc4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\ecc">
+      <UniqueIdentifier>{63d75851-c430-4c76-aa08-3398523aab4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
+      <UniqueIdentifier>{11175e9e-e9f1-405c-961b-933e72503cdd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\rsa">
+      <UniqueIdentifier>{e30512f4-bdf8-4460-823d-475bd8f08d28}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtommath">
+      <UniqueIdentifier>{d2889ef6-3f12-4a9b-8624-8d061748ff03}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\lzma">
+      <UniqueIdentifier>{02c6dfb8-4a58-46c5-bb35-69ba6215a3a6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pklib">
+      <UniqueIdentifier>{563829a0-aaa3-4af2-88a2-8c6445d2754b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\sparse">
+      <UniqueIdentifier>{e82b0d03-77ff-46dc-b5a4-5b469224222a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{cb92df18-9435-4db9-997a-e0e7d532cd26}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\jenkins">
+      <UniqueIdentifier>{2920175c-439c-4fd5-b94e-8cf1d3aaadd3}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="doc\History.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 0.9.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 1.0.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\StormCommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\adpcm\adpcm.h">
+      <Filter>Source Files\adpcm</Filter>
+    </ClInclude>
+    <ClInclude Include="src\huffman\huff.h">
+      <Filter>Source Files\huffman</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pklib\pklib.h">
+      <Filter>Source Files\pklib</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sparse\sparse.h">
+      <Filter>Source Files\sparse</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jenkins\lookup.h">
+      <Filter>Source Files\jenkins</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormPort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\FileStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseFileTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SCompression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAddFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAttributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCompactArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCreateArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileExtractFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileFindFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileGetFileInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileListFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenFileEx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFilePatchArchives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileReadFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileVerify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\adpcm\adpcm.cpp">
+      <Filter>Source Files\adpcm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\blocksort.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\bzlib.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\compress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\crctable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\decompress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\huffman.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\randtable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\huffman\huff.cpp">
+      <Filter>Source Files\huffman</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_abs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_and.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exch.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fread.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_grow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_neg.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_or.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rand.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_submod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_xor.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_zero.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_prime_tab.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_reverse.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bncore.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFind.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFindMt.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaDec.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaEnc.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\Threads.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\explode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\implode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sparse\sparse.cpp">
+      <Filter>Source Files\sparse</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jenkins\lookup3.c">
+      <Filter>Source Files\jenkins</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\compress_zlib.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseSubTypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

StormLib/StormLib_vs19_dll.vcxproj

@@ -0,0 +1,537 @@
+<?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="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>StormLib_dll</ProjectName>
+    <ProjectGuid>{CB385198-50B1-4CF4-883B-11F042DED6AA}</ProjectGuid>
+    <RootNamespace>StormLib_dll</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>StormLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>StormLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>StormLib</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>StormLib</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
+      <ModuleDefinitionFile>.\src\DllMain.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="doc\History.txt" />
+    <Text Include="doc\The MoPaQ File Format 0.9.txt" />
+    <Text Include="doc\The MoPaQ File Format 1.0.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\adpcm\adpcm.h" />
+    <ClInclude Include="src\huffman\huff.h" />
+    <ClInclude Include="src\jenkins\lookup.h" />
+    <ClInclude Include="src\pklib\pklib.h" />
+    <ClInclude Include="src\sparse\sparse.h" />
+    <ClInclude Include="src\StormCommon.h" />
+    <ClInclude Include="src\StormLib.h" />
+    <ClInclude Include="src\StormPort.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\adpcm\adpcm.cpp" />
+    <ClCompile Include="src\bzip2\blocksort.c" />
+    <ClCompile Include="src\bzip2\bzlib.c" />
+    <ClCompile Include="src\bzip2\compress.c" />
+    <ClCompile Include="src\bzip2\crctable.c" />
+    <ClCompile Include="src\bzip2\decompress.c" />
+    <ClCompile Include="src\bzip2\huffman.c" />
+    <ClCompile Include="src\bzip2\randtable.c" />
+    <ClCompile Include="src\FileStream.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\huffman\huff.cpp" />
+    <ClCompile Include="src\jenkins\lookup3.c" />
+    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
+    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
+    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
+    <ClCompile Include="src\libtommath\bncore.c" />
+    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
+    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
+    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
+    <ClCompile Include="src\libtommath\bn_mp_add.c" />
+    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_and.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
+    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
+    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
+    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
+    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
+    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
+    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
+    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
+    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
+    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
+    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
+    <ClCompile Include="src\libtommath\bn_mp_or.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
+    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
+    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_set.c" />
+    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
+    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
+    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
+    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
+    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
+    <ClCompile Include="src\libtommath\bn_reverse.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
+    <ClCompile Include="src\lzma\C\LzFind.c" />
+    <ClCompile Include="src\lzma\C\LzFindMt.c" />
+    <ClCompile Include="src\lzma\C\LzmaDec.c" />
+    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
+    <ClCompile Include="src\lzma\C\Threads.c" />
+    <ClCompile Include="src\pklib\explode.c" />
+    <ClCompile Include="src\pklib\implode.c" />
+    <ClCompile Include="src\SBaseCommon.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SBaseFileTable.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SBaseSubTypes.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SCompression.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileAddFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileAttributes.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileCompactArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileCreateArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileExtractFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileFindFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileGetFileInfo.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileListFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenFileEx.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFilePatchArchives.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileReadFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileVerify.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\sparse\sparse.cpp" />
+    <ClCompile Include="src\zlib\adler32.c" />
+    <ClCompile Include="src\zlib\compress_zlib.c" />
+    <ClCompile Include="src\zlib\crc32.c" />
+    <ClCompile Include="src\zlib\deflate.c" />
+    <ClCompile Include="src\zlib\inffast.c" />
+    <ClCompile Include="src\zlib\inflate.c" />
+    <ClCompile Include="src\zlib\inftrees.c" />
+    <ClCompile Include="src\zlib\trees.c" />
+    <ClCompile Include="src\zlib\zutil.c" />
+    <ClCompile Include="src\DllMain.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\DllMain.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

StormLib/StormLib_vs19_dll.vcxproj.filters

@@ -0,0 +1,838 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Doc Files">
+      <UniqueIdentifier>{b352ea2c-4169-4b60-85bc-82eadd5a9d2e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9171b211-949a-4dc1-a028-edf0a2ed4605}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{712a20a0-c7a8-4e56-947b-2cf030bbb287}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\adpcm">
+      <UniqueIdentifier>{83502600-f49c-43b1-afe6-038d3560a859}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\bzip2">
+      <UniqueIdentifier>{ea8b08a3-5c21-48e0-b75f-78eaa2adbc22}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\huffman">
+      <UniqueIdentifier>{593ac5e7-fe06-42b8-8025-e3bd725f95d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt">
+      <UniqueIdentifier>{9887a885-78fa-4164-80b9-9db6b0c11f86}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\hashes">
+      <UniqueIdentifier>{7db62947-d38d-48e9-8b52-4cad226394a6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\math">
+      <UniqueIdentifier>{b435fecf-9a65-4f2e-8d64-7dfc70de3137}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\misc">
+      <UniqueIdentifier>{d8ad7878-9e42-427a-b5b6-ae51d92b92cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk">
+      <UniqueIdentifier>{07806629-c061-49ed-8212-0585d25fae23}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\asn1">
+      <UniqueIdentifier>{ca554d9f-b602-452a-971e-86b537ee2ad1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\ecc">
+      <UniqueIdentifier>{46e1697c-e6c2-4a8c-b4d2-0142311bb48b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
+      <UniqueIdentifier>{99279e07-2e33-44c9-8f37-0b810ee4ba25}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\rsa">
+      <UniqueIdentifier>{04fbcfe0-3023-4fa0-8e36-26ab024a4abf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtommath">
+      <UniqueIdentifier>{4720c7a0-f4aa-4737-978c-9efe8b429906}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\lzma">
+      <UniqueIdentifier>{856c9964-4d85-40e9-8cbd-f4c672c07780}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pklib">
+      <UniqueIdentifier>{7ad3c876-768a-45bc-85b1-38cd492814ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\sparse">
+      <UniqueIdentifier>{22e86a97-80e9-45a0-ac8e-70d7ea848f35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{7b2ea923-8454-4073-bb9c-85de0f66caa1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\jenkins">
+      <UniqueIdentifier>{5404ec38-706a-47f8-97b7-941c2574ddf2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="doc\History.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 0.9.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 1.0.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\StormCommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormPort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\adpcm\adpcm.h">
+      <Filter>Source Files\adpcm</Filter>
+    </ClInclude>
+    <ClInclude Include="src\huffman\huff.h">
+      <Filter>Source Files\huffman</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pklib\pklib.h">
+      <Filter>Source Files\pklib</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sparse\sparse.h">
+      <Filter>Source Files\sparse</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jenkins\lookup.h">
+      <Filter>Source Files\jenkins</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\FileStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseFileTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseSubTypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SCompression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAddFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAttributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCompactArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCreateArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileExtractFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileFindFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileGetFileInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileListFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenFileEx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFilePatchArchives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileReadFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileVerify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\adpcm\adpcm.cpp">
+      <Filter>Source Files\adpcm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\blocksort.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\bzlib.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\compress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\crctable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\decompress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\huffman.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\randtable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\huffman\huff.cpp">
+      <Filter>Source Files\huffman</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_abs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_and.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exch.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fread.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_grow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_neg.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_or.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rand.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_submod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_xor.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_zero.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_prime_tab.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_reverse.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bncore.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFind.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFindMt.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaDec.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaEnc.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\Threads.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\explode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\implode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sparse\sparse.cpp">
+      <Filter>Source Files\sparse</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\compress_zlib.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jenkins\lookup3.c">
+      <Filter>Source Files\jenkins</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DllMain.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\DllMain.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

StormLib/StormLib_vs19_test.vcxproj

@@ -0,0 +1,549 @@
+<?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="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>StormLib_test</ProjectName>
+    <ProjectGuid>{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}</ProjectGuid>
+    <RootNamespace>StormLib_test</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
+    <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX64</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level1</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention />
+      <TargetMachine>MachineX64</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="doc\History.txt" />
+    <Text Include="doc\The MoPaQ File Format 0.9.txt" />
+    <Text Include="doc\The MoPaQ File Format 1.0.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\adpcm\adpcm.h" />
+    <ClInclude Include="src\FileStream.h" />
+    <ClInclude Include="src\huffman\huff.h" />
+    <ClInclude Include="src\jenkins\lookup.h" />
+    <ClInclude Include="src\pklib\pklib.h" />
+    <ClInclude Include="src\sparse\sparse.h" />
+    <ClInclude Include="src\StormCommon.h" />
+    <ClInclude Include="src\StormLib.h" />
+    <ClInclude Include="src\StormPort.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\adpcm\adpcm.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\blocksort.c" />
+    <ClCompile Include="src\bzip2\bzlib.c" />
+    <ClCompile Include="src\bzip2\compress.c" />
+    <ClCompile Include="src\bzip2\crctable.c" />
+    <ClCompile Include="src\bzip2\decompress.c" />
+    <ClCompile Include="src\bzip2\huffman.c" />
+    <ClCompile Include="src\bzip2\randtable.c" />
+    <ClCompile Include="src\FileStream.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\huffman\huff.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\jenkins\lookup3.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
+    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
+    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
+    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
+    <ClCompile Include="src\libtommath\bncore.c" />
+    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
+    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
+    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
+    <ClCompile Include="src\libtommath\bn_mp_add.c" />
+    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_and.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
+    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
+    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
+    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
+    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
+    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
+    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
+    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
+    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
+    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
+    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
+    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
+    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
+    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
+    <ClCompile Include="src\libtommath\bn_mp_or.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
+    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
+    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
+    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
+    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
+    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
+    <ClCompile Include="src\libtommath\bn_mp_set.c" />
+    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
+    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
+    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
+    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
+    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
+    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
+    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
+    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
+    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
+    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
+    <ClCompile Include="src\libtommath\bn_reverse.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
+    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
+    <ClCompile Include="src\lzma\C\LzFind.c" />
+    <ClCompile Include="src\lzma\C\LzFindMt.c" />
+    <ClCompile Include="src\lzma\C\LzmaDec.c" />
+    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
+    <ClCompile Include="src\lzma\C\Threads.c" />
+    <ClCompile Include="src\pklib\explode.c" />
+    <ClCompile Include="src\pklib\implode.c" />
+    <ClCompile Include="src\SBaseCommon.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SBaseDumpData.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SBaseFileTable.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SBaseSubTypes.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SCompression.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileAddFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileAttributes.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileCompactArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileCreateArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileExtractFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileFindFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileGetFileInfo.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileListFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenArchive.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenFileEx.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFilePatchArchives.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileReadFile.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\SFileVerify.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\sparse\sparse.cpp" />
+    <ClCompile Include="src\zlib\adler32.c" />
+    <ClCompile Include="src\zlib\compress_zlib.c" />
+    <ClCompile Include="src\zlib\crc32.c" />
+    <ClCompile Include="src\zlib\deflate.c" />
+    <ClCompile Include="src\zlib\inffast.c" />
+    <ClCompile Include="src\zlib\inflate.c" />
+    <ClCompile Include="src\zlib\inftrees.c" />
+    <ClCompile Include="src\zlib\trees.c" />
+    <ClCompile Include="src\zlib\zutil.c" />
+    <ClCompile Include="test\StormTest.cpp">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+  </ImportGroup>
+</Project>

StormLib/StormLib_vs19_test.vcxproj.filters

@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Doc Files">
+      <UniqueIdentifier>{1dbbb48c-9db9-4fdb-a903-223ed233cc21}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{ab878eef-1074-4594-bac5-272c05774bd8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{640f063a-5028-4ba1-9007-96d98a634561}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\adpcm">
+      <UniqueIdentifier>{6e8cfdab-fca3-4737-8905-6154bc657e15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\bzip2">
+      <UniqueIdentifier>{a810fdb6-0d21-4279-8e39-b2de644170c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\huffman">
+      <UniqueIdentifier>{7861b4fb-1471-4573-92ea-08c06dc14b93}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt">
+      <UniqueIdentifier>{8ba6c5c7-3ad0-44e6-8829-5020fce13d49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\hashes">
+      <UniqueIdentifier>{92cb0c1d-86f0-4735-9e4e-b07df664c359}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\math">
+      <UniqueIdentifier>{f7fb3d55-94af-4a6e-be7b-76cb909e7325}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\misc">
+      <UniqueIdentifier>{337159fe-94a7-45a8-a91b-fa8b9d06b2ae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk">
+      <UniqueIdentifier>{359bb3d3-71d5-47e7-967a-1fada7882e4d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\asn1">
+      <UniqueIdentifier>{775dbb7e-ef06-4660-9d84-50ff2557ef54}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\ecc">
+      <UniqueIdentifier>{2e5d39cc-482c-4775-8830-79f8314e72e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
+      <UniqueIdentifier>{1e0ef267-228e-4c59-8d88-e3b33aeaff49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtomcrypt\pk\rsa">
+      <UniqueIdentifier>{98330deb-0b92-4f02-8016-8a33dc5f5d29}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libtommath">
+      <UniqueIdentifier>{fa78c716-784a-43a0-a548-db413431973b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\lzma">
+      <UniqueIdentifier>{5308566b-d3fd-4561-a7fb-982a63662793}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pklib">
+      <UniqueIdentifier>{d5371a5f-1630-4e79-9e7e-1ef654a2ddec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\sparse">
+      <UniqueIdentifier>{c2971fba-aff1-42ab-9f4f-71707edabf77}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{4f4fe3d6-6f2b-4c83-9cf9-f1d108ecd854}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\jenkins">
+      <UniqueIdentifier>{5aaea51e-4b7c-4a35-b35c-96c2fc7750f1}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="doc\History.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 0.9.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+    <Text Include="doc\The MoPaQ File Format 1.0.txt">
+      <Filter>Doc Files</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\FileStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormCommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StormPort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\adpcm\adpcm.h">
+      <Filter>Source Files\adpcm</Filter>
+    </ClInclude>
+    <ClInclude Include="src\huffman\huff.h">
+      <Filter>Source Files\huffman</Filter>
+    </ClInclude>
+    <ClInclude Include="src\pklib\pklib.h">
+      <Filter>Source Files\pklib</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sparse\sparse.h">
+      <Filter>Source Files\sparse</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jenkins\lookup.h">
+      <Filter>Source Files\jenkins</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\FileStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseDumpData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseFileTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SBaseSubTypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SCompression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAddFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileAttributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCompactArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileCreateArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileExtractFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileFindFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileGetFileInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileListFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenArchive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileOpenFileEx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFilePatchArchives.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileReadFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SFileVerify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="test\StormTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\adpcm\adpcm.cpp">
+      <Filter>Source Files\adpcm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\blocksort.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\bzlib.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\compress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\crctable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\decompress.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\huffman.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\bzip2\randtable.c">
+      <Filter>Source Files\bzip2</Filter>
+    </ClCompile>
+    <ClCompile Include="src\huffman\huff.cpp">
+      <Filter>Source Files\huffman</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
+      <Filter>Source Files\libtomcrypt\hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
+      <Filter>Source Files\libtomcrypt\math</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
+      <Filter>Source Files\libtomcrypt\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
+      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
+      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
+      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
+      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_abs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_and.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exch.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fread.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_grow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_neg.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_or.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rand.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_submod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_xor.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_mp_zero.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_prime_tab.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_reverse.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\libtommath\bncore.c">
+      <Filter>Source Files\libtommath</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFind.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzFindMt.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaDec.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\LzmaEnc.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lzma\C\Threads.c">
+      <Filter>Source Files\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\explode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pklib\implode.c">
+      <Filter>Source Files\pklib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sparse\sparse.cpp">
+      <Filter>Source Files\sparse</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\compress_zlib.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jenkins\lookup3.c">
+      <Filter>Source Files\jenkins</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

StormLib/doc/History.txt

@@ -0,0 +1,78 @@
+
+  StormLib history
+  ================
+
+ Version 9.11
+
+ - Fixed bug in processing HET table.
+
+ Version 9.10
+
+ - Support for weak-signing
+ - Anti-protector: New Spazzler
+
+ Version 9.00
+
+ - Support for streaming (master-mirror)
+ - Support for multi-file MPQs used by some WoW versions
+ - Opening maps protected by Spazzler protector
+ - Opening maps protected by BOBA protector
+
+ Version 8.02
+
+ - Support for UNICODE encoding for on-disk files
+ - Optimized file deleting
+
+ Version 8.01
+
+ - SFileFindFirstFile and SFileFindNextFile no longer find files that have
+   patch file in the oldest MPQ in the patch chain
+ - Write support for MPQs version 4
+
+ Version 8.00
+
+ - Updated support for protected maps from Warcraft III
+
+ Version 7.11
+ 
+ - Support for MPQs v 3.0 (WOW-Cataclysm BETA)
+ - StormLib now deals properly with files that have MPQ_SECTOR_CHECKSUM missing,
+   but have sector checksum entry present in the sector offset table
+
+ Version 7.10
+ 
+ - Support for partial MPQs ("interface.MPQ.part")
+ - The only operation that is externally allowed to do with internal files
+   ("(listfile)", "(attributes)" and "(signature)") is reading. Attempt to modify any of the file
+   fails and GetLastError returns ERROR_INTERNAL_FILE
+ - Fixed memory leak that has occured when writing more than one sector to the file at once
+
+ Version 7.01
+ 
+ - Support for adding files from memory
+ - Fixed improper validation of handles to MPQ file and MPQ archive
+ - Fixed bug where StormLib didn't save CRC32 of the file when added to archive
+
+ Version 7.00
+
+ - Properly deals with MPQs protected by w3xMaster
+ - Major rewrite
+ - Fixed support for (attributes)
+ - Added file verification
+ - Added MPQ signature verification
+
+ Version 6.22
+
+ - Properly deals with MPQs protected by w3xMaster
+
+ Version 6.21
+
+ - SFileRenameFile now properly re-crypts the file if necessary.
+ - SFileFindFirstFile correctly deals with deleted files
+
+ Version 6.20
+
+ - Fixed lots of bugs when processing files with same names but different locales
+ - Fixed bugs when repeately extracts the same file with MPQ_FILE_SINGLE_UNIT flag
+ - Added SFileFlushArchive
+ - Fixed issue opening AVI files renamed to MPQ using SFileCreateArchiveEx

StormLib/doc/The MoPaQ File Format 0.9.txt

@@ -0,0 +1,318 @@
+THE MOPAQ ARCHIVE FORMAT
+v0.9 (Thursday, June 30, 2005)
+by Justin Olbrantz(Quantam)
+
+Distribution and reproduction of this specification are allowed without limitation, as long as it is not altered. Quoting
+in other works is freely allowed, as long as the source and author of the quote is stated.
+
+TABLE OF CONTENTS
+1. Introduction to the MoPaQ Format
+2. The MoPaQ Format
+	2.1 General Archive Layout
+	2.2 Archive Header
+	2.3 Block Table
+	2.4 Hash Table
+	2.5 File Data
+	2.6 Listfile
+	2.7 Extended Attributes
+	2.8 Weak (Old) Digital Signature
+	2.9 Strong (New) Digital Signature
+3. Algorithm Source Code
+	3.1 Encryption/Decryption
+	3.2 Hashing
+	3.3 Conversion of FILETIME and time_t
+
+1. INTRODUCTION TO THE MOPAQ FORMAT
+The MoPaQ (or MPQ) format is an archive file format designed by Mike O'Brien (hence the name Mike O'brien PaCK) at Blizzard
+Entertainment. The format has been used in all Blizzard games since (and including) Diablo. It is heavily optimized to be
+a read-only game archive format, and excels at this role. 
+
+The Blizzard MoPaQ-reading functions are contained in the Storm module, which my be either statically or dynamically linked.
+The Blizzard MoPaQ-writing functions are contained in the MPQAPI module, which is always statically linked.
+
+2. THE MOPAQ FORMAT
+All numbers in the MoPaQ format are in little endian. Data types are listed either as int (integer, the number of bits specified),
+byte (8 bits), and char (bytes which contain ASCII characters). All sizes and offsets are in bytes, unless specified otherwise.
+Structure members are listed in the following general form:
+offset from the beginning of the structure: data type(array size) member name : member description
+
+2.1 GENERAL ARCHIVE LAYOUT
+- Archive Header
+- File Data
+- File Data - Special Files
+- Hash Table
+- Block Table
+- Strong Digital signature
+
+This is the usual archive format, and is not absolutely essential. Some archives have been observed placing the hash table
+and file table after the archive header, and before the file data.
+
+2.2 ARCHIVE HEADER
+00h: char(4) Magic : Indicates that the file is a MoPaQ archive. Must be ASCII "MPQ" 1Ah.
+04h: int32 HeaderSize : Size of the archive header. Should be 32.
+08h: int32 ArchiveSize : Size of the whole archive, including the header. Does not include the strong digital signature, if present.
+This size is used, among other things, for determining the region to hash in computing the digital signature.
+0Ch: int16 Unknown : Unknown
+0Eh: int8 SectorSizeShift : Power of two exponent specifying the number of 512-byte disk sectors in each logical sector
+in the archive. The size of each logical sector the archive is 512 * 2^SectorSizeShift. Bugs in the Storm library dictate
+that this should always be 3 (4096 byte sectors).
+10h: int32 HashTableOffset : Offset to the beginning of the hash table, relative to the beginning of the archive.
+14h: int32 BlockTableOffset : Offset to the beginning of the block table, relative to the beginning of the archive.
+18h: int32 HashTableEntries : Number of entries in the hash table. Must be a power of two, and must be less than 2^16.
+1Ch: int32 BlockTableEntries : Number of entries in the block table.
+
+The archive header is the first structure in the archive, at archive offset 0, but the archive does not need to be at offset
+0 of the containing file. The offset of the archive in the file is referred to here as ArchiveOffset. If the archive is not
+at the beginning of the file, it must begin at a disk sector boundary (512 bytes). Early versions of Storm require that the
+archive be at the end of the containing file (ArchiveOffset + ArchiveSize = file size), but this is not required in newer
+versions (due to the strong digital signature not being considered a part of the archive).
+
+2.3 BLOCK TABLE
+The block table contains entries for each region in the archive. Regions may be either files or empty space, which may be
+overwritten by new files (typically this space is from deleted file data). The block table is encrypted, using the hash
+of "(block table)" as the key. Each entry is structured as follows:
+
+00h: int32 BlockOffset : Offset of the beginning of the block, relative to the beginning of the archive. Meaningless if the block size is 0.
+04h: int32 BlockSize : Size of the block in the archive.
+08h: int32 FileSize : Size of the file data stored in the block. Only valid if the block is a file, otherwise meaningless, and should be 0. If the file is compressed, this is the size of the uncompressed file data.
+0Ch: int32 Flags : Bit mask of the flags for the block. The following values are conclusively identified:
+	80000000h: Block is a file, and follows the file data format; otherwise, block is free space, and may be overwritten. If the block is not a file, all other flags should be cleared.
+	01000000h: File is stored as a single unit, rather than split into sectors.
+	00020000h: The file's encryption key is adjusted by the block offset and file size (explained in detail in the File Data section). File must be encrypted.
+	00010000h: File is encrypted.
+	00000200h: File is compressed. Mutually exclusive to file imploded.
+	00000100h: File is imploded. Mutually exclusive to file compressed.
+
+2.4 HASH TABLE
+Instead of storing file names, for quick access MoPaQs use a fixed, power of two-size hash table of files in the archive. A file is uniquely identified by its file path, its language, and its platform. The home entry for a file in the hash table is computed as a hash of the file path. In the event of a collision (the home entry is occupied by another file), progressive overflow is used, and the file is placed in the next available hash table entry. Searches for a desired file in the hash table proceed from the home entry for the file until either the file is found, the entire hash table is searched, or an empty hash table entry (FileBlockIndex of FFFFFFFFh) is encountered. The hash table is encrypted using the hash of "(hash table)" as the key. Each entry is structured as follows:
+
+00h: int32 FilePathHashA : The hash of the file path, using method A.
+04h: int32 FilePathHashB : The hash of the file path, using method B.
+08h: int16 Language : The language of the file. This is a Windows LANGID data type, and uses the same values. 0 indicates the default language (American English), or that the file is language-neutral.
+0Ah: int8 Platform : The platform the file is used for. 0 indicates the default platform. No other values have been observed.
+0Ch: int32 FileBlockIndex : If the hash table entry is valid, this is the index into the block table of the file. Otherwise, one of the following two values:
+	FFFFFFFFh: Hash table entry is empty, and has always been empty. Terminates searches for a given file.
+	FFFFFFFEh: Hash table entry is empty, but was valid at some point (in other words, the file was deleted). Does not terminate searches for a given file.
+
+2.5 FILE DATA
+00h: int32(SectorsInFile + 1) SectorOffsetTable : Offsets to the start of each sector's data, relative to the beginning of the file data. Not present if this information is calculatable (see details below).
+immediately following SectorOffsetTable: SectorData : Data of each sector in the file, packed end to end (see details below).
+
+Normally, file data is split up into sectors, for simple streaming. All sectors, save for the last, will contain as many bytes of file data as specified in the archive header's SectorSizeShift; the last sector may be smaller than this, depending on the size of the file data. This sector size is the size of the raw file data; if the file is compressed, the compressed sector will be smaller or the same size as the uncompressed sector size. Individual sectors in a compressed file may be stored uncompressed; this occurs if and only if the sector could not be compressed by the algorithm used (if the compressed sector size was greater than or equal to the size of the raw data), and is indicated by the sector's compressed size in SectorOffsetTable being equal to the uncompressed size of the sector (which may be calculated from the FileSize).
+
+If the sector is compressed (but not imploded), a bit mask byte of the compression algorithm(s) used to compress the sector is appended to the beginning of the compressed sector data. This additional byte counts towards the total size of the sector; if the size of the sector (including this byte) exceeds or matches the uncompressed size of the sector data, the sector will be stored uncompressed, and this byte omitted. Multiple compression algorithms may be used on the same sector; in this case, successive compression occurs in the order the algorithms are listed below, and decompression occurs in the opposite order. For implimentations of all of these algorithms, see StormLib.
+	40h: IMA ADPCM mono
+	80h: IMA ADPCM stereo
+	01h: Huffman encoded
+	02h: Deflated (see ZLib)
+	08h: Imploded (see PKWare Data Compression Library)
+	10h: BZip2 compressed (see BZip2)
+
+If the file is stored as a single unit (indicated in the file's Flags), there is effectively only a single sector, which
+contains the entire file.
+
+If the file is encrypted, each sector (after compression and appendage of the compression type byte, if applicable)
+is encrypted with the file's key. The base key for a file is determined by a hash of the file name stripped of the
+directory (i.e. the key for a file named "directory\file" would be computed as the hash of "file"). If this key is
+adjusted, as indicated in the file's Flags, the final key is calculated as ((base key + BlockOffset - ArchiveOffset)
+XOR FileSize) (StormLib - an open-source implementation of the MoPaQ reading and writing functions,
+by Ladislav Zezula - incorrectly uses an AND in place of the XOR). Each sector is encrypted using the key + the
+0-based index of the sector in the file. The SectorOffsetTable, if present, is encrypted using the key - 1.
+
+The SectorOffsetTable is omitted when the sizes and offsets of all sectors in the file are calculatable from the FileSize.
+This can happen in several circumstances. If the file is not compressed/imploded, then the size and offset of all sectors
+is known, based on the archive's SectorSizeShift. If the file is stored as a single unit compressed/imploded, then the
+SectorOffsetTable is omitted, as the single file "sector" corresponds to BlockSize and FileSize, as mentioned previously.
+Note that the SectorOffsetTable will always be present if the file is compressed/imploded and the file is not stored as
+a single unit, even if there is only a single sector in the file (the size of the file is less than or equal to the
+archive's sector size).
+
+2.6 LISTFILE
+The listfile is a very simple extension to the MoPaQ format that contains the file paths of (most) files in the archive.
+The languages and platforms of the files are not stored in the listfile. The listfile is contained in the file "(listfile)",
+and is simply a non-Unix-style text file with one file path on each line, lines terminated with the bytes 0Dh 0Ah. The file
+"(listfile)" may not be listed in the listfile.
+
+2.7 EXTENDED ATTRIBUTES
+The extended attributes are optional file attributes for files in the block table. These attributes were added at times after
+the MoPaQ format was already finalized, and it is not necessary for every archive to have all (or any) of the extended attributes.
+If an archive contains a given attribute, there will be an instance of that attribute for every block in the block table, although
+the attribute will be meaningless if the block is not a file. The order of the attributes for blocks correspond to the order of the
+blocks in the block table, and are of the same number. The attributes are stored in parallel arrays in the "(attributes)" file,
+in the archive. The attributes corresponding to this file need not be valid (and logically cannot be). Unlike all the other
+structures in the MoPaQ format, entries in the extended attributes are NOT guaranteed to be aligned. Also note that in some
+archives, malicious zeroing of the attributes has been observed, perhaps with the intent of breaking archive viewers. This
+file is structured as follows:
+
+00h: int32 Version : Specifies the extended attributes format version. For now, must be 100.
+04h: int32 AttributesPresent : Bit mask of the extended attributes present in the archive:
+	00000001h: File CRC32s.
+	00000002h: File timestamps.
+	00000004h: File MD5s.
+08h: int32(BlockTableEntries) CRC32s : CRC32s of the (uncompressed) file data for each block in the archive. Omitted if the
+archive does not have CRC32s. immediately after CRC32s: FILETIME(BlockTableEntries) Timestamps : Timestamps for each block
+in the archive. The format is that of the Windows FILETIME structure. Omitted if the archive does not have timestamps.
+immediately after Timestamps: MD5(BlockTableEntries) MD5s : MD5s of the (uncompressed) file data for each block in the archive.
+Omitted if the archive does not have MD5s.
+
+2.8 WEAK DIGITAL SIGNATURE
+The weak digital signature is a digital signature using Microsoft CryptoAPI. It is an implimentation of the RSASSA-PKCS1-v1_5
+digital signature protocol, using the MD5 hashing algorithm and a 512-bit (weak) RSA key (for more information about this
+protocol, see the RSA Labs PKCS1 specification). The public key and exponent are stored in a resource in Storm. The signature
+is stored uncompressed, unencrypted in the file "(signature)" in the archive. The archive is hashed from the beginning of the
+archive (ArchiveOffset in the containing file) to the end of the archive (the length indicated by ArchiveSize); the signature
+file is added to the archive before signing, and the space occupied by the file is considered to be all binary 0s during
+signing/verification. This file is structured as follows:
+
+00h: int32 Unknown : Must be 0.
+04h: int32 Unknown : must be 0.
+08h: int512 Signature : The digital signature. Like all other numbers in the MoPaQ format, this is stored in little-endian order.
+
+2.9 STRONG DIGITAL SIGNATURE
+The strong digital signature uses a simple proprietary implementation of RSA signing, using the SHA-1 hashing algorithm and
+a 2048-bit (strong) RSA key. The default public key and exponent are stored in Storm, but other keys may be used as well.
+The strong digital signature is stored immediately after the archive, in the containing file; the entire archive (ArchiveSize
+bytes, starting at ArchiveOffset in the containing file) is hashed as a single block. The signature has the following format:
+
+00h: char(4) Magic : Indicates the presence of a digital signature. Must be "NGIS" ("SIGN" backwards).
+04h: int2048 Signature : The digital signature, stored in little-endian format.
+
+When the Signature field is decrypted with the public key and exponent, and the result stored in little-endian order, it is structured as follows:
+
+00h: byte Padding : Must be 0Bh.
+01h: byte(235) Padding : Must be BBh.
+ECh: byte(20) SHA-1 : SHA-1 hash of the archive, in standard SHA-1 format.
+
+3. ALGORITHM SOURCE CODE
+3.1 ENCRYPTION/DECRYPTION
+I believe this was derived at some point from code in StormLib. Assumes the long type to be 32 bits, and the machine to be little endian order.
+
+unsigned long dwCryptTable[0x500];
+
+void InitializeCryptTable()
+{
+    unsigned long seed   = 0x00100001;
+    unsigned long index1 = 0;
+    unsigned long index2 = 0;
+    int   i;
+
+    for (index1 = 0; index1 < 0x100; index1++)
+    {
+        for (index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
+        {
+            unsigned long temp1, temp2;
+
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp1 = (seed & 0xFFFF) << 0x10;
+
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp2 = (seed & 0xFFFF);
+
+            dwCryptTable[index2] = (temp1 | temp2);
+        }
+    }
+}
+
+void EncryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
+{
+    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
+    unsigned long seed = 0xEEEEEEEE;
+    unsigned long ch;
+
+	assert(lpbyBuffer);
+
+    dwLength /= sizeof(unsigned long);
+
+    while(dwLength-- > 0)
+    {
+        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
+        ch = *lpdwBuffer ^ (dwKey + seed);
+
+        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
+        seed = *lpdwBuffer + seed + (seed << 5) + 3;
+
+		*lpdwBuffer++ = ch;
+    }
+}
+
+void DecryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
+{
+	unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
+    unsigned long seed = 0xEEEEEEEE;
+    unsigned long ch;
+
+	assert(lpbyBuffer);
+
+    dwLength /= sizeof(unsigned long);
+
+    while(dwLength-- > 0)
+    {
+        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
+        ch = *lpdwBuffer ^ (dwKey + seed);
+
+        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
+        seed = ch + seed + (seed << 5) + 3;
+
+		*lpdwBuffer++ = ch;
+    }
+}
+
+3.2 HASHING
+Based on code from StormLib.
+
+// Different types of hashes to make with HashString
+#define MPQ_HASH_TABLE_OFFSET	0
+#define MPQ_HASH_NAME_A	1
+#define MPQ_HASH_NAME_B	2
+#define MPQ_HASH_FILE_KEY	3
+
+unsigned long HashString(const char *lpszString, unsigned long dwHashType)
+{
+    unsigned long  seed1 = 0x7FED7FED;
+    unsigned long  seed2 = 0xEEEEEEEE;
+    int    ch;
+
+    while (*lpszString != 0)
+    {
+        ch = toupper(*lpszString++);
+
+        seed1 = dwCryptTable[(dwHashType * 0xFF) + ch] ^ (seed1 + seed2);
+        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+    }
+    return seed1;
+}
+
+3.3 CONVERSION OF FILETIME AND time_t
+
+#define EPOCH_OFFSET 116444736000000000ULL	// Number of 100 ns units between 01/01/1601 and 01/01/1970
+
+bool GetTimeFromFileTime(FILETIME &fileTime, time_t &time)
+{
+	// The FILETIME represents a 64-bit integer: the number of 100 ns units since January 1, 1601
+	unsigned long long nTime = ((unsigned long long)fileTime.dwHighDateTime << 32) + fileTime.dwLowDateTime;
+
+	if (nTime < EPOCH_OFFSET)
+		return false;
+
+	nTime -= EPOCH_OFFSET;	// Convert the time base from 01/01/1601 to 01/01/1970
+	nTime /= 10000000ULL;	// Convert 100 ns to sec
+
+	time = (time_t)nTime;
+
+	// Test for overflow (FILETIME is 64 bits, time_t is 32 bits)
+	if ((nTime - (unsigned long long)time) > 0)
+		return false;
+
+	return true;
+}
+
+void GetFileTimeFromTime(time_t &time, FILETIME &fileTime)
+{
+	unsigned long long nTime = (unsigned long long)time;
+
+	nTime *= 10000000ULL;
+	nTime += EPOCH_OFFSET;
+
+	fileTime.dwLowDateTime = (DWORD)nTime;
+	fileTime.dwHighDateTime = (DWORD)(nTime >> 32);
+}

StormLib/doc/The MoPaQ File Format 1.0.txt

@@ -0,0 +1,433 @@
+THE MOPAQ ARCHIVE FORMAT
+v1.0 (Friday, September 1, 2006)
+by Justin Olbrantz(Quantam)
+
+Distribution and reproduction of this specification are allowed without limitation, as long as it is not altered. Quotation in other works is freely allowed, as long as the source and author of the quote are stated.
+
+TABLE OF CONTENTS
+1. Introduction to the MoPaQ Format
+2. The MoPaQ Format
+	2.1 General Archive Layout
+	2.2 Archive Header
+	2.3 Block Table
+	2.4 Extended Block Table
+	2.5 Hash Table
+	2.6 File Data
+	2.7 Listfile
+	2.8 Extended Attributes
+	2.9 Weak (Old) Digital Signature
+	2.10 Strong (New) Digital Signature
+3. Algorithm Source Code
+	3.1 Encryption/Decryption
+	3.2 Hashing and File Key Computation
+	3.3 Finding Files
+	3.4 Deleting Files
+	3.5 Conversion of FILETIME and time_t
+	3.6 Forming a 64-bit Large Archive Offset from 32-bit and 16-bit Components
+4. Revision History
+
+1. INTRODUCTION TO THE MOPAQ FORMAT
+The MoPaQ (or MPQ) format is an archive file format designed by Mike O'Brien (hence the name Mike O'brien PaCK) at Blizzard Entertainment. The format has been used in all Blizzard games since (and including) Diablo. It is heavily optimized to be a read-only game archive format, and excels at this role. 
+
+The Blizzard MoPaQ-reading functions are contained in the Storm module, which my be either statically or dynamically linked. The Blizzard MoPaQ-writing functions are contained in the MPQAPI module, which is always statically linked.
+
+StormLib - mentioned several times in this specification - is an open-source MoPaQ reading and writing library written by Ladislav Zezula (no affiliation with Blizzard Entertainment). While it's a bit dated, and does not support all of the newer MoPaQ features, it contains source code to the more exotic compression methods used by MoPaQ, such as the PKWare implode algorithm, MoPaQ's huffman compression algorithm, and the IMA ADPCM compression used by MoPaQ.
+
+2. THE MOPAQ FORMAT
+All numbers in the MoPaQ format are in little endian byte order; signed numbers use the two's complement system. Data types are listed either as int (integer, the number of bits specified), byte (8 bits), or char (bytes which contain ASCII characters). All sizes and offsets are in bytes, unless specified otherwise. Structure members are listed in the following general form:
+offset from the beginning of the structure: data type(array size) member name : member description
+
+2.1 GENERAL ARCHIVE LAYOUT
+- Archive Header
+- File Data
+- File Data - Special Files
+- Hash Table
+- Block Table
+- Extended Block Table
+- Strong Digital signature
+
+This is the usual archive format, but it is not mandatory. Some archives have been observed placing the hash table and file table after the archive header, and before the file data.
+
+2.2 ARCHIVE HEADER
+00h: char(4) Magic : Indicates that the file is a MoPaQ archive. Must be ASCII "MPQ" 1Ah.
+04h: int32 HeaderSize : Size of the archive header.
+08h: int32 ArchiveSize : Size of the whole archive, including the header. Does not include the strong digital signature, if present. This size is used, among other things, for determining the region to hash in computing the digital signature. This field is deprecated in the Burning Crusade MoPaQ format, and the size of the archive is calculated as the size from the beginning of the archive to the end of the hash table, block table, or extended block table (whichever is largest).
+0Ch: int16 FormatVersion : MoPaQ format version. MPQAPI will not open archives where this is negative. Known versions:
+	0000h: Original format. HeaderSize should be 20h, and large archives are not supported.
+	0001h: Burning Crusade format. Header size should be 2Ch, and large archives are supported.
+0Eh: int8 SectorSizeShift : Power of two exponent specifying the number of 512-byte disk sectors in each logical sector in the archive. The size of each logical sector in the archive is 512 * 2^SectorSizeShift. Bugs in the Storm library dictate that this should always be 3 (4096 byte sectors).
+10h: int32 HashTableOffset : Offset to the beginning of the hash table, relative to the beginning of the archive.
+14h: int32 BlockTableOffset : Offset to the beginning of the block table, relative to the beginning of the archive.
+18h: int32 HashTableEntries : Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
+1Ch: int32 BlockTableEntries : Number of entries in the block table.
+Fields only present in the Burning Crusade format and later:
+20h: int64 ExtendedBlockTableOffset : Offset to the beginning of the extended block table, relative to the beginning of the archive.
+28h: int16 HashTableOffsetHigh : High 16 bits of the hash table offset for large archives.
+2Ah: int16 BlockTableOffsetHigh : High 16 bits of the block table offset for large archives.
+
+The archive header is the first structure in the archive, at archive offset 0; however, the archive does not need to be at offset 0 of the containing file. The offset of the archive in the file is referred to here as ArchiveOffset. If the archive is not at the beginning of the file, it must begin at a disk sector boundary (512 bytes). Early versions of Storm require that the archive be at the end of the containing file (ArchiveOffset + ArchiveSize = file size), but this is not required in newer versions (due to the strong digital signature not being considered a part of the archive).
+
+2.3 BLOCK TABLE
+The block table contains entries for each region in the archive. Regions may be either files, empty space, which may be overwritten by new files (typically this space is from deleted file data), or unused block table entries. Empty space entries should have BlockOffset and BlockSize nonzero, and FileSize and Flags zero; unused block table entries should have BlockSize, FileSize, and Flags zero. The block table is encrypted, using the hash of "(block table)" as the key. Each entry is structured as follows:
+
+00h: int32 BlockOffset : Offset of the beginning of the block, relative to the beginning of the archive.
+04h: int32 BlockSize : Size of the block in the archive.
+08h: int32 FileSize : Size of the file data stored in the block. Only valid if the block is a file; otherwise meaningless, and should be 0. If the file is compressed, this is the size of the uncompressed file data.
+0Ch: int32 Flags : Bit mask of the flags for the block. The following values are conclusively identified:
+	80000000h: Block is a file, and follows the file data format; otherwise, block is free space or unused. If the block is not a file, all other flags should be cleared, and FileSize should be 0.
+	01000000h: File is stored as a single unit, rather than split into sectors.
+	00020000h: The file's encryption key is adjusted by the block offset and file size (explained in detail in the File Data section). File must be encrypted.
+	00010000h: File is encrypted.
+	00000200h: File is compressed. File cannot be imploded.
+	00000100h: File is imploded. File cannot be compressed.
+
+2.4 EXTENDED BLOCK TABLE
+The extended block table was added to support archives larger than 4 gigabytes (2^32 bytes). The table contains the upper bits of the archive offsets for each block in the block table. It is simply an array of int16s, which become bits 32-47 of the archive offsets for each block, with bits 48-63 being zero. Individual blocks in the archive are still limited to 4 gigabytes in size. This table is only present in Burning Crusade format archives that exceed 4 gigabytes size.
+
+As of the Burning Crusade Friends and Family beta, this table is not encrypted.
+
+2.5 HASH TABLE
+Instead of storing file names, for quick access MoPaQs use a fixed, power of two-size hash table of files in the archive. A file is uniquely identified by its file path, its language, and its platform. The home entry for a file in the hash table is computed as a hash of the file path. In the event of a collision (the home entry is occupied by another file), progressive overflow is used, and the file is placed in the next available hash table entry. Searches for a desired file in the hash table proceed from the home entry for the file until either the file is found, the entire hash table is searched, or an empty hash table entry (FileBlockIndex of FFFFFFFFh) is encountered. The hash table is encrypted using the hash of "(hash table)" as the key. Each entry is structured as follows:
+
+00h: int32 FilePathHashA : The hash of the file path, using method A.
+04h: int32 FilePathHashB : The hash of the file path, using method B.
+08h: int16 Language : The language of the file. This is a Windows LANGID data type, and uses the same values. 0 indicates the default language (American English), or that the file is language-neutral.
+0Ah: int8 Platform : The platform the file is used for. 0 indicates the default platform. No other values have been observed.
+0Ch: int32 FileBlockIndex : If the hash table entry is valid, this is the index into the block table of the file. Otherwise, one of the following two values:
+	FFFFFFFFh: Hash table entry is empty, and has always been empty. Terminates searches for a given file.
+	FFFFFFFEh: Hash table entry is empty, but was valid at some point (in other words, the file was deleted). Does not terminate searches for a given file.
+
+2.6 FILE DATA
+The data for each file is composed of the following structure:
+00h: int32(SectorsInFile + 1) SectorOffsetTable : Offsets to the start of each sector, relative to the beginning of the file data. The last entry contains the file size, making it possible to easily calculate the size of any given sector. This table is not present if this information can be calculated (see details below).
+immediately following SectorOffsetTable: SECTOR Sectors(SectorsInFile) : Data of each sector in the file, packed end to end (see details below).
+
+Normally, file data is split up into sectors, for simple streaming. All sectors, save for the last, will contain as many bytes of file data as specified in the archive header's SectorSizeShift; the last sector may contain less than this, depending on the size of the entire file's data. If the file is compressed or imploded, the sector will be smaller or the same size as the file data it contains. Individual sectors in a compressed or imploded file may be stored uncompressed; this occurs if and only if the file data the sector contains could not be compressed by the algorithm(s) used (if the compressed sector size was greater than or equal to the size of the file data), and is indicated by the sector's size in SectorOffsetTable being equal to the size of the file data in the sector (which may be calculated from the FileSize). 
+
+The format of each sector depends on the kind of sector it is. Uncompressed sectors are simply the the raw file data contained in the sector. Imploded sectors are the raw compressed data following compression with the implode algorithm (these sectors can only be in imploded files). Compressed sectors (only found in compressed - not imploded - files) are compressed with one or more compression algorithms, and have the following structure:
+00h: byte CompressionMask : Mask of the compression types applied to this sector. If multiple compression types are used, they are applied in the order listed below, and decompression is performed in the opposite order. This byte counts towards the total sector size, meaning that the sector will be stored uncompressed if the data cannot be compressed by at least two bytes; as well, this byte is encrypted with the sector data, if applicable. The following compression types are defined (for implementations of these algorithms, see StormLib):
+	40h: IMA ADPCM mono
+	80h: IMA ADPCM stereo
+	01h: Huffman encoded
+	02h: Deflated (see ZLib)
+	08h: Imploded (see PKWare Data Compression Library)
+	10h: BZip2 compressed (see BZip2)
+01h: byte(SectorSize - 1) SectorData : The compressed data for the sector.
+
+If the file is stored as a single unit (indicated in the file's Flags), there is effectively only a single sector, which contains the entire file data.
+
+If the file is encrypted, each sector (after compression/implosion, if applicable) is encrypted with the file's key. The base key for a file is determined by a hash of the file name stripped of the directory (i.e. the key for a file named "directory\file" would be computed as the hash of "file"). If this key is adjusted, as indicated in the file's Flags, the final key is calculated as ((base key + BlockOffset - ArchiveOffset) XOR FileSize) (StormLib incorrectly uses an AND in place of the XOR). Each sector is encrypted using the key + the 0-based index of the sector in the file. The SectorOffsetTable, if present, is encrypted using the key - 1.
+
+The SectorOffsetTable is omitted when the sizes and offsets of all sectors in the file are calculatable from the FileSize. This can happen in several circumstances. If the file is not compressed/imploded, then the size and offset of all sectors is known, based on the archive's SectorSizeShift. If the file is stored as a single unit compressed/imploded, then the SectorOffsetTable is omitted, as the single file "sector" corresponds to BlockSize and FileSize, as mentioned previously. However, the SectorOffsetTable will be present if the file is compressed/imploded and the file is not stored as a single unit, even if there is only a single sector in the file (the size of the file is less than or equal to the archive's sector size).
+
+2.7 LISTFILE
+The listfile is a very simple extension to the MoPaQ format that contains the file paths of (most) files in the archive. The languages and platforms of the files are not stored in the listfile. The listfile is contained in the file "(listfile)" (default language and platform), and is simply a text file with file paths separated by ';', 0Dh, 0Ah, or some combination of these. The file "(listfile)" may not be listed in the listfile.
+
+2.8 EXTENDED ATTRIBUTES
+The extended attributes are optional file attributes for files in the block table. These attributes were added at times after the MoPaQ format was already finalized, and it is not necessary for every archive to have all (or any) of the extended attributes. If an archive contains a given attribute, there will be an instance of that attribute for every block in the block table, although the attribute will be meaningless if the block is not a file. The order of the attributes for blocks correspond to the order of the blocks in the block table, and are of the same number. The attributes are stored in parallel arrays in the "(attributes)" file (default language and platform), in the archive. The attributes corresponding to this file need not be valid (and logically cannot be). Unlike all the other structures in the MoPaQ format, entries in the extended attributes are NOT guaranteed to be aligned. Also note that in some archives, malicious zeroing of the attributes has been observed, perhaps with the intent of breaking archive viewers. This file is structured as follows:
+
+00h: int32 Version : Specifies the extended attributes format version. For now, must be 100.
+04h: int32 AttributesPresent : Bit mask of the extended attributes present in the archive:
+	00000001h: File CRC32s.
+	00000002h: File timestamps.
+	00000004h: File MD5s.
+08h: int32(BlockTableEntries) CRC32s : CRC32s of the (uncompressed) file data for each block in the archive. Omitted if the archive does not have CRC32s.
+immediately after CRC32s: FILETIME(BlockTableEntries) Timestamps : Timestamps for each block in the archive. The format is that of the Windows FILETIME structure. Omitted if the archive does not have timestamps.
+immediately after Timestamps: MD5(BlockTableEntries) MD5s : MD5s of the (uncompressed) file data for each block in the archive. Omitted if the archive does not have MD5s.
+
+2.9 WEAK DIGITAL SIGNATURE
+The weak digital signature is a digital signature using Microsoft CryptoAPI. It is an implimentation
+of the RSASSA-PKCS1-v1_5 digital signature protocol, using the MD5 hashing algorithm and a 512-bit (weak)
+RSA key (for more information about this protocol, see the RSA Labs PKCS1 specification). The public key
+and exponent are stored in a resource in Storm, the private key is stored in a separate file, whose filename
+is passed to MPQAPI (the private key is not stored in MPQAPI). The signature is stored uncompressed,
+unencrypted in the file "(signature)" (default language and platform) in the archive. The archive
+is hashed from the beginning of the archive (ArchiveOffset in the containing file) to the end of
+the archive (the length indicated by ArchiveSize, or calculated in the Burning Crusade MoPaQ format);
+the signature file is added to the archive before signing, and the space occupied by the file is considered
+to be all binary 0s during signing/verification. This file is structured as follows:
+
+00h: int32 Unknown : Must be 0.
+04h: int32 Unknown : Must be 0.
+08h: int512 Signature : The digital signature. Like all other numbers in the MoPaQ format, this is stored
+in little-endian order. The structure of this, when decrypted, follows the RSASSA-PKCS1-v1_5 specification;
+this format is rather icky to work with (I wrote a program to verify this signature using nothing but an MD5
+function and huge integer functions; it wasn't pleasant), and best left to an encryption library such as Cryto++.
+
+2.10 STRONG DIGITAL SIGNATURE
+The strong digital signature uses a simple proprietary implementation of RSA signing, using the SHA-1 hashing algorithm and a 2048-bit (strong) RSA key. The default public key and exponent are stored in Storm, but other keys may be used as well. The strong digital signature is stored immediately after the archive, in the containing file; the entire archive (ArchiveSize bytes, starting at ArchiveOffset in the containing file) is hashed as a single block. The signature has the following format:
+
+00h: char(4) Magic : Indicates the presence of a digital signature. Must be "NGIS" ("SIGN" backwards).
+04h: int2048 Signature : The digital signature, stored in little-endian format.
+
+When the Signature field is decrypted with the public key and exponent, and the resulting large integer is stored in little-endian order, it is structured as follows:
+
+00h: byte Padding : Must be 0Bh.
+01h: byte(235) Padding : Must be BBh.
+ECh: byte(20) SHA-1 : SHA-1 hash of the archive, in standard SHA-1 byte order.
+
+3. ALGORITHM SOURCE CODE
+All of the sample code here assumes little endian machine byte order, that the short type is 16 bits, that the long type is 32 bits, and that the long long type is 64 bits. Adjustments must be made if these assumptions are not correct on a given platform. All code not credited otherwise was written by myself in the writing of this specification.
+
+3.1 ENCRYPTION/DECRYPTION
+Based on code from StormLib.
+
+unsigned long dwCryptTable[0x500];
+
+// The encryption and hashing functions use a number table in their procedures. This table must be initialized before the functions are called the first time.
+void InitializeCryptTable()
+{
+    unsigned long seed   = 0x00100001;
+    unsigned long index1 = 0;
+    unsigned long index2 = 0;
+    int   i;
+
+    for (index1 = 0; index1 < 0x100; index1++)
+    {
+        for (index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
+        {
+            unsigned long temp1, temp2;
+
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp1 = (seed & 0xFFFF) << 0x10;
+
+            seed  = (seed * 125 + 3) % 0x2AAAAB;
+            temp2 = (seed & 0xFFFF);
+
+            dwCryptTable[index2] = (temp1 | temp2);
+        }
+    }
+}
+
+void EncryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
+{
+    assert(lpbyBuffer);
+
+    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
+    unsigned long seed = 0xEEEEEEEE;
+    unsigned long ch;
+
+    dwLength /= sizeof(unsigned long);
+
+    while(dwLength-- > 0)
+    {
+        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
+        ch = *lpdwBuffer ^ (dwKey + seed);
+
+        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
+        seed = *lpdwBuffer + seed + (seed << 5) + 3;
+
+		*lpdwBuffer++ = ch;
+    }
+}
+
+void DecryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
+{
+    assert(lpbyBuffer);
+
+    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
+    unsigned long seed = 0xEEEEEEEEL;
+    unsigned long ch;
+
+    dwLength /= sizeof(unsigned long);
+
+    while(dwLength-- > 0)
+    {
+        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
+        ch = *lpdwBuffer ^ (dwKey + seed);
+
+        dwKey = ((~dwKey << 0x15) + 0x11111111L) | (dwKey >> 0x0B);
+        seed = ch + seed + (seed << 5) + 3;
+
+		*lpdwBuffer++ = ch;
+    }
+}
+
+3.2 HASHING AND FILE KEY COMPUTATION
+These functions may have been derived from StormLib code at some point in the very distant past. It was so long ago that I don't remember for certain.
+
+// Different types of hashes to make with HashString
+#define MPQ_HASH_TABLE_OFFSET	0
+#define MPQ_HASH_NAME_A	1
+#define MPQ_HASH_NAME_B	2
+#define MPQ_HASH_FILE_KEY	3
+
+// Based on code from StormLib.
+unsigned long HashString(const char *lpszString, unsigned long dwHashType)
+{
+    assert(lpszString);
+    assert(dwHashType <= MPQ_HASH_FILE_KEY);
+    
+    unsigned long  seed1 = 0x7FED7FEDL;
+    unsigned long  seed2 = 0xEEEEEEEEL;
+    int    ch;
+
+    while (*lpszString != 0)
+    {
+        ch = toupper(*lpszString++);
+
+        seed1 = dwCryptTable[(dwHashType * 0x100) + ch] ^ (seed1 + seed2);
+        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+    }
+    return seed1;
+}
+
+#define BLOCK_OFFSET_ADJUSTED_KEY 0x00020000L
+
+unsigned long ComputeFileKey(const char *lpszFilePath, const BlockTableEntry &blockEntry, unsigned long nArchiveOffset)
+{
+	assert(lpszFilePath);
+	
+	// Find the file name part of the path
+	const char *lpszFileName = strrchr(lpszFilePath, '\\');
+	if (lpszFileName)
+		lpszFileName++;	// Skip the \
+	else
+		lpszFileName = lpszFilePath;
+		
+	// Hash the name to get the base key
+	unsigned long nFileKey = HashString(lpszFileName, MPQ_HASH_FILE_KEY);
+	
+	// Offset-adjust the key if necessary
+	if (blockEntry.Flags & BLOCK_OFFSET_ADJUSTED_KEY)
+		nFileKey = (nFileKey + blockEntry.BlockOffset) ^ blockEntry.FileSize;
+		
+	return nFileKey;
+}
+
+3.3 FINDING FILES
+
+#define MPQ_HASH_ENTRY_EMPTY 0xFFFFFFFFL
+#define MPQ_HASH_ENTRY_DELETED 0xFFFFFFFEL
+
+bool FindFileInHashTable(const HashTableEntry *lpHashTable, unsigned long nHashTableSize, const char *lpszFilePath, unsigned short nLang, unsigned char nPlatform, unsigned long &iFileHashEntry)
+{
+	assert(lpHashTable);
+	assert(nHashTableSize);
+	assert(lpszFilePath);
+	
+	// Find the home entry in the hash table for the file
+	unsigned long iInitEntry = HashString(lpszFilePath, MPQ_HASH_TABLE_OFFSET) & (nHashTableSize - 1);
+		
+	// Is there anything there at all?
+	if (lpHashTable[iInitEntry].FileBlockIndex == MPQ_HASH_ENTRY_EMPTY)
+		return false;
+		
+	// Compute the hashes to compare the hash table entry against
+	unsigned long nNameHashA = HashString(lpszFilePath, MPQ_HASH_NAME_A),
+		nNameHashB = HashString(lpszFilePath, MPQ_HASH_NAME_B),
+		iCurEntry = iInitEntry;
+		
+	// Check each entry in the hash table till a termination point is reached
+	do
+	{
+		if (lpHashTable[iCurEntry].FileBlockIndex != MPQ_HASH_ENTRY_DELETED)
+		{
+			if (lpHashTable[iCurEntry].FilePathHashA == nNameHashA 
+				&& lpHashTable[iCurEntry].FilePathHashB == nNameHashB
+				&& lpHashTable[iCurEntry].Language == nLang
+				&& lpHashTable[iCurEntry].Platform == nPlatform)
+			{
+				iFileHashEntry = iCurEntry;
+				
+				return true;
+			}
+		}
+			
+		iCurEntry = (iCurEntry + 1) & (nHashTableSize - 1);
+	} while (iCurEntry != iInitEntry && lpHashTable[iCurEntry].FileBlockIndex != MPQ_HASH_ENTRY_EMPTY);
+	
+	return false;
+}
+
+3.4 DELETING FILES
+
+bool DeleteFile(HashTableEntry *lpHashTable, unsigned long nHashTableSize, BlockTableEntry *lpBlockTable, const char *lpszFilePath, unsigned short nLang, unsigned char nPlatform)
+{
+	assert(lpHashTable);
+	assert(nHashTableSize);
+	assert(lpBlockTable);
+	
+	// Find the file in the hash table
+	unsigned long iFileHashEntry;
+	
+	if (!FindFileInHashTable(lpHashTable, nHashTableSize, lpszFilePath, nLang, nPlatform, iFileHashEntry))
+		return false;
+	
+	// Get the block table index before we nuke the hash table entry
+	unsigned long iFileBlockEntry = lpHashTable[iFileHashEntry].FileBlockIndex;
+	
+	// Delete the file's entry in the hash table
+	memset(&lpHashTable[iFileHashEntry], 0xFF, sizeof(HashTableEntry));
+	
+	// If the next entry is empty, mark this one as empty; otherwise, mark this as deleted.
+	if (lpHashTable[(iFileHashEntry + 1) & (nHashTableSize - 1)].FileBlockIndex == MPQ_HASH_ENTRY_EMPTY)
+		lpHashTable[iFileHashEntry].FileBlockIndex = MPQ_HASH_ENTRY_EMPTY;
+	else
+		lpHashTable[iFileHashEntry].FileBlockIndex = MPQ_HASH_ENTRY_DELETED;
+	
+	// If the block occupies space, mark the block as free space; otherwise, clear the block table entry.
+	if (lpBlockTable[iFileBlockEntry].BlockSize > 0)
+	{
+		lpBlockTable[iFileBlockEntry].FileSize = 0;
+		lpBlockTable[iFileBlockEntry].Flags = 0;
+	}
+	else
+		memset(&lpBlockTable[iFileBlockEntry], 0, sizeof(BlockTableEntry);
+		
+	return true;
+}
+
+3.5 CONVERSION OF FILETIME AND time_t
+This code assumes that the base ("zero") date for time_t is 01/01/1970. This is true on Windows, Unix System V systems, and Mac OS X. It is unknown whether this is true on all other platforms. You'll need to research this yourself, if you plan on porting it somewhere else.
+
+#define EPOCH_OFFSET 116444736000000000ULL	// Number of 100 ns units between 01/01/1601 and 01/01/1970
+
+bool GetTimeFromFileTime(const FILETIME &fileTime, time_t &time)
+{
+	// The FILETIME represents a 64-bit integer: the number of 100 ns units since January 1, 1601
+	unsigned long long nTime = ((unsigned long long)fileTime.dwHighDateTime << 32) + fileTime.dwLowDateTime;
+
+	if (nTime < EPOCH_OFFSET)
+		return false;
+
+	nTime -= EPOCH_OFFSET;	// Convert the time base from 01/01/1601 to 01/01/1970
+	nTime /= 10000000ULL;	// Convert 100 ns to sec
+
+	time = (time_t)nTime;
+
+	// Test for overflow (FILETIME is 64 bits, time_t is 32 bits)
+	if ((nTime - (unsigned long long)time) > 0)
+		return false;
+
+	return true;
+}
+
+void GetFileTimeFromTime(const time_t &time, FILETIME &fileTime)
+{
+	unsigned long long nTime = (unsigned long long)time;
+
+	nTime *= 10000000ULL;
+	nTime += EPOCH_OFFSET;
+
+	fileTime.dwLowDateTime = (DWORD)nTime;
+	fileTime.dwHighDateTime = (DWORD)(nTime >> 32);
+}
+
+3.6 FORMING A 64-BIT LARGE ARCHIVE OFFSET FROM 32-BIT AND 16-BIT COMPONENTS
+unsigned long long MakeLargeArchiveOffset(unsigned long nOffsetLow, unsigned short nOffsetHigh)
+{
+	return ((unsigned long long)nOffsetHigh << 32) + (unsigned long long)nOffsetLow;
+}
+
+4. REVISION HISTORY
+1.0
+	- Updated to include most of the changes found in the Burning Crusade Friends and Family beta
+
+0.91.
+	- Updated several structure member descriptions
+	- Listed the full set of characters that can separate list file entries
+	- Noted that (attributes), (listfile), and (signature) use the default language and platform codes
+	- Redid part of the file data specs to clarify the format of sectors
+	- Enhanced descriptions of the different kinds of block table entries
+	- Added ComputeFileKey, FindFileInHashTable, and DeleteFile source

StormLib/doc/d3-authenticationcode/d3-authenticationcode-deDE.txt

@@ -0,0 +1 @@
+UCMXF6EJY352EFH4XFRXCFH2XC9MQRZK

StormLib/doc/d3-authenticationcode/d3-authenticationcode-enGB.txt

@@ -0,0 +1 @@
+MMKVHY48RP7WXP4GHYBQ7SL9J9UNPHBP

StormLib/doc/d3-authenticationcode/d3-authenticationcode-enSG.txt

@@ -0,0 +1 @@
+8MXLWHQ7VGGLTZ9MQZQSFDCLJYET3CPP

StormLib/doc/d3-authenticationcode/d3-authenticationcode-enUS.txt

@@ -0,0 +1 @@
+EJ2R5TM6XFE2GUNG5QDGHKQ9UAKPWZSZ

StormLib/doc/d3-authenticationcode/d3-authenticationcode-esES.txt

@@ -0,0 +1 @@
+PBGFBE42Z6LNK65UGJQ3WZVMCLP4HQQT

StormLib/doc/d3-authenticationcode/d3-authenticationcode-esMX.txt

@@ -0,0 +1 @@
+X7SEJJS9TSGCW5P28EBSC47AJPEY8VU2

StormLib/doc/d3-authenticationcode/d3-authenticationcode-frFR.txt

@@ -0,0 +1 @@
+5KVBQA8VYE6XRY3DLGC5ZDE4XS4P7YA2

StormLib/doc/d3-authenticationcode/d3-authenticationcode-itIT.txt

@@ -0,0 +1 @@
+478JD2K56EVNVVY4XX8TDWYT5B8KB254

StormLib/doc/d3-authenticationcode/d3-authenticationcode-koKR.txt

@@ -0,0 +1 @@
+8TS4VNFQRZTN6YWHE9CHVDH9NVWD474A

StormLib/doc/d3-authenticationcode/d3-authenticationcode-plPL.txt

@@ -0,0 +1 @@
+LJ52Z32DF4LZ4ZJJXVKK3AZQA6GABLJB

StormLib/doc/d3-authenticationcode/d3-authenticationcode-ptBR.txt

@@ -0,0 +1 @@
+K6BDHY2ECUE2545YKNLBJPVYWHE7XYAG

StormLib/doc/d3-authenticationcode/d3-authenticationcode-zhTW.txt

@@ -0,0 +1 @@
+6VWCQTN8V3ZZMRUCZXV8A8CGUX2TAA8H

StormLib/doc/hots-authenticationcode/hots-authenticationcode-bgdl.txt

@@ -0,0 +1 @@
+S48B6CDTN5XEQAKQDJNDLJBJ73FDFM3U

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-deDE.txt

@@ -0,0 +1 @@
+Y45MD3CAK4KXSSXHYD9VY64Z8EKJ4XFX

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-enGB.txt

@@ -0,0 +1 @@
+G8MN8UDG6NA2ANGY6A3DNY82HRGF29ZH

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-enUS.txt

@@ -0,0 +1 @@
+3DH5RE5NVM5GTFD85LXGWT6FK859ETR5

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-esES.txt

@@ -0,0 +1 @@
+8WLKUAXE94PFQU4Y249PAZ24N4R4XKTQ

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-esMX.txt

@@ -0,0 +1 @@
+A34DXX3VHGGXSQBRFE5UFFDXMF9G4G54

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-frFR.txt

@@ -0,0 +1 @@
+ZG7J9K938HJEFWPQUA768MA2PFER6EAJ

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-itIT.txt

@@ -0,0 +1 @@
+NE7CUNNNTVAPXV7E3G2BSVBWGVMW8BL2

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-koKR.txt

@@ -0,0 +1 @@
+3V9E2FTMBM9QQWK7U6MAMWAZWQDB838F

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-plPL.txt

@@ -0,0 +1 @@
+2NSFB8MELULJ83U6YHA3UP6K4MQD48L6

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-ptBR.txt

@@ -0,0 +1 @@
+QA2TZ9EWZ4CUU8BMB5WXCTY65F9CSW4E

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-ruRU.txt

@@ -0,0 +1 @@
+VHB378W64BAT9SH7D68VV9NLQDK9YEGT

StormLib/doc/sc2-authenticationcode/sc2-authenticationcode-zhTW.txt

@@ -0,0 +1 @@
+U3NFQJV4M6GC7KBN9XQJ3BRDN3PLD9NE

StormLib/make-msvc.bat

@@ -0,0 +1,60 @@
+:: Build file for Visual Studio 2008 and 2017
+@echo off
+
+:: Save the values of INCLUDE, LIB and PATH
+set SAVE_INCLUDE=%INCLUDE%
+set SAVE_LIB=%LIB%
+set SAVE_PATH=%PATH%
+set LIB_NAME=StormLib
+
+:: Determine where the program files are, both for 64-bit and 32-bit Windows
+if exist "%ProgramFiles%"      set PROGRAM_FILES_DIR=%ProgramFiles%
+if exist "%ProgramFiles(x86)%" set PROGRAM_FILES_DIR=%ProgramFiles(x86)%
+
+:: Determine the installed version of Visual Studio (Prioritize Enterprise over Professional)
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"                               set VCVARS_2008=%PROGRAM_FILES_DIR%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"    set VCVARS_2017=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" set VCVARS_2017=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"   set VCVARS_2017=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"    set VCVARS_2019=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" set VCVARS_2019=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"   set VCVARS_2019=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
+
+::Build all libraries using Visual Studio 2008 and 2017
+call :BuildLibs "%VCVARS_2008%" x86 %LIB_NAME%_vs08.sln
+call :BuildLibs "%VCVARS_2008%" x64 %LIB_NAME%_vs08.sln
+call :BuildLibs "%VCVARS_2019%" x86 %LIB_NAME%_vs19.sln
+call :BuildLibs "%VCVARS_2019%" x64 %LIB_NAME%_vs19.sln
+goto:eof
+
+::-----------------------------------------------------------------------------
+:: Build all 8 configurations of the library
+::
+:: Parameters:
+::
+::   %1     Full path to the VCVARS.BAT file
+::   %2     Target build platform (x86 or x64)
+::   %3     Plain name of the /sln solution file
+::
+
+:BuildLibs
+::set VSCMD_DEBUG=1
+call %1 %2
+if "%2" == "x86" set SLN_TRG=Win32
+if "%2" == "x64" set SLN_TRG=x64
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAS|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUD|%SLN_TRG%"
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUS|%SLN_TRG%"
+
+:: Restore environment variables to the old level
+set INCLUDE=%SAVE_INCLUDE%
+set LIB=%SAVE_LIB%
+set PATH=%SAVE_PATH%
+set VSINSTALLDIR=
+set VCINSTALLDIR=
+set DevEnvDir=

StormLib/make.bat

@@ -0,0 +1,46 @@
+@echo off
+if not "x%WDKDIR%" == "x" goto SELECT_LIB
+echo The WDKDIR environment variable is not set
+echo Set this variable to your WDK directory (without ending backslash)
+echo Example: set WDKDIR C:\WinDDK\6001
+pause
+goto:eof
+
+:SELECT_LIB
+set PROJECT_DIR=%~dp0
+set LIBRARY_NAME=StormLibWDK
+
+:PREPARE_SOURCES
+echo Preparing sources ...
+copy .\src\wdk\sources-cpp.cpp . >nul
+copy .\src\wdk\sources-wdk-*   . >nul
+echo.
+
+:BUILD_LIB_32
+echo Building %LIBRARY_NAME%.lib (32-bit) ...
+set DDKBUILDENV=
+call %WDKDIR%\bin\setenv.bat %WDKDIR%\ fre w2k
+cd %PROJECT_DIR%
+build.exe -czgw
+del buildfre_w2k_x86.log
+echo.
+
+:BUILD_LIB_64
+echo Building %LIBRARY_NAME%.lib (64-bit) ...
+set DDKBUILDENV=
+call %WDKDIR%\bin\setenv.bat %WDKDIR%\ fre x64 WLH
+cd %PROJECT_DIR%
+build.exe -czgw
+del buildfre_wlh_amd64.log
+echo.
+
+:COPY_LIBS
+copy /Y .\objfre_wlh_amd64\amd64\%LIBRARY_NAME%.lib ..\aaa\lib64\%LIBRARY_NAME%.lib >nul
+copy /Y .\objfre_w2k_x86\i386\%LIBRARY_NAME%.lib ..\aaa\lib32\%LIBRARY_NAME%.lib >nul
+copy /Y .\src\StormPort.h ..\aaa\inc >nul
+copy /Y .\src\StormLib.h ..\aaa\inc >nul
+
+:CLEANUP
+if exist sources-cpp.cpp del sources-cpp.cpp
+if exist sources-wdk-* del sources-wdk-*
+if exist build.bat del build.bat