Master Quest (#3) (#1632)

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>

.gitignore

@@ -7,9 +7,9 @@ __pycache__/
 .vscode/
 .vs/
 .idea/
-CMakeLists.txt
 cmake-build-debug
 venv/
+.cache/
 
 # Project-specific ignores
 build/
@@ -25,6 +25,10 @@ docs/doxygen/
 *.map
 *.dump
 out.txt
+*.sln
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
 
 # Tool artifacts
 tools/mipspro7.2_compiler/
@@ -400,4 +404,44 @@ ZAPDUtils/build/
 ZAPD/BuildInfo.h
 
 DebugObj/*
-ReleaseObj/*
+ReleaseObj/*
+.tags
+tags
+oot.otr
+*.sav
+shipofharkinian.ini
+shipofharkinian.json
+imgui.ini
+
+# Switch Stuff
+
+*.nro
+*.nacp
+ZAPDTR/ZAPDUtils/lib/*
+!/soh/icon.jpg
+
+# Xcode
+xcuserdata/
+*.xcconfig
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings
+
+# cmake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+*/extract_assets_cmake*
+/build*
+build.c

BUILDING.md

@@ -2,48 +2,196 @@
 
 ## Windows
 
- 1. Install [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`.
- 12. Build the solution.
- 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
- 14. Launch `soh.exe`.
+Requires:
+  * At least 8GB of RAM (machines with 4GB have seen complier failures)
+  * Visual Studio 2022 Community Edition with the C++ feature set
+  * One of the Windows SDKs that comes with Visual Studio, for example the current Windows 10 version 10.0.19041.0
+  * The `MSVC v142 - VS 2019 C++ build tools` component of Visual Studio
+  * Python 3 (can be installed manually or as part of Visual Studio)
+  * Git (can be installed manually or as part of Visual Studio)
+  * Cmake (can be installed via chocolatey or manually)
+
+During installation, check the "Desktop development with C++" feature set:
+
+![image](https://user-images.githubusercontent.com/30329717/183511274-d11aceea-7900-46ec-acb6-3f2cc110021a.png)
+Doing so should also check one of the Windows SDKs by default.  Then, in the installation details in the right-hand column, make sure you also check the v142 toolset. 
+
+You can also find the v142 toolset by searching through the individual components tab:  
+
+![image](https://user-images.githubusercontent.com/30329717/183521169-ead6a73b-a1bf-4e99-aab8-441746d8f08e.png)
+While you're there, you can also install Python 3 and Git if needed.
+
+1. Clone the Ship of Harkinian repository
+2. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
+
+_Note: Instructions assume using powershell_
+```powershell
+# Navigate to the Shipwright repo within powershell. ie: cd "C:\yourpath\Shipwright"
+cd Shipwright
+
+# Setup cmake project
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64 # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
+# or for VS2019
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target ExtractAssets # --config Release (if you're packaging)
+# Compile project
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 # --config Release (if you're packaging)
+
+# Now you can run the executable in .\build\x64
+
+# If you need to clean the project you can run
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target clean
+```
+
+### Developing SoH
+With the cmake build system you have two options for working on the project:
+
+#### Visual Studio
+To develop using Visual Studio you only need to use cmake to generate the solution file:
+```powershell
+# Generates Ship.sln at `build/x64` for Visual Studio 2022
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64
+# or for Visual Studio 2019
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64
+```
+
+#### Visual Studio Code or another editor
+To develop using Visual Studio Code or another editor you only need to open the repository in it.
+To build you'll need to follow the instructions from the building section.
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+
+_Experimental: You can also use another build system entirely rather than MSVC like [Ninja](https://ninja-build.org/) for possibly better performance._
+
+
+### Generating the distributable
+After compiling the project you can generate the distributable by running:
+```powershell
+# Go to build folder
+cd "build/x64"
+# Generate
+& 'C:\Program Files\CMake\bin\cpack.exe' -G ZIP
+```
 
 ## Linux
+Requires `gcc >= 10, x11, curl, python3, sdl2 >= 2.0.22, libpng, glew >= 2.2, ninja, cmake, lld`
+
+**Important: For maximum performance make sure you have ninja build tools installed!**
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
 
 ```bash
 # Clone the repo
-git clone git@github.com:HarbourMasters/ShipWright.git
+git clone https://github.com/HarbourMasters/Shipwright.git
+cd Shipwright
+# Copy the baserom to the OTRExporter folder
+cp <path to your ROM> OTRExporter
+# Generate Ninja project
+cmake -H. -Bbuild-cmake -GNinja # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Compile the project
+cmake --build build-cmake # --config Release (if you're packaging)
+
+# Now you can run the executable in ./build-cmake/soh/soh.elf
+# To develop the project open the repository in VSCode (or your preferred editor)
+
+# If you need to clean the project you can run
+cmake --build build-cmake --target clean
+```
+
+### Generating a distributable
+After compiling the project you can generate a distributable by running of the following:
+```bash
+# Go to build folder
+cd build-cmake
+# Generate
+cpack -G DEB
+cpack -G ZIP
+cpack -G External (creates appimage)
+```
+
+## macOS
+Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, ninja, cmake` (can be installed via homebrew, macports, etc)
+
+**Important: For maximum performance make sure you have ninja build tools installed!**
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+
+```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
+# Generate Ninja project
+cmake -H. -Bbuild-cmake -GNinja # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Compile the project
+cmake --build build-cmake # --config Release (if you're packaging)
 
-cd soh
-# Extract the assets/Compile the exporter/Run the exporter
-make setup -j$(nproc) OPTFLAGS=-O0 DEBUG=0
-# Compile the code
-make -j $(nproc) OPTFLAGS=-O0 DEBUG=0
+# Copy oot.otr into the Application Support directory
+cp build-cmake/soh/oot.otr ~/Library/Application\ Support/com.shipofharkinian.soh/
+
+# Now you can run the executable file:
+./build-cmake/soh/soh-macos
+# To develop the project open the repository in VSCode (or your preferred editor)
+
+# If you need to clean the project you can run
+cmake --build build-cmake --target clean
+```
+
+### Generating a distributable
+After compiling the project you can generate a distributable by running of the following:
+```bash
+# Go to build folder
+cd build-cmake
+# Generate
+cpack
+```
+
+## Switch
+1. Requires that your build machine is setup with the tools necessary for your platform above
+2. Requires that you have the switch build tools installed 
+3. Clone the Ship of Harkinian repository
+4. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
+
+```bash
+cd Shipwright
+# Setup cmake project for your host machine
+cmake -H. -Bbuild-cmake -GNinja
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Setup cmake project for building for Switch
+cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+# Build project and generate nro
+cmake --build build-switch --target soh_nro
+
+# Now you can run the executable in ./build-switch/soh/soh.nro
+# To develop the project open the repository in VSCode (or your preferred editor)
+```
+
+## Wii U
+1. Requires that your build machine is setup with the tools necessary for your platform above
+2. Requires that you have the Wii U build tools installed 
+3. Clone the Ship of Harkinian repository
+4. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
+
+```bash
+cd Shipwright
+# Setup cmake project for your host machine
+cmake -H. -Bbuild-cmake -GNinja
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Setup cmake project for building for Wii U
+cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
+# Build project and generate rpx
+cmake --build build-wiiu --target soh # --target soh_wuhb (for building .wuhb) 
+
+# Now you can run the executable in ./build-wiiu/soh/soh.rpx or the Wii U Homebrew Bundle in ./build-wiiu/soh/soh.wuhb
+# To develop the project open the repository in VSCode (or your preferred editor)
 ```
 
 # Compatible Roms
@@ -57,10 +205,9 @@ OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
 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>`
 
-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.
+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.

CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

CMake/Packaging-2.cmake

@@ -0,0 +1,30 @@
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
+set(CPACK_COMPONENTS_ALL "ship" "appimage")
+
+if (NOT CPACK_GENERATOR STREQUAL "External")
+  list(REMOVE_ITEM CPACK_COMPONENTS_ALL "appimage")
+endif()
+
+if (CPACK_GENERATOR MATCHES "DEB|RPM")
+# https://unix.stackexchange.com/a/11552/254512
+set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/ship/bin")#/${CMAKE_PROJECT_VERSION}")
+set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
+elseif (CPACK_GENERATOR MATCHES "ZIP")
+set(CPACK_PACKAGING_INSTALL_PREFIX "")
+endif()
+
+if (CPACK_GENERATOR MATCHES "External")
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+SET(CPACK_MONOLITHIC_INSTALL 1)
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/bin")
+endif()
+
+if (CPACK_GENERATOR MATCHES "Bundle")
+    set(CPACK_BUNDLE_NAME "soh")
+    set(CPACK_BUNDLE_PLIST "../soh/macosx/Info.plist")
+    set(CPACK_BUNDLE_ICON "macosx/soh.icns")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "../soh/macosx/soh-macos.sh")
+    set(CPACK_BUNDLE_APPLE_CERT_APP "-")
+endif()
+

CMake/Packaging.cmake

@@ -0,0 +1,90 @@
+# these are cache variables, so they could be overwritten with -D,
+
+set(CPACK_PACKAGE_NAME "${PROJECT_NAME}"
+    CACHE STRING "The resulting package name"
+)
+
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Simple C++ application"
+    CACHE STRING "Package description for the package metadata"
+)
+set(CPACK_PACKAGE_VENDOR "Some Company")
+
+set(CPACK_VERBATIM_VARIABLES YES)
+
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+SET(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_SOURCE_DIR}/_packages")
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+set(CPACK_PACKAGE_CONTACT "YOUR@E-MAIL.net")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "YOUR NAME")
+
+#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(CPACK_SYSTEM_NAME ${LSB_RELEASE_CODENAME_SHORT})
+# package name for deb
+# if set, then instead of some-application-0.9.2-Linux.deb
+# you'll get some-application_0.9.2_amd64.deb (note the underscores too)
+#set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+set( CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-${ARCHITECTURE}.deb )
+# if you want every group to have its own package,
+# although the same happens if this is not sent (so it defaults to ONE_PER_GROUP)
+# and CPACK_DEB_COMPONENT_INSTALL is set to YES
+set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)#ONE_PER_GROUP)
+# without this you won't be able to pack only specified component
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+
+set(CPACK_EXTERNAL_ENABLE_STAGING YES)
+set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${PROJECT_BINARY_DIR}/appimage-generate.cmake")
+
+file(GENERATE
+  OUTPUT "${PROJECT_BINARY_DIR}/appimage-generate.cmake"
+  CONTENT [[
+include(CMakePrintHelpers)
+cmake_print_variables(CPACK_TEMPORARY_DIRECTORY)
+cmake_print_variables(CPACK_TOPLEVEL_DIRECTORY)
+cmake_print_variables(CPACK_PACKAGE_DIRECTORY)
+cmake_print_variables(CPACK_PACKAGE_FILE_NAME)
+
+find_program(LINUXDEPLOY_EXECUTABLE
+  NAMES linuxdeploy linuxdeploy-x86_64.AppImage
+  PATHS ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy)
+
+if (NOT LINUXDEPLOY_EXECUTABLE)
+  message(STATUS "Downloading linuxdeploy")
+  set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy)
+  file(DOWNLOAD 
+      https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+      ${LINUXDEPLOY_EXECUTABLE}
+      INACTIVITY_TIMEOUT 10
+      LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log
+      STATUS LINUXDEPLOY_DOWNLOAD)
+  execute_process(COMMAND chmod +x ${LINUXDEPLOY_EXECUTABLE} COMMAND_ECHO STDOUT)
+endif()
+
+execute_process(
+  COMMAND
+    ${CMAKE_COMMAND} -E env
+      OUTPUT=${CPACK_PACKAGE_FILE_NAME}.appimage
+      VERSION=$<IF:$<BOOL:${CPACK_PACKAGE_VERSION}>,${CPACK_PACKAGE_VERSION},0.1.0>
+    ${LINUXDEPLOY_EXECUTABLE}
+    --appimage-extract-and-run
+    --appdir=${CPACK_TEMPORARY_DIRECTORY}
+    --executable=$<TARGET_FILE:soh>
+    $<$<BOOL:$<TARGET_PROPERTY:soh,APPIMAGE_DESKTOP_FILE>>:--desktop-file=$<TARGET_PROPERTY:soh,APPIMAGE_DESKTOP_FILE>>
+    $<$<BOOL:$<TARGET_PROPERTY:soh,APPIMAGE_ICON_FILE>>:--icon-file=$<TARGET_PROPERTY:soh,APPIMAGE_ICON_FILE>>
+    --output=appimage
+    # --verbosity=2
+)
+]])
+
+endif()
+
+include(CPack)
+

CMake/Utils.cmake

@@ -0,0 +1,248 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")
+
+function(get_linux_lsb_release_information)
+    find_program(LSB_RELEASE_EXEC lsb_release)
+    if(NOT LSB_RELEASE_EXEC)
+        message(FATAL_ERROR "Could not detect lsb_release executable, can not gather required information")
+    endif()
+
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --release OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename OUTPUT_VARIABLE LSB_RELEASE_CODENAME_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    set(LSB_RELEASE_ID_SHORT "${LSB_RELEASE_ID_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_VERSION_SHORT "${LSB_RELEASE_VERSION_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_CODENAME_SHORT "${LSB_RELEASE_CODENAME_SHORT}" PARENT_SCOPE)
+endfunction()

CMake/automate-vcpkg.cmake

@@ -0,0 +1,191 @@
+#------------------------------------------------------------------------------------------------------------
+#
+# Automate-VCPKG by Andre Taulien
+# ===============================
+#
+# Project Repository: https://github.com/REGoth-project/Automate-VCPKG
+# License ..........: MIT, see end of file.
+#
+# Based on: https://github.com/sutambe/cpptruths/blob/vcpkg_cmake_blog/cpp0x/vcpkg_test/CMakeLists.txt
+#
+# 
+# While [Vcpkg](https://github.com/microsoft/vcpkg) on it's own is awesome, it does add 
+# a little bit of complexity to getting a project to build. Even more if the one trying 
+# to compile your application is not too fond of the commandline. Additionally, CMake 
+# commands tend to get rather long with the toolchain path. 
+# 
+# To keep things simple for new users who just want to get the project to build, this 
+# script offers a solution.
+# 
+# Lets assume your main `CMakelists.txt` looks something like this:
+#
+#     cmake_minimum_required (VERSION 3.12.0)
+#     project (MyProject)
+#     
+#     add_executable(MyExecutable main.c)
+# 
+# To integrate Vcpkg into that `CMakelists.txt`, simple put the following lines before the 
+# call to `project(MyProject)`:
+# 
+#     include(cmake/automate-vcpkg.cmake)
+#     
+#     vcpkg_bootstrap()
+#     vcpkg_install_packages(libsquish physfs)
+# 
+# The call to `vcpkg_bootstrap()` will clone the official Vcpkg repository and bootstrap it. 
+# If it detected an existing environment variable defining a valid `VCPKG_ROOT`, it will 
+# update the existing installation of Vcpkg.
+# 
+# Arguments to `vcpkg_install_packages()` are the packages you want to install using Vcpkg.
+# 
+# If you want to keep the possibility for users to chose their own copy of Vcpkg, you can 
+# simply not run the code snippet mentioned above, something like this will work:
+# 
+#     option(SKIP_AUTOMATE_VCPKG "When ON, you will need to built the packages 
+#      required by MyProject on your own or supply your own vcpkg toolchain.")
+#     
+#     if (NOT SKIP_AUTOMATE_VCPKG)
+#       include(cmake/automate-vcpkg.cmake)
+#     
+#       vcpkg_bootstrap()
+#       vcpkg_install_packages(libsquish physfs)
+#     endif()
+#  
+# Then, the user has to supply the packages on their own, be it through Vcpkg or manually 
+# specifying their locations.
+#------------------------------------------------------------------------------------------------------------
+
+cmake_minimum_required (VERSION 3.12)
+
+if(WIN32)
+    set(VCPKG_FALLBACK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/vcpkg CACHE STRING "vcpkg configuration directory to use if vcpkg was not installed on the system before")
+else()
+    set(VCPKG_FALLBACK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/.vcpkg CACHE STRING  "vcpkg configuration directory to use if vcpkg was not installed on the system before")
+endif()
+
+# On Windows, Vcpkg defaults to x86, even on x64 systems. If we're 
+# doing a 64-bit build, we need to fix that.
+if (WIN32)
+
+    # Since the compiler checks haven't run yet, we need to figure
+    # out the value of CMAKE_SIZEOF_VOID_P ourselfs
+
+    include(CheckTypeSize)
+    enable_language(C)
+    check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY)
+    
+    if (SIZEOF_VOID_P EQUAL 8)
+        message(STATUS "Using Vcpkg triplet 'x64-windows'")
+        
+        set(VCPKG_TRIPLET x64-windows)
+    endif()
+endif()
+
+if(NOT DEFINED VCPKG_ROOT)
+    if(NOT DEFINED ENV{VCPKG_ROOT})
+	    set(VCPKG_ROOT ${VCPKG_FALLBACK_ROOT})
+    else()
+        set(VCPKG_ROOT $ENV{VCPKG_ROOT})
+    endif()
+endif()
+
+# Installs a new copy of Vcpkg or updates an existing one
+macro(vcpkg_bootstrap)
+    _install_or_update_vcpkg()
+
+    # Find out whether the user supplied their own VCPKG toolchain file
+    if(NOT DEFINED ${CMAKE_TOOLCHAIN_FILE})
+        # We know this wasn't set before so we need point the toolchain file to the newly found VCPKG_ROOT
+        set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake CACHE STRING "")
+    
+        # Just setting vcpkg.cmake as toolchain file does not seem to actually pull in the code
+        include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
+    
+        set(AUTOMATE_VCPKG_USE_SYSTEM_VCPKG OFF)
+    else()
+        # VCPKG_ROOT has been defined by the toolchain file already
+        set(AUTOMATE_VCPKG_USE_SYSTEM_VCPKG ON)
+    endif()
+    
+    message(STATUS "Automate VCPKG status:")
+    message(STATUS "  VCPKG_ROOT.....: ${VCPKG_ROOT}")
+    message(STATUS "  VCPKG_EXEC.....: ${VCPKG_EXEC}")
+    message(STATUS "  VCPKG_BOOTSTRAP: ${VCPKG_BOOTSTRAP}")
+endmacro()
+
+macro(_install_or_update_vcpkg)
+    if(NOT EXISTS ${VCPKG_ROOT})
+        message(STATUS "Cloning vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
+
+        # If a reproducible build is desired (and potentially old libraries are # ok), uncomment the
+        # following line and pin the vcpkg repository to a specific githash.
+        # execute_process(COMMAND git checkout 745a0aea597771a580d0b0f4886ea1e3a94dbca6 WORKING_DIRECTORY ${VCPKG_ROOT})
+    else()
+        # The following command has no effect if the vcpkg repository is in a detached head state.
+        message(STATUS "Auto-updating vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND git pull WORKING_DIRECTORY ${VCPKG_ROOT})
+    endif()
+
+    if(NOT EXISTS ${VCPKG_ROOT}/README.md)
+        message(FATAL_ERROR "***** FATAL ERROR: Could not clone vcpkg *****")
+    endif()
+
+    if(WIN32)
+        set(VCPKG_EXEC ${VCPKG_ROOT}/vcpkg.exe)
+        set(VCPKG_BOOTSTRAP ${VCPKG_ROOT}/bootstrap-vcpkg.bat)
+    else()
+        set(VCPKG_EXEC ${VCPKG_ROOT}/vcpkg)
+        set(VCPKG_BOOTSTRAP ${VCPKG_ROOT}/bootstrap-vcpkg.sh)
+    endif()
+
+    if(NOT EXISTS ${VCPKG_EXEC})
+        message("Bootstrapping vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND ${VCPKG_BOOTSTRAP} WORKING_DIRECTORY ${VCPKG_ROOT})
+    endif()
+
+    if(NOT EXISTS ${VCPKG_EXEC})
+        message(FATAL_ERROR "***** FATAL ERROR: Could not bootstrap vcpkg *****")
+    endif()
+   
+endmacro()
+
+# Installs the list of packages given as parameters using Vcpkg
+macro(vcpkg_install_packages)
+    
+    # Need the given list to be space-separated
+    #string (REPLACE ";" " " PACKAGES_LIST_STR "${ARGN}")
+
+    message(STATUS "Installing/Updating the following vcpkg-packages: ${PACKAGES_LIST_STR}")
+
+    if (VCPKG_TRIPLET)
+        set(ENV{VCPKG_DEFAULT_TRIPLET} "${VCPKG_TRIPLET}")
+    endif()
+
+    execute_process(
+        COMMAND ${VCPKG_EXEC} install ${ARGN}
+        WORKING_DIRECTORY ${VCPKG_ROOT}
+        )
+endmacro()
+    
+# MIT License
+# 
+# Copyright (c) 2019 REGoth-project
+# 
+# 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.

CMakeLists.txt

@@ -0,0 +1,216 @@
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+
+set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
+#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") - issue with soh compile with MSVC
+
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
+
+project(Ship C CXX)
+
+set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_PATCH "0")
+
+set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
+add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+include(CMake/automate-vcpkg.cmake)
+
+set(VCPKG_TRIPLET x64-windows-static)
+set(VCPKG_TARGET_TRIPLET x64-windows-static)
+
+vcpkg_bootstrap()
+vcpkg_install_packages(zlib bzip2 libpng SDL2 SDL2-net GLEW glfw3)
+endif()
+
+################################################################################
+# Set target arch type if empty. Visual studio solution generator provides it.
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    if(NOT CMAKE_VS_PLATFORM_NAME)
+        set(CMAKE_VS_PLATFORM_NAME "x64")
+    endif()
+    message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+
+    if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+        OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+        message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+    endif()
+endif()
+
+################################################################################
+# Global configuration types
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+set(CMAKE_C_FLAGS_DEBUG "-O3 -ffast-math")
+set(CMAKE_CXX_FLAGS_DEBUG "-O3 -ffast-math")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+else()
+set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+endif()
+
+if(NOT CMAKE_BUILD_TYPE )
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+endif()
+
+################################################################################
+# Global compiler options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_C_FLAGS "")
+    set(CMAKE_C_FLAGS_DEBUG "")
+    set(CMAKE_C_FLAGS_RELEASE "")
+    set(CMAKE_CXX_FLAGS "")
+    set(CMAKE_CXX_FLAGS_DEBUG "")
+    set(CMAKE_CXX_FLAGS_RELEASE "")
+endif()
+
+################################################################################
+# Global linker options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_EXE_LINKER_FLAGS "")
+    set(CMAKE_MODULE_LINKER_FLAGS "")
+    set(CMAKE_SHARED_LINKER_FLAGS "")
+    set(CMAKE_STATIC_LINKER_FLAGS "")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
+endif()
+
+################################################################################
+# Common utils
+################################################################################
+include(CMake/Utils.cmake)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    get_linux_lsb_release_information()
+    message(STATUS "Linux ${LSB_RELEASE_ID_SHORT} ${LSB_RELEASE_VERSION_SHORT} ${LSB_RELEASE_CODENAME_SHORT}")
+else()
+    message(STATUS ${CMAKE_SYSTEM_NAME})
+endif()
+
+################################################################################
+# Additional Global Settings(add specific info there)
+################################################################################
+include(CMake/GlobalSettingsInclude.cmake OPTIONAL)
+
+################################################################################
+# Use solution folders feature
+################################################################################
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+################################################################################
+# Sub-projects
+################################################################################
+add_subdirectory(libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
+add_subdirectory(ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+add_subdirectory(ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+add_subdirectory(OTRExporter)
+add_subdirectory(soh)
+if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|NintendoSwitch|CafeOS")
+add_subdirectory(OTRGui)
+endif()
+
+set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE_TERMINAL YES)
+set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.desktop")
+set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
+
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+install(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
+endif()
+
+find_package(Python3 COMPONENTS Interpreter)
+
+add_custom_target(
+    ExtractAssets
+    # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
+    COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f oot.otr
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>"
+    COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${CMAKE_SOURCE_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${CMAKE_BINARY_DIR}/soh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
+    COMMENT "Running asset extraction..."
+    DEPENDS ZAPD
+    BYPRODUCTS oot.otr ${CMAKE_SOURCE_DIR}/oot.otr
+)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    find_package(ImageMagick COMPONENTS convert)
+    if (ImageMagick_FOUND)
+        execute_process (
+            COMMAND ${ImageMagick_convert_EXECUTABLE} soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
+            OUTPUT_VARIABLE outVar
+        )
+    endif()
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+add_custom_target(CreateOSXIcons
+    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+    COMMAND sips -z 16 16     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
+    COMMAND sips -z 64 64     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
+    COMMAND sips -z 128 128   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
+    COMMAND cp                soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
+    COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMENT "Creating OSX icons ..."
+    )
+add_dependencies(soh CreateOSXIcons)
+
+add_custom_target(Assets ALL
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/OTRGui/assets/extractor" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/extractor" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/OTRExporter/assets" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/game" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/soh/assets/xml" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    )
+add_dependencies(soh Assets)
+
+install(TARGETS ZAPD DESTINATION ${CMAKE_BINARY_DIR}/assets/extractor)
+
+set(PROGRAM_PERMISSIONS_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+
+install(DIRECTORY ${CMAKE_BINARY_DIR}/assets
+        DESTINATION .
+        PATTERN ZAPD.out
+        PERMISSIONS ${PROGRAM_PERMISSIONS_EXECUTE}
+        )
+
+install(CODE "
+    include(BundleUtilities)
+    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\")
+    ")
+
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch|CafeOS")
+install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION . COMPONENT ship RENAME readme.txt )
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(CPACK_GENERATOR "External")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch|CafeOS")
+    set(CPACK_GENERATOR "ZIP")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    set(CPACK_GENERATOR "Bundle")
+endif()
+
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/CMake/Packaging-2.cmake)
+include(CMake/Packaging.cmake)

Dockerfile

@@ -1,38 +1,68 @@
-
-
-FROM ubuntu:21.04 as build
+FROM ubuntu:20.04 as build
 
 ENV LANG C.UTF-8
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y \
-        binutils:i386 \
-        gcc-10:i386 \
-        g++-10:i386 \
-        python3.10 \
-        python \
-        make \
-        cmake \
-        git \
-        lld \
-        libsdl2-dev:i386 \
-        zlib1g-dev:i386 \
-        libbz2-dev:i386 \
-        libpng-dev:i386 \
-        libgles2-mesa-dev && \
-    ln -sf /usr/bin/python3.10 /usr/bin/python3 && \
-    ln -s /usr/bin/gcc-10 /usr/bin/gcc && \
-    ln -s /usr/bin/gcc-10 /usr/bin/cc && \
-    ln -s /usr/bin/g++-10 /usr/bin/g++ && \
-    ln -s /usr/bin/g++-10 /usr/bin/c++
-
+ENV GCCVER=10
+RUN apt-get update && \
+	apt-get upgrade -y && \
+	apt-get install -y \
+		binutils \
+		gcc-${GCCVER} \
+		g++-${GCCVER} \
+		patchelf \
+		p7zip-full \
+		python3 \
+		cmake \
+		make \
+		curl \
+		git \
+		lld \
+		libsdl2-dev \
+		zlib1g-dev \
+		libbz2-dev \
+		libpng-dev \
+		libgles2-mesa-dev \
+		wget \
+		gpg \
+		imagemagick \
+		ninja-build && \
+	apt-get install -y software-properties-common && \ 
+	wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
+	apt-add-repository "deb https://apt.kitware.com/ubuntu/ focal main" && \
+	apt-get update && \
+	apt-get upgrade -y && \
+	update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCCVER} 10 && \
+	update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCCVER} 10 
+	
 RUN git clone https://github.com/Perlmint/glew-cmake.git && \
-    cmake glew-cmake && \
-    make -j$(nproc) && \
-    make install ARCH64=false
+	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 --build=x86_64-linux-gnu && \
+	make -j$(nproc) && make install && \
+	rm ../SDL2-${SDL2VER}.tar.gz && \
+	cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+
+RUN \
+	ln -sf /proc/self/mounts /etc/mtab && \
+	mkdir -p /usr/local/share/keyring/ && \
+	wget -O /usr/local/share/keyring/devkitpro-pub.gpg https://apt.devkitpro.org/devkitpro-pub.gpg && \
+	echo "deb [signed-by=/usr/local/share/keyring/devkitpro-pub.gpg] https://apt.devkitpro.org stable main" > /etc/apt/sources.list.d/devkitpro.list && \
+	apt-get update -y && \
+	apt-get install -y devkitpro-pacman && \
+	yes | dkp-pacman -Syu switch-dev switch-portlibs wiiu-dev wiiu-portlibs --noconfirm
+
+ENV DEVKITPRO=/opt/devkitpro
+ENV DEVKITARM=/opt/devkitpro/devkitARM
+ENV DEVKITPPC=/opt/devkitpro/devkitPPC
+ENV PATH=$PATH:/opt/devkitpro/portlibs/switch/bin/:$DEVKITPPC/bin
+ENV WUT_ROOT=$DEVKITPRO/wut
 
 RUN mkdir /soh
 WORKDIR /soh

Jenkinsfile

@@ -4,114 +4,227 @@ pipeline {
     options {
         timestamps() 
         skipDefaultCheckout(true)
+        disableConcurrentBuilds(abortPrevious: true)
     }
     
     stages {
-        stage ('Build Windows') {
-            environment {
-                MSBUILD='C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Msbuild\\Current\\Bin\\msbuild.exe'
-                CONFIG='Release'
-                OTRPLATFORM='x64'
-                PLATFORM='x86'
-                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'
-            }
+        stage('Generate Assets') {
             agent {
-                label "SoH-Builders"
+                label "SoH-Asset-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\\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
+                timeout(time: 10) {
+                    checkout([
+                        $class: 'GitSCM',
+                        branches: scm.branches,
+                        doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                        extensions: scm.extensions,
+                        userRemoteConfigs: scm.userRemoteConfigs
+                    ])
+                    sh '''
+                        cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+                        cmake --build build-cmake --target ExtractAssets --config Release
+                    '''
+                    stash includes: 'soh/assets/**/*', name: 'assets'
                 }
             }
             post {
-                always {
+                unsuccessful {
                     step([$class: 'WsCleanup']) // Clean workspace
                 }
             }
         }
-        stage ('Build Linux') {
-            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 build/readme.txt
-                    cd build
+        stage('Build SoH') {
+            parallel {
+                stage ('Build Windows') {
+                    environment {
+                        PLATFORM='x64'
+                        PYTHON='C:\\Users\\jenkins\\AppData\\Local\\Programs\\Python\\Python310\\python.exe'
+                        CMAKE='C:\\Program Files\\CMake\\bin\\cmake.exe'
+                        CPACK='C:\\Program Files\\CMake\\bin\\cpack.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') {
+                            unstash 'assets'
+                            bat """                             
+                            "${env.CMAKE}" -S . -B "build\\${env.PLATFORM}" -G "Visual Studio 17 2022" -T ${env.TOOLSET} -A ${env.PLATFORM} -D Python_EXECUTABLE=${env.PYTHON} -D CMAKE_BUILD_TYPE:STRING=Release
+                            "${env.CMAKE}" --build ".\\build\\${env.PLATFORM}" --target OTRGui --config Release
+                            "${env.CMAKE}" --build ".\\build\\${env.PLATFORM}" --config Release
+                            cd  ".\\build\\${env.PLATFORM}"
+                            "${env.CPACK}" -G ZIP
+                            cd "..\\..\\"
 
-                    7z a soh-linux.7z soh.elf OTRGui assets readme.txt
-                    mv soh-linux.7z ../
-                    
-                    '''
+                            move "_packages\\*.zip" "soh.zip"
+                            """
+                        }
+                        archiveArtifacts artifacts: 'soh.zip', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
                 }
-                sh 'sudo docker container stop sohcont'
-                archiveArtifacts artifacts: 'soh-linux.7z', followSymlinks: false, onlyIfSuccessful: true
-            }
-            post {
-                always {
-                    step([$class: 'WsCleanup']) // Clean workspace
+                stage ('Build Linux') {
+                    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') {
+                            unstash 'assets'
+                            sh '''
+                            if docker ps -aq --filter "name=sohcont" | grep -q .; then docker rm -f sohcont; fi
+                            docker build . -t soh
+                            docker run --name sohcont -dit --rm -v $(pwd):/soh soh /bin/bash
+                            docker exec sohcont scripts/linux/appimage/build.sh
+                            
+                            mv README.md readme.txt
+                            mv build-cmake/*.appimage soh.appimage
+
+                            7z a soh-linux.7z soh.appimage readme.txt
+                            
+                            '''
+                        }
+                        archiveArtifacts artifacts: 'soh-linux.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            sh 'sudo docker container stop sohcont'
+                            sh 'docker images --quiet --filter=dangling=true | xargs --no-run-if-empty docker rmi' // Clean dangling docker images
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+                stage ('Build macOS') {
+                    agent {
+                        label "SoH-Mac-Builders"
+                    }
+                    steps {
+                        checkout([
+                            $class: 'GitSCM',
+                            branches: scm.branches,
+                            doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                            extensions: scm.extensions,
+                            userRemoteConfigs: scm.userRemoteConfigs
+                        ])
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            unstash 'assets'
+                            sh '''
+                            cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+                            cmake --build build-cmake --config Release --
+                            (cd build-cmake && cpack)
+
+                            mv README.md readme.txt		
+                            mv _packages/*.dmg SoH.dmg
+                            
+                            7z a soh-mac.7z SoH.dmg readme.txt
+                            '''
+                        }
+                        archiveArtifacts artifacts: 'soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+                stage ('Build Switch') {
+                    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') {
+                            unstash 'assets'
+                            sh '''                            
+                            if docker ps -aq --filter "name=sohswitchcont" | grep -q .; then docker rm -f sohswitchcont; fi
+                            docker build . -t sohswitch
+                            docker run --name sohswitchcont -dit --rm -v $(pwd):/soh sohswitch /bin/bash
+                            docker exec sohswitchcont scripts/switch/build.sh
+                            
+                            mv build-switch/soh/*.nro soh.nro
+                            mv README.md readme.txt
+                            
+                            7z a soh-switch.7z soh.nro readme.txt
+                            
+                            '''
+                        }
+                        archiveArtifacts artifacts: 'soh-switch.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            sh 'sudo docker container stop sohswitchcont'
+                            sh 'docker images --quiet --filter=dangling=true | xargs --no-run-if-empty docker rmi' // Clean dangling docker images
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
+                }
+                stage ('Build Wii U') {
+                    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') {
+                            unstash 'assets'
+                            sh '''
+                            if docker ps -aq --filter "name=sohwiiucont" | grep -q .; then docker rm -f sohwiiucont; fi
+                            docker build . -t sohwiiu
+                            docker run --name sohwiiucont -dit --rm -v $(pwd):/soh sohwiiu /bin/bash
+                            docker exec sohwiiucont scripts/wiiu/build.sh
+                            
+                            mv build-wiiu/soh/*.rpx soh.rpx
+                            mv build-wiiu/soh/*.wuhb soh.wuhb
+                            mv README.md readme.txt
+                            
+                            7z a soh-wiiu.7z soh.rpx soh.wuhb readme.txt
+                            
+                            '''
+                        }
+                        archiveArtifacts artifacts: 'soh-wiiu.7z', followSymlinks: false, onlyIfSuccessful: true
+                    }
+                    post {
+                        always {
+                            sh 'sudo docker container stop sohwiiucont'
+                            sh 'docker images --quiet --filter=dangling=true | xargs --no-run-if-empty docker rmi' // Clean dangling docker images
+                            step([$class: 'WsCleanup']) // Clean workspace
+                        }
+                    }
                 }
             }
         }
     }
 }
+

OTRExporter/.gitignore

@@ -341,6 +341,7 @@ build/
 ZAPDUtils/build/
 ZAPD/BuildInfo.h
 baserom/
+baserom_ntsc/
 *.vtx.inc
 *.otr
 *.swp

OTRExporter/CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

OTRExporter/CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

OTRExporter/CMake/Utils.cmake

@@ -0,0 +1,233 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")

OTRExporter/CMakeLists.txt

@@ -0,0 +1,96 @@
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+
+set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
+#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use")
+set(CMAKE_C_STANDARD 11)
+
+project(OTRExporter C CXX)
+
+################################################################################
+# Set target arch type if empty. Visual studio solution generator provides it.
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if(NOT CMAKE_VS_PLATFORM_NAME)
+		set(CMAKE_VS_PLATFORM_NAME "x64")
+	endif()
+	message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+
+	if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+		OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+		message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+	endif()
+endif()
+
+################################################################################
+# Global configuration types
+################################################################################
+set(CMAKE_CONFIGURATION_TYPES
+    "Debug"
+    "Release"
+    CACHE STRING "" FORCE
+)
+
+################################################################################
+# Global compiler options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_C_FLAGS "")
+    set(CMAKE_C_FLAGS_DEBUG "")
+    set(CMAKE_C_FLAGS_RELEASE "")
+    set(CMAKE_CXX_FLAGS "")
+    set(CMAKE_CXX_FLAGS_DEBUG "")
+    set(CMAKE_CXX_FLAGS_RELEASE "")
+endif()
+
+################################################################################
+# Global linker options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_EXE_LINKER_FLAGS "")
+    set(CMAKE_MODULE_LINKER_FLAGS "")
+    set(CMAKE_SHARED_LINKER_FLAGS "")
+    set(CMAKE_STATIC_LINKER_FLAGS "")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
+endif()
+
+################################################################################
+# Common utils
+################################################################################
+include(CMake/Utils.cmake)
+
+################################################################################
+# Additional Global Settings(add specific info there)
+################################################################################
+include(CMake/GlobalSettingsInclude.cmake OPTIONAL)
+
+################################################################################
+# Use solution folders feature
+################################################################################
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+################################################################################
+# Sub-projects
+################################################################################
+if (NOT TARGET libultraship)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
+endif()
+
+if (NOT TARGET ZAPD)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+endif()
+
+if (NOT TARGET ZAPDUtils)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+endif()
+
+add_subdirectory(OTRExporter)

OTRExporter/OTRExporter.sln

@@ -1,68 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTRExporter", "OTRExporter\OTRExporter.vcxproj", "{A6103FD3-0709-4FC7-B066-1A6E056D6306}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libultraship", "..\libultraship\libultraship\libultraship.vcxproj", "{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "..\ZAPDTR\ZAPD\ZAPD.vcxproj", "{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{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}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "..\ZAPDTR\ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x64.ActiveCfg = Debug|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x64.Build.0 = Debug|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x86.ActiveCfg = Debug|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x86.Build.0 = Debug|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x64.ActiveCfg = Release|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x64.Build.0 = Release|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x86.ActiveCfg = Release|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x86.Build.0 = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.ActiveCfg = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.Build.0 = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.ActiveCfg = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.Build.0 = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.ActiveCfg = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.Build.0 = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.ActiveCfg = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.Build.0 = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.ActiveCfg = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.Build.0 = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.ActiveCfg = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.Build.0 = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.ActiveCfg = Release|x64
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DCE19FF1-37C0-49CD-915A-DD695E15F00B}
-	EndGlobalSection
-EndGlobal

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/CMakeLists.txt

@@ -0,0 +1,249 @@
+set(PROJECT_NAME OTRExporter)
+
+################################################################################
+# Source groups
+################################################################################
+set(Header_Files
+    "AnimationExporter.h"
+    "ArrayExporter.h"
+    "AudioExporter.h"
+    "BackgroundExporter.h"
+    "BlobExporter.h"
+    "CollisionExporter.h"
+    "command_macros_base.h"
+    "CutsceneExporter.h"
+    "DisplayListExporter.h"
+    "Exporter.h"
+    "Main.h"
+    "MtxExporter.h"
+    "PathExporter.h"
+    "PlayerAnimationExporter.h"
+    "RoomExporter.h"
+    "SkeletonExporter.h"
+    "SkeletonLimbExporter.h"
+    "TextExporter.h"
+    "TextureExporter.h"
+    "VersionInfo.h"
+    "VtxExporter.h"
+    "z64cutscene.h"
+    "z64cutscene_commands.h"
+)
+source_group("Header Files" FILES ${Header_Files})
+
+set(Source_Files
+    "AnimationExporter.cpp"
+    "ArrayExporter.cpp"
+    "AudioExporter.cpp"
+    "BackgroundExporter.cpp"
+    "BlobExporter.cpp"
+    "CollisionExporter.cpp"
+    "CutsceneExporter.cpp"
+    "DisplayListExporter.cpp"
+    "Exporter.cpp"
+    "Main.cpp"
+    "MtxExporter.cpp"
+    "PathExporter.cpp"
+    "PlayerAnimationExporter.cpp"
+    "RoomExporter.cpp"
+    "SkeletonExporter.cpp"
+    "SkeletonLimbExporter.cpp"
+    "TextExporter.cpp"
+    "TextureExporter.cpp"
+    "VersionInfo.cpp"
+    "VtxExporter.cpp"
+)
+source_group("Source Files" FILES ${Source_Files})
+
+set(ALL_FILES
+    ${Header_Files}
+    ${Source_Files}
+)
+
+################################################################################
+# Target
+################################################################################
+add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+set(ROOT_NAMESPACE OTRExporter)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		VS_GLOBAL_KEYWORD "Win32Proj"
+	)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
+endif()
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG;"
+				"_CRT_SECURE_NO_WARNINGS"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"WIN32;"
+			"_CONSOLE;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+		">"
+		"$<$<CONFIG:Release>:"
+			"NDEBUG"
+		">"
+		"_CONSOLE;"
+		"_CRT_SECURE_NO_WARNINGS;"
+		"UNICODE;"
+		"_UNICODE"
+	)
+endif()
+################################################################################
+# Compile and link options
+################################################################################
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPD/
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship/Lib/spdlog/include
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship/Lib/Fast3D/U64
+	${CMAKE_CURRENT_SOURCE_DIR}/../../StormLib/src
+	.
+)
+
+if(MSVC)
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    endif()
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /DEBUG;
+                /OPT:REF;
+                /OPT:ICF;
+                /INCREMENTAL:NO
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_options(${PROJECT_NAME} PRIVATE
+		-Wall -Wextra -Wno-error
+        -Wno-unused-parameter
+        -Wno-unused-function
+        -Wno-unused-variable
+		-Wno-missing-field-initializers
+        -Wno-parentheses
+        -Wno-narrowing
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
+	)
+endif()
+################################################################################
+# Dependencies
+################################################################################
+add_dependencies(${PROJECT_NAME}
+    libultraship
+)
+
+# Link with other targets.
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set(ADDITIONAL_LIBRARY_DEPENDENCIES
+			"$<$<CONFIG:Debug>:"
+				"ZAPDUtils;"
+				"OTRLib"
+			">"
+		)
+	endif()
+endif()
+target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
+

OTRExporter/OTRExporter/DisplayListExporter.cpp

@@ -96,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;
 		}
@@ -114,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;
 		}
@@ -131,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;
 		}
@@ -169,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;
 		}
@@ -188,7 +188,7 @@ 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;
 		}
@@ -204,7 +204,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 				mm = (mm & 0x0FFFFFFF) + 1;
 
-				Gfx value = gsSPMatrix(mm, pp);
+				Gfx value = {gsSPMatrix(mm, pp)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 			}
@@ -214,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;
 
@@ -253,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;
 		}
@@ -263,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;
 		}
@@ -279,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;
 			}
@@ -292,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;
 		}
@@ -305,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;
 		}
@@ -324,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;
 
@@ -362,18 +362,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 						BinaryWriter dlWriter = BinaryWriter(dlStream);
 
 						Save(dList->otherDLists[i], outPath, &dlWriter);
-
-#ifdef _DEBUG
-						//if (otrArchive->HasFile(fName))
-							//otrArchive->RemoveFile(fName);
-#endif
-
-						if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-							File::WriteAllBytes("Extract/" + fName, dlStream->ToVector());
-						else
-							files[fName] = dlStream->ToVector();
-
-						//otrArchive->AddFile(fName, (uintptr_t)dlStream->ToVector().data(), dlWriter.GetBaseAddress());
+						AddFile(fName, dlStream->ToVector());
 					}
 				}
 				else
@@ -400,9 +389,9 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				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;
@@ -460,10 +449,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 
 							Save(dList->otherDLists[i], outPath, &dlWriter);
 
-							if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-								File::WriteAllBytes("Extract/" + fName, dlStream->ToVector());
-							else
-								files[fName] = dlStream->ToVector();
+							AddFile(fName, dlStream->ToVector());
 						}
 					}
 					else
@@ -483,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;
 		}
@@ -494,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;
 		}
@@ -508,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;
 		}
@@ -520,7 +506,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			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;
 		}
@@ -534,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;
 		}
@@ -548,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;
 		}
@@ -566,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;
@@ -597,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;
 		}
@@ -621,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;
 		}
@@ -634,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;
 		}
@@ -644,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;
 		}
@@ -657,7 +643,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			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;
 		}
@@ -667,15 +653,20 @@ 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), res->parent->workerID))
+			if (!Globals::Instance->HasSegment(GETSEGNUM(seg), res->parent->workerID) || (res->GetName() == "sShadowMaterialDL"))
 			{
+				if (res->GetName() == "sShadowMaterialDL") {
+					// sShadowMaterialDL (In ovl_En_Jsjutan) has a texture in bss. This is a hack to override the reference to one
+					// to segment C. The actor has been modified to load the texture into segment C.
+					seg = 0x0C000000;
+				}
 				int32_t __ = (data & 0x00FF000000000000) >> 48;
 				int32_t www = (data & 0x00000FFF00000000) >> 32;
 
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;
 
-				Gfx value = gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1);
+				Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1)};
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 
@@ -693,7 +684,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;
@@ -736,7 +727,7 @@ 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 | 1;
@@ -759,7 +750,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;
@@ -827,10 +818,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 							}
 						}
 
-						if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-							File::WriteAllBytes("Extract/" + fName, vtxStream->ToVector());
-						else
-							files[fName] = vtxStream->ToVector();
+						AddFile(fName, vtxStream->ToVector());
 
 						auto end = std::chrono::steady_clock::now();
 						size_t diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
@@ -910,4 +898,4 @@ std::string OTRExporter_DisplayList::GetPrefix(ZResource* res)
 		prefix = "code";
 
 	return prefix;
-}
+}

OTRExporter/OTRExporter/Exporter.cpp

@@ -1,15 +1,16 @@
 #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)Endianness::Little); // 0x00
 	writer->Write((uint8_t)0); // 0x01
 	writer->Write((uint8_t)0); // 0x02
 	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>
@@ -26,6 +27,7 @@ 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();
 
@@ -45,7 +47,7 @@ static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileM
 		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");
 
@@ -61,13 +63,29 @@ static void ExporterProgramEnd()
 {
 	if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
 	{
-		printf("Generating OTR Archive...\n");
-		otrArchive = Ship::Archive::CreateArchive(otrFileName, 65536 / 2);
+		printf("Creating version file...\n");
 
-		for (auto item : files)
-		{
+		// Get crc from rom
+		std::string romPath = Globals::Instance->baseRomPath.string();
+		std::vector<uint8_t> romData = File::ReadAllBytes(romPath);
+		uint32_t crc = BitConverter::ToUInt32BE(romData, 0x10);
+
+		// Write crc to version file
+		fs::path versionPath("Extract/version");
+		std::ofstream versionFile(versionPath.c_str(), std::ios::out | std::ios::binary);
+		versionFile.write((char*)&crc, sizeof(crc));
+		versionFile.flush();
+		versionFile.close();
+
+		printf("Created version file.\n");
+
+		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());
+			otrArchive->AddFile(item.first, (uintptr_t)fileData.data(),
+		                      fileData.size());
 		}
 
 		// Add any additional files that need to be manually copied...
@@ -79,9 +97,9 @@ static void ExporterProgramEnd()
 			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());
+		//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());
 	}
 }
 
@@ -158,7 +176,10 @@ static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
 			fName = StringHelper::Sprintf("%s/%s", oName.c_str(), rName.c_str());
 
 		if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+		{
+			std::unique_lock Lock(fileMutex);
 			files[fName] = strem->ToVector();
+		}
 		else
 			File::WriteAllBytes("Extract/" + fName, strem->ToVector());
 	}
@@ -178,6 +199,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".
@@ -211,6 +243,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

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

OTRExporter/OTRExporter/Makefile

@@ -1,70 +0,0 @@
-# Only used for standalone compilation, usually inherits these from the main makefile
-
-CXX := g++
-AR	:= ar
-FORMAT := clang-format-11
-
-ASAN ?= 0
-DEBUG ?= 1
-OPTFLAGS ?= -O0
-LTO ?= 0
-
-WARN := -Wall -Wextra -Werror \
-	-Wno-unused-parameter \
-	-Wno-unused-function \
-	-Wno-unused-variable
-
-
-CXXFLAGS := $(WARN) -std=c++17 
-CPPFLAGS := -MMD
-
-ifneq ($(DEBUG),0)
-	CXXFLAGS += -g
-endif
-
-ifneq ($(ASAN),0)
-	CXXFLAGS += -fsanitize=address
-endif
-
-ifneq ($(LTO),0)
-	CXXFLAGS += -flto
-endif
-
-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))
-
-O_FILES   := $(CXX_FILES:%.cpp=build/%.o)
-D_FILES   := $(O_FILES:%.o=%.d)
-LIB       := OTRExporter.a
-
-INC_DIRS := $(addprefix -I, \
-	../../ZAPDTR/ZAPD \
-	../../ZAPDTR/lib/tinyxml2 \
-	../../ZAPDTR/lib/libgfxd \
-	../../ZAPDTR/ZAPDUtils \
-	../../libultraship/libultraship \
-	../../libultraship/libultraship/Lib/spdlog/include \
-	../../libultraship/libultraship/Lib/Fast3D/U64 \
-)
-
-# create build directories
-$(shell mkdir -p $(SRC_DIRS:%=build/%))
-
-all: $(LIB)
-
-clean:
-	rm -rf build $(LIB)
-
-format:
-	$(FORMAT) -i $(CXX_FILES) $(H_FILES)
-
-.PHONY: all clean format
-
-build/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) -c $< -o $@
-
-$(LIB): $(O_FILES)
-	$(AR) rcs $@ $^
-
--include $(D_FILES)

OTRExporter/OTRExporter/OTRExporter.vcxproj

@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ArrayExporter.h" />
-    <ClInclude Include="BackgroundExporter.h" />
-    <ClInclude Include="BlobExporter.h" />
-    <ClInclude Include="CollisionExporter.h" />
-    <ClInclude Include="command_macros_base.h" />
-    <ClInclude Include="CutsceneExporter.h" />
-    <ClInclude Include="DisplayListExporter.h" />
-    <ClInclude Include="AnimationExporter.h" />
-    <ClInclude Include="Main.h" />
-    <ClInclude Include="Exporter.h" />
-    <ClInclude Include="MtxExporter.h" />
-    <ClInclude Include="SkeletonExporter.h" />
-    <ClInclude Include="SkeletonLimbExporter.h" />
-    <ClInclude Include="PathExporter.h" />
-    <ClInclude Include="PlayerAnimationExporter.h" />
-    <ClInclude Include="RoomExporter.h" />
-    <ClInclude Include="TextExporter.h" />
-    <ClInclude Include="TextureExporter.h" />
-    <ClInclude Include="VersionInfo.h" />
-    <ClInclude Include="VtxExporter.h" />
-    <ClInclude Include="z64cutscene.h" />
-    <ClInclude Include="z64cutscene_commands.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ArrayExporter.cpp" />
-    <ClCompile Include="BackgroundExporter.cpp" />
-    <ClCompile Include="BlobExporter.cpp" />
-    <ClCompile Include="CollisionExporter.cpp" />
-    <ClCompile Include="CutsceneExporter.cpp" />
-    <ClCompile Include="DisplayListExporter.cpp" />
-    <ClCompile Include="AnimationExporter.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="Exporter.cpp" />
-    <ClCompile Include="MtxExporter.cpp" />
-    <ClCompile Include="SkeletonExporter.cpp" />
-    <ClCompile Include="SkeletonLimbExporter.cpp" />
-    <ClCompile Include="PathExporter.cpp" />
-    <ClCompile Include="PlayerAnimationExporter.cpp" />
-    <ClCompile Include="RoomExporter.cpp" />
-    <ClCompile Include="TextExporter.cpp" />
-    <ClCompile Include="TextureExporter.cpp" />
-    <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>
-    <ProjectGuid>{a6103fd3-0709-4fc7-b066-1a6e056d6306}</ProjectGuid>
-    <RootNamespace>OTRExporter</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <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>
-    <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>
-    <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ZAPDUtils.lib;OTRLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

OTRExporter/OTRExporter/OTRExporter.vcxproj.filters

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CollisionExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RoomExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DisplayListExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PlayerAnimationExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BackgroundExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VtxExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ArrayExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AnimationExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CutsceneExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="z64cutscene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="z64cutscene_commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="command_macros_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PathExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkeletonExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkeletonLimbExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TextExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BlobExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MtxExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VersionInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CollisionExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RoomExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TextureExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DisplayListExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PlayerAnimationExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SkeletonExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SkeletonLimbExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BackgroundExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VtxExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ArrayExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Exporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AnimationExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CutsceneExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PathExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TextExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BlobExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MtxExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VersionInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

OTRExporter/OTRExporter/RoomExporter.cpp

@@ -453,13 +453,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			OTRExporter_Cutscene cs;
 			cs.Save(cmdSetCutscenes->cutscenes[0], "", &csWriter);
 
-			if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-				File::WriteAllBytes("Extract/" + fName, csStream->ToVector());
-			else
-				files[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:
@@ -480,14 +474,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 				OTRExporter_Path pathExp;
 				pathExp.Save(&cmdSetPathways->pathwayList, outPath, &pathWriter);
 
-				if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-					File::WriteAllBytes("Extract/" + path, pathStream->ToVector());
-				else
-					files[path] = pathStream->ToVector();
-
-				//otrArchive->AddFile(path, (uintptr_t)pathStream->ToVector().data(), pathWriter.GetBaseAddress());
-
-				int bp = 0;
+				AddFile(path, pathStream->ToVector());
 			}
 		}
 			break;

OTRExporter/OTRExporter/VersionInfo.cpp

@@ -5,7 +5,7 @@ std::map<Ship::ResourceType, uint32_t> resourceVersions;
 
 void InitVersionInfo()
 {
-	resourceVersions = {
+	resourceVersions = std::map<Ship::ResourceType, uint32_t> {
 	{ Ship::ResourceType::Animation, 0 },
 	{ Ship::ResourceType::Model, 0 },
 	{ Ship::ResourceType::Texture, 0 },
@@ -24,4 +24,4 @@ void InitVersionInfo()
 	{ Ship::ResourceType::Text, 0 },
 	{ Ship::ResourceType::Blob, 0 },
 	};
-}
+}

OTRExporter/extract_assets.py

@@ -4,15 +4,22 @@ import os, sys, shutil
 import shutil
 from rom_info import Z64Rom
 import rom_chooser
+import struct
+import subprocess
+import argparse
 
-def BuildOTR(xmlPath, rom):
+def BuildOTR(xmlPath, rom, zapd_exe=None):
     shutil.copytree("assets", "Extract/assets")
 
-    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)
+    if not zapd_exe:
+        zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
 
-    print(execStr)
-    exitValue = os.system(execStr)
+    exec_cmd = [zapd_exe, "ed", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists",
+            "-o", "placeholder", "-osf", "placeholder", "-gsf", "1",
+            "-rconf", "CFG/Config.xml", "-se", "OTR"]
+
+    print(exec_cmd)
+    exitValue = subprocess.call(exec_cmd)
     if exitValue != 0:
         print("\n")
         print("Error when building the OTR file...", file=os.sys.stderr)
@@ -20,13 +27,19 @@ def BuildOTR(xmlPath, rom):
         print("\n")
 
 def main():
-    rom_path = rom_chooser.chooseROM()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-z", "--zapd", help="Path to ZAPD executable", dest="zapd_exe", type=str)
+    parser.add_argument("rom", help="Path to the rom", type=str, nargs="?")
+
+    args = parser.parse_args()
+
+    rom_path = args.rom if args.rom else rom_chooser.chooseROM()
     rom = Z64Rom(rom_path)
 
     if (os.path.exists("Extract")):
         shutil.rmtree("Extract")
 
-    BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom_path)
+    BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom_path, zapd_exe=args.zapd_exe)
 
 if __name__ == "__main__":
     main()

OTRExporter/rom_info.py

@@ -36,6 +36,7 @@ class RomVersion:
 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")
+ROM_INFO_TABLE[Checksums.OOT_PAL_GC_MQ_DBG] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_MQ_D")
 
 class RomDmaEntry:
     def __init__(self, rom, i):

OTRGui/CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

OTRGui/CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

OTRGui/CMake/Utils.cmake

@@ -0,0 +1,234 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")
+set(DEFAULT_Fortran_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultFortran.cmake")

OTRGui/CMakeLists.txt

@@ -3,27 +3,61 @@ project(OTRGui)
 
 set(PLATFORM "Desktop")
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
 set(APP_ICON_RESOURCE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/appicon.rc)
 
-add_subdirectory(libs/raylib)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(OpenGL_GL_PREFERENCE "GLVND")
+endif()
+
+include(CMake/Utils.cmake)
+
+add_subdirectory(libs/raylib EXCLUDE_FROM_ALL)
 
 include_directories(src)
 include_directories(src/game)
 include_directories(include)
 
-include_external_msproject(ZAPD ../../ZAPDTR/ZAPD/ZAPD.vcproj)
-include_external_msproject(ZAPDUtils ../../ZAPDTR/ZAPDUtils/ZAPDUtils.vcproj)
-include_external_msproject(libultraship ../../libultraship/libultraship/libultraship.vcproj)
-include_external_msproject(OTRExporter ../../OTRExporter/OTRExporter/OTRExporter.vcproj)
+if (NOT TARGET libultraship)
+    add_subdirectory(../libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
+endif()
+if (NOT TARGET ZAPD)
+    add_subdirectory(../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+endif()
+if (NOT TARGET ZAPDUtils)
+    add_subdirectory(../ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+endif()
+if (NOT TARGET OTRExporter)
+    add_subdirectory(../OTRExporter/OTRExporter ${CMAKE_BINARY_DIR}/OTRExporter)
+endif()
+if (NOT TARGET storm)
+    add_subdirectory(../StormLib ${CMAKE_BINARY_DIR}/StormLib)
+endif()
 
 file(GLOB_RECURSE HEADERS src/*.h)
 file(GLOB_RECURSE SOURCES src/*.cpp)
 file(GLOB_RECURSE C_SOURCES src/*.c)
 
-add_executable(${PROJECT_NAME} ${SOURCES} ${C_SOURCES} ${HEADERS} ${APP_ICON_RESOURCE_WINDOWS})
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/../OTRExporter/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/game" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/../soh/assets/xml" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
+add_executable(${PROJECT_NAME} EXCLUDE_FROM_ALL ${SOURCES} ${C_SOURCES} ${HEADERS} ${APP_ICON_RESOURCE_WINDOWS})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+add_custom_target(Assets ALL
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/../OTRExporter/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/game" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/../soh/assets/xml" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    )
+ 
+add_dependencies(OTRGui Assets)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC raylib)
+
+INSTALL(TARGETS OTRGui DESTINATION . COMPONENT ship)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/assets
+        DESTINATION .
+	COMPONENT ship
+)
+INSTALL(TARGETS ZAPD DESTINATION assets/extractor COMPONENT ship)
+

OTRGui/Overwrite.cmake

@@ -1,10 +1,15 @@
-file(GLOB_RECURSE _file_list RELATIVE "${src_dir}" "${src_dir}/*")
+include(CMakePrintHelpers)
+
+string(REPLACE "\\ " " " sources_dir "${src_dir}")
+string(REPLACE "\\ " " " destination_dir "${dst_dir}")
+
+file(GLOB_RECURSE _file_list RELATIVE "${sources_dir}" "${sources_dir}/*")
 
 foreach( each_file ${_file_list} )
-  set(destinationfile "${dst_dir}/${each_file}")
-  set(sourcefile "${src_dir}/${each_file}")
+  set(destinationfile "${destination_dir}/${each_file}")
+  set(sourcefile "${sources_dir}/${each_file}")
   if(NOT EXISTS ${destinationfile} OR ${sourcefile} IS_NEWER_THAN ${destinationfile})
     get_filename_component(destinationdir ${destinationfile} DIRECTORY)
     file(COPY ${sourcefile} DESTINATION ${destinationdir})
   endif()
-endforeach(each_file)
+endforeach(each_file)

OTRGui/src/game/game.cpp

@@ -91,7 +91,6 @@ void ExtractRom()
 		//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/");
 

OTRGui/src/impl/extractor/extractor.cpp

@@ -29,7 +29,7 @@ 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_MQ_DBG: return "GC_MQ_D";
 	case OOT_PAL_GC:	  return "GC_NMQ_PAL_F";
 	}
 
@@ -81,7 +81,7 @@ void startWorker(RomVersion version) {
 
 	path += GetXMLVersion(version);
 
-	Util::write("tmp/baserom/version", (char*)&version.crc, sizeof(version.crc));
+	// Util::write("tmp/baserom/version", (char*)&version.crc, sizeof(version.crc));
 
 	if (oldExtractMode)
 	{
@@ -144,4 +144,4 @@ void updateWorker(const std::string& output) {
 		std::thread otr(BuildOTR, output);
 		otr.detach();
 	}
-}
+}

README.md

@@ -12,16 +12,25 @@ The Ship does not include assets and as such requires a prior copy of the game t
 4) Launch `soh.exe`
 
 ### Supported Games
-Ocarina of Time Debug (not Master Quest)
+#### Ocarina of Time Debug PAL GC (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
+#### Ocarina of Time PAL GameCube
+> May lead to crashes and instability
 ```
 sha1: 0227d7c0074f2d0ac935631990da8ec5914597b4
 ```
+#### Ocarina of Time Debug PAL GC MQ (Dungeons will be Master Quest)
+```
+Build team: `zelda@srd022j`
+Build date: `03-02-21 00:16:31` (year-month-day)
+sha1: 079b855b943d6ad8bd1eb026c0ed169ecbdac7da (Produced by decomp)
+sha1: 50bebedad9e0f10746a52b07239e47fa6c284d03 (Alternate)
+```
 
 Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 
@@ -29,10 +38,10 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 
 The Ship of Harkinian uses a proprietary versioning system consisting of a sci-fi film character followed by a phonetic alphabet code word. The film character represents a major release version which increments with the addition of many new features and bug fixes. The code word represents a minor release version which increments with small updates mainly comprised of bug fixes. For example, `DECKARD ALFA`.
 
-### The Extraction Tool
+### Windows Rom Extraction
 
-* Open a rom to initiate generating the `oot.otr` archive file.
-* If a second button exists then `oot.otr` already exists. To prevent overwriting the old `oot.otr` use this button to choose a new game directory. The new directory must not already contain an `oot.otr` to prevent an error.
+* Open OTRGui.exe, and select one of the supported roms listed above, to generate the `oot.otr` archive file.
+* If a second button already exits then `oot.otr` already exists. To prevent overwriting the old `oot.otr` use this button to choose a new game directory. The new directory must not already contain an `oot.otr` to prevent an error.
 * When the process completes, place `oot.otr` beside `soh.exe` if it is not already.
 
 This packaging process can take up to **5 minutes**.
@@ -40,13 +49,60 @@ This packaging process can take up to **5 minutes**.
 Close the OTRGui when the `Done!` message appears.
 If you get another message, then you might have selected the wrong rom. Make sure to use a rom consistent with the above checksum.
 
+### Linux Rom Extraction
+
+* Place one of the supported roms in the same folder as the appimage.
+* When you run the soh appimage, it should begin generating the `oot.otr` archive file.
+* When the process completes, place `oot.otr` in the same folder as the appimage, if it is not already, then run the appimage.
+
+The packaging process can take up to **5 minutes**.
+
+If you get any errors, then you might have selected the wrong rom. Make sure to use a rom consistent with the above checksum.
+
+### MacOS Rom Extraction
+
+* Run `soh.app`, and when prompted, select one of the supported roms listed above.
+* You should see a notification saying `Processing OTR`, then, once the process is complete, you should get a notification saying `OTR Successfully Generated`, then the game should start.
+
+The packing process can take up to **5 minutes**.
+
+If you get an error saying `Incompatible ROM hash`, you have selected the wrong rom, make sure the checksum matches one of the ones listed above.
+
+### Nintendo Switch Rom Extraction
+
+* Download the latest PC release of the Ship of Harkinian, and follow the instructions above for generating the `oot.otr` archive on that platform.
+* Place the `.nro` and the `oot.otr` archive into a folder called `soh` in your Switch folder on your Switch
+
+### Nintendo Wii U Rom Extraction
+
+* Download the latest PC release of the Ship of Harkinian, and follow the instructions above for generating the `oot.otr` archive on that platform.
+* Copy the `.rpx` and the `oot.otr` archive to `wiiu/apps/soh`
+
+---
+
 If you still cannot get the tool to work, join our [Discord Server](https://discord.com/invite/BtBmd55HVH) and ask for help in the `#support` text channel. Keep-in-mind that we do not condone piracy in any way.
 
 ### 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.
 
-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?
@@ -61,8 +117,11 @@ Official Discord: https://discord.com/invite/BtBmd55HVH
 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/)
 
 
 ## The Harbour Masters Are...
@@ -102,10 +161,9 @@ Refer to the [building instructions](BUILDING.md) to compile SoH.
 	
 ## Video Credits
     Kenix | Producer / Writer
-	rainbow_fash | Executive Producer
-    TheLegendOfXela | Editor
+    briaguya | Writer
+    rainbow_fash | Executive Producer
+    ReveriePass | Editor
     MicTheMicrophone | Gwonam / The King
     Amphibibro | Link
     AceHeart | Zelda
-    
-###### Lemons

StormLib/.gitignore

@@ -0,0 +1,168 @@
+#################
+## 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
+nxbuild
+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,479 @@
+set(PROJECT_NAME StormLib)
+#project(StormLib)
+cmake_minimum_required(VERSION 3.10)
+
+set(LIBRARY_NAME storm)
+set(CMAKE_CXX_STANDARD 20)
+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
+)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(Source_Files__Windows
+           src/lzma/C/LzFindMt.c
+           src/lzma/C/Threads.c
+)
+endif()
+
+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
+           ${Source_Files__Windows}
+)
+
+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()
+
+if(NOT WIN32 AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
+  # Enable POSIX extensions such as `readlink` and `ftruncate`.
+  add_definitions(-D_POSIX_C_SOURCE=200809L)
+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()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${LIBRARY_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+################################################################################
+# Compile definitions
+################################################################################
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+       if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+               target_compile_definitions(${LIBRARY_NAME} PRIVATE
+                       "$<$<CONFIG:Debug>:"
+                               "_DEBUG;"
+                               "_CRT_SECURE_NO_WARNINGS;"
+                       ">"
+                       "$<$<CONFIG:Release>:"
+                               "NDEBUG"
+                       ">"
+                       WIN32
+                       _LIB
+                       "UNICODE;"
+                       "_UNICODE"
+               )
+       elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+               target_compile_definitions(${LIBRARY_NAME} PRIVATE
+                       "$<$<CONFIG:Debug>:"
+                               "_DEBUG;"
+                               "_CRT_SECURE_NO_WARNINGS;"
+                       ">"
+                       "$<$<CONFIG:Release>:"
+                               "NDEBUG;"
+                       ">"
+                       "WIN32;"
+                       _LIB
+                       "UNICODE;"
+                       "_UNICODE"
+               )
+       endif()
+endif()
+
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${LIBRARY_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+        if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+                string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+                        $<$<CONFIG:Debug>:
+                                MultiThreadedDebug
+                        >
+                        $<$<CONFIG:Release>:
+                                MultiThreaded
+                        >
+                        $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+                )
+        elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+                string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+                        $<$<CONFIG:Debug>:
+                                MultiThreadedDebug
+                        >
+                        $<$<CONFIG:Release>:
+                                MultiThreaded
+                        >
+                        $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+                )
+        endif()
+        set_target_properties(${LIBRARY_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+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

StormLib/sources

@@ -0,0 +1,14 @@
+TARGETNAME=StormLibWDK
+TARGETTYPE=LIBRARY
+USE_MSVCRT=1
+
+C_DEFINES=$(C_DEFINES) -DUNICODE -D_UNICODE -DWDK_BUILD
+
+SOURCES=sources-cpp.cpp        \
+        sources-wdk-bzip2.c    \
+        sources-wdk-ltc.c      \
+        sources-wdk-lzma.c     \
+        sources-wdk-misc.c     \
+        sources-wdk-tomcrypt.c \
+        sources-wdk-tommath.c  \
+        sources-wdk-zlib.c

StormLib/src/DllMain.c

@@ -0,0 +1,24 @@
+/*****************************************************************************/
+/* DllMain.c                              Copyright (c) Ladislav Zezula 2006 */
+/*---------------------------------------------------------------------------*/
+/* Description: DllMain for the StormLib.dll library                         */
+/*---------------------------------------------------------------------------*/
+/*   Date    Ver   Who  Comment                                              */
+/* --------  ----  ---  -------                                              */
+/* 23.11.06  1.00  Lad  The first version of DllMain.c                       */
+/*****************************************************************************/
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+//-----------------------------------------------------------------------------
+// DllMain
+
+BOOL WINAPI DllMain(HINSTANCE hInst, DWORD dwReason, LPVOID lpReserved)
+{
+    UNREFERENCED_PARAMETER(hInst);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpReserved);
+
+    return TRUE;
+}

StormLib/src/DllMain.def

@@ -0,0 +1,79 @@
+;
+; Export file for Windows
+; Copyright (c) 2007-2010 Ladislav Zezula
+; ladik@zezula.net
+;
+
+LIBRARY StormLib.dll
+
+EXPORTS
+
+    SFileSetLocale
+    SFileGetLocale
+
+    SFileOpenArchive
+    SFileCreateArchive
+    SFileCreateArchive2
+    SFileFlushArchive
+    SFileCloseArchive
+
+    SFileAddListFile
+
+    SFileSetCompactCallback
+    SFileCompactArchive
+
+    SFileGetMaxFileCount
+    SFileSetMaxFileCount
+
+    SFileGetAttributes
+    SFileSetAttributes
+    SFileUpdateFileAttributes
+
+    SFileOpenPatchArchive
+    SFileIsPatchedArchive
+
+    SFileOpenFileEx
+    SFileGetFileSize
+    SFileSetFilePointer
+    SFileReadFile
+    SFileCloseFile
+
+    SFileHasFile
+    SFileGetFileName
+    SFileGetFileInfo
+
+    SFileExtractFile
+
+    SFileVerifyFile
+    SFileVerifyRawData
+    SFileVerifyArchive
+
+    SFileFindFirstFile
+    SFileFindNextFile
+    SFileFindClose
+
+    SListFileFindFirstFile
+    SListFileFindNextFile
+    SListFileFindClose
+
+    SFileEnumLocales
+
+    SFileCreateFile
+    SFileWriteFile
+    SFileFinishFile
+    SFileAddFileEx
+    SFileAddFile
+    SFileAddWave
+    SFileRemoveFile
+    SFileRenameFile
+    SFileSetFileLocale
+    SFileSetDataCompression
+    SFileSetAddFileCallback
+
+    SCompImplode
+    SCompExplode
+    SCompCompress
+    SCompDecompress
+
+    GetLastError=Kernel32.GetLastError
+    SetLastError=Kernel32.SetLastError

StormLib/src/DllMain.rc

@@ -0,0 +1,114 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1250)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 9,22,0,3
+ PRODUCTVERSION 9,22,0,3
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040504b0"
+        BEGIN
+            VALUE "Comments", "http://www.zezula.net/mpq.html"
+            VALUE "FileDescription", "StormLib library for reading Blizzard MPQ archives"
+            VALUE "FileVersion", "9, 22, 0, 3\0"
+            VALUE "InternalName", "StormLib"
+            VALUE "LegalCopyright", "Copyright (c) 2014 - 2020 Ladislav Zezula"
+            VALUE "OriginalFilename", "StormLib.dll"
+            VALUE "ProductName", "StormLib"
+            VALUE "ProductVersion", "9, 22, 0, 3\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x405, 1200
+    END
+END
+
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Czech resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
+#ifdef _WIN32
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Czech resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

StormLib/src/FileStream.h

@@ -0,0 +1,217 @@
+/*****************************************************************************/
+/* FileStream.h                           Copyright (c) Ladislav Zezula 2012 */
+/*---------------------------------------------------------------------------*/
+/* Description: Definitions for FileStream object                            */
+/*---------------------------------------------------------------------------*/
+/*   Date    Ver   Who  Comment                                              */
+/* --------  ----  ---  -------                                              */
+/* 14.04.12  1.00  Lad  The first version of FileStream.h                    */
+/*****************************************************************************/
+
+#ifndef __FILESTREAM_H__
+#define __FILESTREAM_H__
+
+//-----------------------------------------------------------------------------
+// Function prototypes
+
+typedef void (*STREAM_INIT)(
+    struct TFileStream * pStream        // Pointer to an unopened stream
+);
+
+typedef bool (*STREAM_CREATE)(
+    struct TFileStream * pStream        // Pointer to an unopened stream
+    );
+
+typedef bool (*STREAM_OPEN)(
+    struct TFileStream * pStream,       // Pointer to an unopened stream
+    const TCHAR * szFileName,           // Pointer to file name to be open
+    DWORD dwStreamFlags                 // Stream flags
+    );
+
+typedef bool (*STREAM_READ)(
+    struct TFileStream * pStream,       // Pointer to an open stream
+    ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it reads from the current position
+    void * pvBuffer,                    // Pointer to data to be read
+    DWORD dwBytesToRead                 // Number of bytes to read from the file
+    );
+
+typedef bool (*STREAM_WRITE)(
+    struct TFileStream * pStream,       // Pointer to an open stream
+    ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it writes to the current position
+    const void * pvBuffer,              // Pointer to data to be written
+    DWORD dwBytesToWrite                // Number of bytes to read from the file
+    );
+
+typedef bool (*STREAM_RESIZE)(
+    struct TFileStream * pStream,       // Pointer to an open stream
+    ULONGLONG FileSize                  // New size for the file, in bytes
+    );
+
+typedef bool (*STREAM_GETSIZE)(
+    struct TFileStream * pStream,       // Pointer to an open stream
+    ULONGLONG * pFileSize               // Receives the file size, in bytes
+    );
+
+typedef bool (*STREAM_GETPOS)(
+    struct TFileStream * pStream,       // Pointer to an open stream
+    ULONGLONG * pByteOffset             // Pointer to store current file position
+    );
+
+typedef void (*STREAM_CLOSE)(
+    struct TFileStream * pStream        // Pointer to an open stream
+    );
+
+typedef bool (*BLOCK_READ)(
+    struct TFileStream * pStream,       // Pointer to a block-oriented stream
+    ULONGLONG StartOffset,              // Byte offset of start of the block array
+    ULONGLONG EndOffset,                // End offset (either end of the block or end of the file)
+    LPBYTE BlockBuffer,                 // Pointer to block-aligned buffer
+    DWORD BytesNeeded,                  // Number of bytes that are really needed
+    bool bAvailable                     // true if the block is available
+    );
+
+typedef bool (*BLOCK_CHECK)(
+    struct TFileStream * pStream,       // Pointer to a block-oriented stream
+    ULONGLONG BlockOffset               // Offset of the file to check
+    );
+
+typedef void (*BLOCK_SAVEMAP)(
+    struct TFileStream * pStream        // Pointer to a block-oriented stream
+    );
+
+//-----------------------------------------------------------------------------
+// Local structures - partial file structure and bitmap footer
+
+#define ID_FILE_BITMAP_FOOTER   0x33767470  // Signature of the file bitmap footer ('ptv3')
+#define DEFAULT_BLOCK_SIZE      0x00004000  // Default size of the stream block
+#define DEFAULT_BUILD_NUMBER         10958  // Build number for newly created partial MPQs
+
+typedef struct _PART_FILE_HEADER
+{
+    DWORD PartialVersion;                   // Always set to 2
+    char  GameBuildNumber[0x20];            // Minimum build number of the game that can use this MPQ
+    DWORD Flags;                            // Flags (details unknown)
+    DWORD FileSizeLo;                       // Low 32 bits of the contained file size
+    DWORD FileSizeHi;                       // High 32 bits of the contained file size
+    DWORD BlockSize;                        // Size of one file block, in bytes
+
+} PART_FILE_HEADER, *PPART_FILE_HEADER;
+
+// Structure describing the block-to-file map entry
+typedef struct _PART_FILE_MAP_ENTRY
+{
+    DWORD Flags;                            // 3 = the block is present in the file
+    DWORD BlockOffsLo;                      // Low 32 bits of the block position in the file
+    DWORD BlockOffsHi;                      // High 32 bits of the block position in the file
+    DWORD LargeValueLo;                     // 64-bit value, meaning is unknown
+    DWORD LargeValueHi;
+
+} PART_FILE_MAP_ENTRY, *PPART_FILE_MAP_ENTRY;
+
+typedef struct _FILE_BITMAP_FOOTER
+{
+    DWORD Signature;                      // 'ptv3' (ID_FILE_BITMAP_FOOTER)
+    DWORD Version;                        // Unknown, seems to always have value of 3 (version?)
+    DWORD BuildNumber;                    // Game build number for that MPQ
+    DWORD MapOffsetLo;                    // Low 32-bits of the offset of the bit map
+    DWORD MapOffsetHi;                    // High 32-bits of the offset of the bit map
+    DWORD BlockSize;                      // Size of one block (usually 0x4000 bytes)
+
+} FILE_BITMAP_FOOTER, *PFILE_BITMAP_FOOTER;
+
+//-----------------------------------------------------------------------------
+// Structure for file stream
+
+union TBaseProviderData
+{
+    struct
+    {
+        ULONGLONG FileSize;                 // Size of the file
+        ULONGLONG FilePos;                  // Current file position
+        ULONGLONG FileTime;                 // Last write time
+        HANDLE hFile;                       // File handle
+    } File;
+
+    struct
+    {
+        ULONGLONG FileSize;                 // Size of the file
+        ULONGLONG FilePos;                  // Current file position
+        ULONGLONG FileTime;                 // Last write time
+        LPBYTE pbFile;                      // Pointer to mapped view
+    } Map;
+
+    struct
+    {
+        ULONGLONG FileSize;                 // Size of the file
+        ULONGLONG FilePos;                  // Current file position
+        ULONGLONG FileTime;                 // Last write time
+        HANDLE hInternet;                   // Internet handle
+        HANDLE hConnect;                    // Connection to the internet server
+    } Http;
+};
+
+struct TFileStream
+{
+    // Stream provider functions
+    STREAM_READ    StreamRead;              // Pointer to stream read function for this archive. Do not use directly.
+    STREAM_WRITE   StreamWrite;             // Pointer to stream write function for this archive. Do not use directly.
+    STREAM_RESIZE  StreamResize;            // Pointer to function changing file size
+    STREAM_GETSIZE StreamGetSize;           // Pointer to function returning file size
+    STREAM_GETPOS  StreamGetPos;            // Pointer to function that returns current file position
+    STREAM_CLOSE   StreamClose;             // Pointer to function closing the stream
+
+    // Block-oriented functions
+    BLOCK_READ     BlockRead;               // Pointer to function reading one or more blocks
+    BLOCK_CHECK    BlockCheck;              // Pointer to function checking whether the block is present
+
+    // Base provider functions
+    STREAM_CREATE  BaseCreate;              // Pointer to base create function
+    STREAM_OPEN    BaseOpen;                // Pointer to base open function
+    STREAM_READ    BaseRead;                // Read from the stream
+    STREAM_WRITE   BaseWrite;               // Write to the stream
+    STREAM_RESIZE  BaseResize;              // Pointer to function changing file size
+    STREAM_GETSIZE BaseGetSize;             // Pointer to function returning file size
+    STREAM_GETPOS  BaseGetPos;              // Pointer to function that returns current file position
+    STREAM_CLOSE   BaseClose;               // Pointer to function closing the stream
+
+    // Base provider data (file size, file position)
+    TBaseProviderData Base;
+
+    // Stream provider data
+    TFileStream * pMaster;                  // Master stream (e.g. MPQ on a web server)
+    TCHAR * szFileName;                     // File name (self-relative pointer)
+
+    ULONGLONG StreamSize;                   // Stream size (can be less than file size)
+    ULONGLONG StreamPos;                    // Stream position
+    DWORD BuildNumber;                      // Game build number
+    DWORD dwFlags;                          // Stream flags
+
+    // Followed by stream provider data, with variable length
+};
+
+//-----------------------------------------------------------------------------
+// Structures for block-oriented stream
+
+struct TBlockStream : public TFileStream
+{
+    SFILE_DOWNLOAD_CALLBACK pfnCallback;    // Callback for downloading
+    void * FileBitmap;                      // Array of bits for file blocks
+    void * UserData;                        // User data to be passed to the download callback
+    DWORD BitmapSize;                       // Size of the file bitmap (in bytes)
+    DWORD BlockSize;                        // Size of one block, in bytes
+    DWORD BlockCount;                       // Number of data blocks in the file
+    DWORD IsComplete;                       // If nonzero, no blocks are missing
+    DWORD IsModified;                       // nonzero if the bitmap has been modified
+};
+
+//-----------------------------------------------------------------------------
+// Structure for encrypted stream
+
+#define MPQE_CHUNK_SIZE 0x40                // Size of one chunk to be decrypted
+
+struct TEncryptedStream : public TBlockStream
+{
+    BYTE Key[MPQE_CHUNK_SIZE];              // File key
+};
+
+#endif // __FILESTREAM_H__

StormLib/src/SBaseDumpData.cpp

@@ -0,0 +1,183 @@
+/*****************************************************************************/
+/* SBaseDumpData.cpp                      Copyright (c) Ladislav Zezula 2011 */
+/*---------------------------------------------------------------------------*/
+/* Description :                                                             */
+/*---------------------------------------------------------------------------*/
+/*   Date    Ver   Who  Comment                                              */
+/* --------  ----  ---  -------                                              */
+/* 26.01.11  1.00  Lad  The first version of SBaseDumpData.cpp               */
+/*****************************************************************************/
+
+#define __STORMLIB_SELF__
+#include "StormLib.h"
+#include "StormCommon.h"
+
+#ifdef __STORMLIB_DUMP_DATA__
+
+void DumpMpqHeader(TMPQHeader * pHeader)
+{
+    printf("== MPQ Header =================================\n");
+    printf("DWORD dwID                   = %08X\n",    pHeader->dwID);
+    printf("DWORD dwHeaderSize           = %08X\n",    pHeader->dwHeaderSize);
+    printf("DWORD dwArchiveSize          = %08X\n",    pHeader->dwArchiveSize);
+    printf("USHORT wFormatVersion        = %04X\n",    pHeader->wFormatVersion);
+    printf("USHORT wSectorSize           = %04X\n",    pHeader->wSectorSize);
+    printf("DWORD dwHashTablePos         = %08X\n",    pHeader->dwHashTablePos);
+    printf("DWORD dwBlockTablePos        = %08X\n",    pHeader->dwBlockTablePos);
+    printf("DWORD dwHashTableSize        = %08X\n",    pHeader->dwHashTableSize);
+    printf("DWORD dwBlockTableSize       = %08X\n",    pHeader->dwBlockTableSize);
+    printf("ULONGLONG HiBlockTablePos64  = %016llX\n", pHeader->HiBlockTablePos64);
+    printf("USHORT wHashTablePosHi       = %04X\n",    pHeader->wHashTablePosHi);
+    printf("USHORT wBlockTablePosHi      = %04X\n",    pHeader->wBlockTablePosHi);
+    printf("ULONGLONG ArchiveSize64      = %016llX\n", pHeader->ArchiveSize64);
+    printf("ULONGLONG BetTablePos64      = %016llX\n", pHeader->BetTablePos64);
+    printf("ULONGLONG HetTablePos64      = %016llX\n", pHeader->HetTablePos64);
+    printf("ULONGLONG HashTableSize64    = %016llX\n", pHeader->HashTableSize64);
+    printf("ULONGLONG BlockTableSize64   = %016llX\n", pHeader->BlockTableSize64);
+    printf("ULONGLONG HiBlockTableSize64 = %016llX\n", pHeader->HiBlockTableSize64);
+    printf("ULONGLONG HetTableSize64     = %016llX\n", pHeader->HetTableSize64);
+    printf("ULONGLONG BetTableSize64     = %016llX\n", pHeader->BetTableSize64);
+    printf("DWORD dwRawChunkSize         = %08X\n",     pHeader->dwRawChunkSize);
+    printf("-----------------------------------------------\n\n");
+}
+
+void DumpHashTable(TMPQHash * pHashTable, DWORD dwHashTableSize)
+{
+    DWORD i;
+
+    if(pHashTable == NULL || dwHashTableSize == 0)
+        return;
+
+    printf("== Hash Table =================================\n");
+    for(i = 0; i < dwHashTableSize; i++)
+    {
+        printf("[%08x] %08X %08X %04X %02X %08X\n", i,
+                                                    pHashTable[i].dwName1,
+                                                    pHashTable[i].dwName2,
+                                                    pHashTable[i].lcLocale,
+                                                    pHashTable[i].Platform,
+                                                    pHashTable[i].dwBlockIndex);
+    }
+    printf("-----------------------------------------------\n\n");
+}
+
+void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
+{
+    DWORD i;
+
+    if(pHetTable == NULL || pBetTable == NULL)
+        return;
+
+    printf("== HET Header =================================\n");
+    printf("ULONGLONG  AndMask64         = %016llX\n",  pHetTable->AndMask64);
+    printf("ULONGLONG  OrMask64          = %016llX\n",  pHetTable->OrMask64);
+    printf("DWORD      dwEntryCount      = %08X\n",     pHetTable->dwEntryCount);
+    printf("DWORD      dwTotalCount      = %08X\n",     pHetTable->dwTotalCount);
+    printf("DWORD      dwNameHashBitSize = %08X\n",     pHetTable->dwNameHashBitSize);
+    printf("DWORD      dwIndexSizeTotal  = %08X\n",     pHetTable->dwIndexSizeTotal);
+    printf("DWORD      dwIndexSizeExtra  = %08X\n",     pHetTable->dwIndexSizeExtra);
+    printf("DWORD      dwIndexSize       = %08X\n",     pHetTable->dwIndexSize);
+    printf("-----------------------------------------------\n\n");
+
+    printf("== BET Header =================================\n");
+    printf("DWORD dwTableEntrySize       = %08X\n",     pBetTable->dwTableEntrySize);
+    printf("DWORD dwBitIndex_FilePos     = %08X\n",     pBetTable->dwBitIndex_FilePos);
+    printf("DWORD dwBitIndex_FileSize    = %08X\n",     pBetTable->dwBitIndex_FileSize);
+    printf("DWORD dwBitIndex_CmpSize     = %08X\n",     pBetTable->dwBitIndex_CmpSize);
+    printf("DWORD dwBitIndex_FlagIndex   = %08X\n",     pBetTable->dwBitIndex_FlagIndex);
+    printf("DWORD dwBitIndex_Unknown     = %08X\n",     pBetTable->dwBitIndex_Unknown);
+    printf("DWORD dwBitCount_FilePos     = %08X\n",     pBetTable->dwBitCount_FilePos);
+    printf("DWORD dwBitCount_FileSize    = %08X\n",     pBetTable->dwBitCount_FileSize);
+    printf("DWORD dwBitCount_CmpSize     = %08X\n",     pBetTable->dwBitCount_CmpSize);
+    printf("DWORD dwBitCount_FlagIndex   = %08X\n",     pBetTable->dwBitCount_FlagIndex);
+    printf("DWORD dwBitCount_Unknown     = %08X\n",     pBetTable->dwBitCount_Unknown);
+    printf("DWORD dwBitTotal_NameHash2   = %08X\n",     pBetTable->dwBitTotal_NameHash2);
+    printf("DWORD dwBitExtra_NameHash2   = %08X\n",     pBetTable->dwBitExtra_NameHash2);
+    printf("DWORD dwBitCount_NameHash2   = %08X\n",     pBetTable->dwBitCount_NameHash2);
+    printf("DWORD dwEntryCount           = %08X\n",     pBetTable->dwEntryCount);
+    printf("DWORD dwFlagCount            = %08X\n",     pBetTable->dwFlagCount);
+    printf("-----------------------------------------------\n\n");
+
+    printf("== HET & Bet Table ======================================================================\n\n");
+    printf("HetIdx HetHash BetIdx BetHash          ByteOffset       FileSize CmpSize  FlgIdx Flags   \n");
+    printf("------ ------- ------ ---------------- ---------------- -------- -------- ------ --------\n");
+    for(i = 0; i < pHetTable->dwTotalCount; i++)
+    {
+        ULONGLONG ByteOffset = 0;
+        ULONGLONG BetHash = 0;
+        DWORD dwFileSize = 0;
+        DWORD dwCmpSize = 0;
+        DWORD dwFlagIndex = 0;
+        DWORD dwFlags = 0;
+        DWORD dwBetIndex = 0;
+
+        GetMPQBits(pHetTable->pBetIndexes, i * pHetTable->dwIndexSizeTotal,
+                                           pHetTable->dwIndexSize,
+                                          &dwBetIndex, 4);
+
+        if(dwBetIndex < pHetTable->dwTotalCount)
+        {
+            DWORD dwEntryIndex = pBetTable->dwTableEntrySize * dwBetIndex;
+
+            GetMPQBits(pBetTable->pNameHashes, dwBetIndex * pBetTable->dwBitTotal_NameHash2,
+                                               pBetTable->dwBitCount_NameHash2,
+                                              &BetHash, 8);
+
+            GetMPQBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FilePos,
+                                              pBetTable->dwBitCount_FilePos,
+                                             &ByteOffset, 8);
+
+            GetMPQBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FileSize,
+                                              pBetTable->dwBitCount_FileSize,
+                                             &dwFileSize, 4);
+
+            GetMPQBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_CmpSize,
+                                              pBetTable->dwBitCount_CmpSize,
+                                             &dwCmpSize, 4);
+
+            GetMPQBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FlagIndex,
+                                              pBetTable->dwBitCount_FlagIndex,
+                                             &dwFlagIndex, 4);
+
+            dwFlags = pBetTable->pFileFlags[dwFlagIndex];
+        }
+
+        printf(" %04X    %02lX     %04X  %016llX %016llX %08X %08X  %04X  %08X\n", i,
+                                                         pHetTable->pNameHashes[i],
+                                                         dwBetIndex,
+                                                         BetHash,
+                                                         ByteOffset,
+                                                         dwFileSize,
+                                                         dwCmpSize,
+                                                         dwFlagIndex,
+                                                         dwFlags);
+    }
+    printf("-----------------------------------------------------------------------------------------\n");
+}
+
+void DumpFileTable(TFileEntry * pFileTable, DWORD dwFileTableSize)
+{
+    DWORD i;
+
+    if(pFileTable == NULL || dwFileTableSize == 0)
+        return;
+
+    printf("== File Table =================================\n");
+    for(i = 0; i < dwFileTableSize; i++, pFileTable++)
+    {
+        printf("[%04u] %08X-%08X %08X-%08X %08X-%08X 0x%08X 0x%08X 0x%08X %s\n", i,
+                        (DWORD)(pFileTable->FileNameHash >> 0x20),
+                        (DWORD)(pFileTable->FileNameHash & 0xFFFFFFFF),
+                        (DWORD)(pFileTable->ByteOffset >> 0x20),
+                        (DWORD)(pFileTable->ByteOffset & 0xFFFFFFFF),
+                        (DWORD)(pFileTable->FileTime >> 0x20),
+                        (DWORD)(pFileTable->FileTime & 0xFFFFFFFF),
+                                pFileTable->dwFileSize,
+                                pFileTable->dwCmpSize,
+                                pFileTable->dwFlags,
+                                pFileTable->szFileName != NULL ? pFileTable->szFileName : "");
+    }
+    printf("-----------------------------------------------\n\n");
+}
+
+#endif  // __STORMLIB_DUMP_DATA__