From afd304b180607a68edc1613074eeaca5e8805153 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Tue, 6 Jun 2023 09:50:16 +0200 Subject: Fixed loading of corrupt MPQ version 2 --- StormLib.sln | 162 ++++++ StormLib.vcxproj | 1024 ++++++++++++++++++++++++++++++++++++ StormLib.vcxproj.filters | 221 ++++++++ StormLib_dll.vcxproj | 348 ++++++++++++ StormLib_dll.vcxproj.filters | 229 ++++++++ StormLib_test.vcxproj | 360 +++++++++++++ StormLib_test.vcxproj.filters | 230 ++++++++ StormLib_vs22.sln | 162 ------ StormLib_vs22.vcxproj | 1024 ------------------------------------ StormLib_vs22.vcxproj.filters | 221 -------- StormLib_vs22_dll.vcxproj | 348 ------------ StormLib_vs22_dll.vcxproj.filters | 229 -------- StormLib_vs22_test.vcxproj | 360 ------------- StormLib_vs22_test.vcxproj.filters | 230 -------- make-msvc.bat | 4 +- src/SBaseFileTable.cpp | 58 +- test/StormTest.cpp | 27 +- 17 files changed, 2628 insertions(+), 2609 deletions(-) create mode 100644 StormLib.sln create mode 100644 StormLib.vcxproj create mode 100644 StormLib.vcxproj.filters create mode 100644 StormLib_dll.vcxproj create mode 100644 StormLib_dll.vcxproj.filters create mode 100644 StormLib_test.vcxproj create mode 100644 StormLib_test.vcxproj.filters delete mode 100644 StormLib_vs22.sln delete mode 100644 StormLib_vs22.vcxproj delete mode 100644 StormLib_vs22.vcxproj.filters delete mode 100644 StormLib_vs22_dll.vcxproj delete mode 100644 StormLib_vs22_dll.vcxproj.filters delete mode 100644 StormLib_vs22_test.vcxproj delete mode 100644 StormLib_vs22_test.vcxproj.filters diff --git a/StormLib.sln b/StormLib.sln new file mode 100644 index 0000000..0ce51bc --- /dev/null +++ b/StormLib.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.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_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 diff --git a/StormLib.vcxproj b/StormLib.vcxproj new file mode 100644 index 0000000..26d8f70 --- /dev/null +++ b/StormLib.vcxproj @@ -0,0 +1,1024 @@ + + + + + DebugAD + Win32 + + + DebugAD + x64 + + + DebugAS + Win32 + + + DebugAS + x64 + + + DebugUD + Win32 + + + DebugUD + x64 + + + DebugUS + Win32 + + + DebugUS + x64 + + + ReleaseAD + Win32 + + + ReleaseAD + x64 + + + ReleaseAS + Win32 + + + ReleaseAS + x64 + + + ReleaseUD + Win32 + + + ReleaseUD + x64 + + + ReleaseUS + Win32 + + + ReleaseUS + x64 + + + + StormLib + {78424708-1F6E-4D4B-920C-FB6D26847055} + StormLib + false + 10.0.17134.0 + StaticLibrary + v141_xp + false + + + + MultiByte + + + MultiByte + + + MultiByte + + + MultiByte + + + MultiByte + + + MultiByte + + + MultiByte + + + MultiByte + + + Unicode + + + Unicode + + + Unicode + + + Unicode + + + Unicode + + + Unicode + + + Unicode + + + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DAD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DAD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DAS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DAS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RAD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RAD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RAS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RAS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DUD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DUD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DUS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)DUS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RUD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RUD + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RUS + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + $(ProjectName)RUS + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + X64 + + + MaxSpeed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib + + + + + + + + + + + + + + + + + + + + + + + + Create + StormCommon.h + Level4 + + + + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Use + StormCommon.h + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + Level4 + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + Create + StormCommon.h + Level4 + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + Use + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/StormLib.vcxproj.filters b/StormLib.vcxproj.filters new file mode 100644 index 0000000..22c9793 --- /dev/null +++ b/StormLib.vcxproj.filters @@ -0,0 +1,221 @@ + + + + + {595d6bc1-89d0-4fb8-98f6-be35e73727c4} + + + {721663d8-8692-476f-b0fd-71fdadf69929} + + + {9cc24144-d198-4bd1-b941-b946bd61b982} + + + {be0080d3-fc04-4442-9e28-b4cc2641177d} + + + {adb84a97-8a0c-4988-9473-452326110dff} + + + {87256d6a-e658-4f60-8759-6bff32a35eb2} + + + {02c6dfb8-4a58-46c5-bb35-69ba6215a3a6} + + + {563829a0-aaa3-4af2-88a2-8c6445d2754b} + + + {e82b0d03-77ff-46dc-b5a4-5b469224222a} + + + {cb92df18-9435-4db9-997a-e0e7d532cd26} + + + {2920175c-439c-4fd5-b94e-8cf1d3aaadd3} + + + + + Doc Files + + + Doc Files + + + Doc Files + + + + + Header Files + + + Source Files\adpcm + + + Source Files\huffman + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\jenkins + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\adpcm + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\huffman + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\pklib + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\jenkins + + + Source Files\zlib + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/StormLib_dll.vcxproj b/StormLib_dll.vcxproj new file mode 100644 index 0000000..bda8dd9 --- /dev/null +++ b/StormLib_dll.vcxproj @@ -0,0 +1,348 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + StormLib_dll + {CB385198-50B1-4CF4-883B-11F042DED6AA} + StormLib_dll + Win32Proj + 10.0.17134.0 + + + + DynamicLibrary + v141_xp + Unicode + true + + + DynamicLibrary + v141_xp + Unicode + + + DynamicLibrary + v141_xp + Unicode + true + + + DynamicLibrary + v141_xp + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + true + StormLib + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + true + StormLib + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + false + StormLib + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + false + StormLib + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + $(OutDir)StormLib.dll + .\src\DllMain.def + true + Windows + false + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + true + + + $(OutDir)StormLib.dll + .\src\DllMain.def + true + Windows + false + + MachineX64 + + + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + $(OutDir)StormLib.dll + .\src\DllMain.def + true + Windows + true + true + false + + MachineX86 + + + + + X64 + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + $(OutDir)StormLib.dll + .\src\DllMain.def + true + Windows + true + true + false + + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + + + + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + + + + + + + \ No newline at end of file diff --git a/StormLib_dll.vcxproj.filters b/StormLib_dll.vcxproj.filters new file mode 100644 index 0000000..2eaf026 --- /dev/null +++ b/StormLib_dll.vcxproj.filters @@ -0,0 +1,229 @@ + + + + + {b352ea2c-4169-4b60-85bc-82eadd5a9d2e} + + + {9171b211-949a-4dc1-a028-edf0a2ed4605} + + + {712a20a0-c7a8-4e56-947b-2cf030bbb287} + + + {83502600-f49c-43b1-afe6-038d3560a859} + + + {ea8b08a3-5c21-48e0-b75f-78eaa2adbc22} + + + {593ac5e7-fe06-42b8-8025-e3bd725f95d8} + + + {856c9964-4d85-40e9-8cbd-f4c672c07780} + + + {7ad3c876-768a-45bc-85b1-38cd492814ea} + + + {22e86a97-80e9-45a0-ac8e-70d7ea848f35} + + + {7b2ea923-8454-4073-bb9c-85de0f66caa1} + + + {5404ec38-706a-47f8-97b7-941c2574ddf2} + + + + + Doc Files + + + Doc Files + + + Doc Files + + + + + Header Files + + + Header Files + + + Header Files + + + Source Files\adpcm + + + Source Files\huffman + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\jenkins + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\adpcm + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\huffman + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\pklib + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\jenkins + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + \ No newline at end of file diff --git a/StormLib_test.vcxproj b/StormLib_test.vcxproj new file mode 100644 index 0000000..18cee5b --- /dev/null +++ b/StormLib_test.vcxproj @@ -0,0 +1,360 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + StormLib_test + {AA561A7B-26EA-49AF-90E8-C53C1FA2965D} + StormLib_test + Win32Proj + 10.0.17134.0 + + + + Application + v141_xp + Unicode + true + + + Application + v141_xp + Unicode + + + Application + v141_xp + Unicode + true + + + Application + v141_xp + Unicode + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + true + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + false + + + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + EditAndContinue + Default + true + + + true + Console + false + + MachineX86 + false + + + + + X64 + + + Disabled + WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + Level1 + ProgramDatabase + Default + true + + + true + Console + false + + MachineX64 + false + + + + + WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + true + Console + true + true + false + + MachineX86 + false + + + + + X64 + + + WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) + MultiThreaded + + Level1 + ProgramDatabase + true + + + true + Console + true + true + false + + MachineX64 + false + + + + + + + + + + + + + + + + + + + + + Level4 + Level4 + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + + + Level1 + Level1 + + + + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + Level4 + Level4 + Level4 + Level4 + + + + + + + + + + + + + Level4 + Level4 + Level4 + Level4 + + + + + + + \ No newline at end of file diff --git a/StormLib_test.vcxproj.filters b/StormLib_test.vcxproj.filters new file mode 100644 index 0000000..d341b12 --- /dev/null +++ b/StormLib_test.vcxproj.filters @@ -0,0 +1,230 @@ + + + + + {1dbbb48c-9db9-4fdb-a903-223ed233cc21} + + + {ab878eef-1074-4594-bac5-272c05774bd8} + + + {640f063a-5028-4ba1-9007-96d98a634561} + + + {6e8cfdab-fca3-4737-8905-6154bc657e15} + + + {a810fdb6-0d21-4279-8e39-b2de644170c0} + + + {7861b4fb-1471-4573-92ea-08c06dc14b93} + + + {5308566b-d3fd-4561-a7fb-982a63662793} + + + {d5371a5f-1630-4e79-9e7e-1ef654a2ddec} + + + {c2971fba-aff1-42ab-9f4f-71707edabf77} + + + {4f4fe3d6-6f2b-4c83-9cf9-f1d108ecd854} + + + {5aaea51e-4b7c-4a35-b35c-96c2fc7750f1} + + + + + Doc Files + + + Doc Files + + + Doc Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Source Files\adpcm + + + Source Files\huffman + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\jenkins + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\adpcm + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\bzip2 + + + Source Files\huffman + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\lzma + + + Source Files\pklib + + + Source Files\pklib + + + Source Files\sparse + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\jenkins + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/StormLib_vs22.sln b/StormLib_vs22.sln deleted file mode 100644 index 1d6f972..0000000 --- a/StormLib_vs22.sln +++ /dev/null @@ -1,162 +0,0 @@ -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_vs22.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs22_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs22_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 diff --git a/StormLib_vs22.vcxproj b/StormLib_vs22.vcxproj deleted file mode 100644 index 26d8f70..0000000 --- a/StormLib_vs22.vcxproj +++ /dev/null @@ -1,1024 +0,0 @@ - - - - - DebugAD - Win32 - - - DebugAD - x64 - - - DebugAS - Win32 - - - DebugAS - x64 - - - DebugUD - Win32 - - - DebugUD - x64 - - - DebugUS - Win32 - - - DebugUS - x64 - - - ReleaseAD - Win32 - - - ReleaseAD - x64 - - - ReleaseAS - Win32 - - - ReleaseAS - x64 - - - ReleaseUD - Win32 - - - ReleaseUD - x64 - - - ReleaseUS - Win32 - - - ReleaseUS - x64 - - - - StormLib - {78424708-1F6E-4D4B-920C-FB6D26847055} - StormLib - false - 10.0.17134.0 - StaticLibrary - v141_xp - false - - - - MultiByte - - - MultiByte - - - MultiByte - - - MultiByte - - - MultiByte - - - MultiByte - - - MultiByte - - - MultiByte - - - Unicode - - - Unicode - - - Unicode - - - Unicode - - - Unicode - - - Unicode - - - Unicode - - - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DAD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DAD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DAS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DAS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RAD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RAD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RAS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RAS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DUD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DUD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DUS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)DUS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RUD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RUD - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RUS - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - $(ProjectName)RUS - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - X64 - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib - - - - - - - - - - - - - - - - - - - - - - - - Create - StormCommon.h - Level4 - - - - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Use - StormCommon.h - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - Level4 - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - Create - StormCommon.h - Level4 - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - Use - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/StormLib_vs22.vcxproj.filters b/StormLib_vs22.vcxproj.filters deleted file mode 100644 index 22c9793..0000000 --- a/StormLib_vs22.vcxproj.filters +++ /dev/null @@ -1,221 +0,0 @@ - - - - - {595d6bc1-89d0-4fb8-98f6-be35e73727c4} - - - {721663d8-8692-476f-b0fd-71fdadf69929} - - - {9cc24144-d198-4bd1-b941-b946bd61b982} - - - {be0080d3-fc04-4442-9e28-b4cc2641177d} - - - {adb84a97-8a0c-4988-9473-452326110dff} - - - {87256d6a-e658-4f60-8759-6bff32a35eb2} - - - {02c6dfb8-4a58-46c5-bb35-69ba6215a3a6} - - - {563829a0-aaa3-4af2-88a2-8c6445d2754b} - - - {e82b0d03-77ff-46dc-b5a4-5b469224222a} - - - {cb92df18-9435-4db9-997a-e0e7d532cd26} - - - {2920175c-439c-4fd5-b94e-8cf1d3aaadd3} - - - - - Doc Files - - - Doc Files - - - Doc Files - - - - - Header Files - - - Source Files\adpcm - - - Source Files\huffman - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\jenkins - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\adpcm - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\huffman - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\pklib - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\jenkins - - - Source Files\zlib - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/StormLib_vs22_dll.vcxproj b/StormLib_vs22_dll.vcxproj deleted file mode 100644 index bda8dd9..0000000 --- a/StormLib_vs22_dll.vcxproj +++ /dev/null @@ -1,348 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StormLib_dll - {CB385198-50B1-4CF4-883B-11F042DED6AA} - StormLib_dll - Win32Proj - 10.0.17134.0 - - - - DynamicLibrary - v141_xp - Unicode - true - - - DynamicLibrary - v141_xp - Unicode - - - DynamicLibrary - v141_xp - Unicode - true - - - DynamicLibrary - v141_xp - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.25431.1 - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - true - StormLib - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - true - StormLib - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - false - StormLib - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - false - StormLib - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - $(OutDir)StormLib.dll - .\src\DllMain.def - true - Windows - false - - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - true - - - $(OutDir)StormLib.dll - .\src\DllMain.def - true - Windows - false - - MachineX64 - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - $(OutDir)StormLib.dll - .\src\DllMain.def - true - Windows - true - true - false - - MachineX86 - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - $(OutDir)StormLib.dll - .\src\DllMain.def - true - Windows - true - true - false - - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - - - - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - - - - - - - \ No newline at end of file diff --git a/StormLib_vs22_dll.vcxproj.filters b/StormLib_vs22_dll.vcxproj.filters deleted file mode 100644 index 2eaf026..0000000 --- a/StormLib_vs22_dll.vcxproj.filters +++ /dev/null @@ -1,229 +0,0 @@ - - - - - {b352ea2c-4169-4b60-85bc-82eadd5a9d2e} - - - {9171b211-949a-4dc1-a028-edf0a2ed4605} - - - {712a20a0-c7a8-4e56-947b-2cf030bbb287} - - - {83502600-f49c-43b1-afe6-038d3560a859} - - - {ea8b08a3-5c21-48e0-b75f-78eaa2adbc22} - - - {593ac5e7-fe06-42b8-8025-e3bd725f95d8} - - - {856c9964-4d85-40e9-8cbd-f4c672c07780} - - - {7ad3c876-768a-45bc-85b1-38cd492814ea} - - - {22e86a97-80e9-45a0-ac8e-70d7ea848f35} - - - {7b2ea923-8454-4073-bb9c-85de0f66caa1} - - - {5404ec38-706a-47f8-97b7-941c2574ddf2} - - - - - Doc Files - - - Doc Files - - - Doc Files - - - - - Header Files - - - Header Files - - - Header Files - - - Source Files\adpcm - - - Source Files\huffman - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\jenkins - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\adpcm - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\huffman - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\pklib - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\jenkins - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/StormLib_vs22_test.vcxproj b/StormLib_vs22_test.vcxproj deleted file mode 100644 index 18cee5b..0000000 --- a/StormLib_vs22_test.vcxproj +++ /dev/null @@ -1,360 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StormLib_test - {AA561A7B-26EA-49AF-90E8-C53C1FA2965D} - StormLib_test - Win32Proj - 10.0.17134.0 - - - - Application - v141_xp - Unicode - true - - - Application - v141_xp - Unicode - - - Application - v141_xp - Unicode - true - - - Application - v141_xp - Unicode - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.25431.1 - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - true - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - false - - - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - ./bin/$(ProjectName)/$(Platform)/$(Configuration)\ - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - EditAndContinue - Default - true - - - true - Console - false - - MachineX86 - false - - - - - X64 - - - Disabled - WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - Level1 - ProgramDatabase - Default - true - - - true - Console - false - - MachineX64 - false - - - - - WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - true - Console - true - true - false - - MachineX86 - false - - - - - X64 - - - WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions) - MultiThreaded - - Level1 - ProgramDatabase - true - - - true - Console - true - true - false - - MachineX64 - false - - - - - - - - - - - - - - - - - - - - - Level4 - Level4 - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - - - Level1 - Level1 - - - - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - Level4 - Level4 - Level4 - Level4 - - - - - - - - - - - - - Level4 - Level4 - Level4 - Level4 - - - - - - - \ No newline at end of file diff --git a/StormLib_vs22_test.vcxproj.filters b/StormLib_vs22_test.vcxproj.filters deleted file mode 100644 index d341b12..0000000 --- a/StormLib_vs22_test.vcxproj.filters +++ /dev/null @@ -1,230 +0,0 @@ - - - - - {1dbbb48c-9db9-4fdb-a903-223ed233cc21} - - - {ab878eef-1074-4594-bac5-272c05774bd8} - - - {640f063a-5028-4ba1-9007-96d98a634561} - - - {6e8cfdab-fca3-4737-8905-6154bc657e15} - - - {a810fdb6-0d21-4279-8e39-b2de644170c0} - - - {7861b4fb-1471-4573-92ea-08c06dc14b93} - - - {5308566b-d3fd-4561-a7fb-982a63662793} - - - {d5371a5f-1630-4e79-9e7e-1ef654a2ddec} - - - {c2971fba-aff1-42ab-9f4f-71707edabf77} - - - {4f4fe3d6-6f2b-4c83-9cf9-f1d108ecd854} - - - {5aaea51e-4b7c-4a35-b35c-96c2fc7750f1} - - - - - Doc Files - - - Doc Files - - - Doc Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files\adpcm - - - Source Files\huffman - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\jenkins - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\adpcm - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\bzip2 - - - Source Files\huffman - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\lzma - - - Source Files\pklib - - - Source Files\pklib - - - Source Files\sparse - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\jenkins - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/make-msvc.bat b/make-msvc.bat index d2d06d3..3dbc675 100644 --- a/make-msvc.bat +++ b/make-msvc.bat @@ -27,8 +27,8 @@ if exist "%PROGRAM_FILES_X64%\Microsoft Visual Studio\2022\Enterprise\VC\Auxilia :: Build all libraries using Visual Studio 2008 and 2019 if not "x%VCVARS_2008%" == "x" call :BuildLibs "%VCVARS_2008%" x86 %LIB_NAME%_vs08.sln \vs2008 if not "x%VCVARS_2008%" == "x" call :BuildLibs "%VCVARS_2008%" x64 %LIB_NAME%_vs08.sln \vs2008 -if not "x%VCVARS_20xx%" == "x" call :BuildLibs "%VCVARS_20xx%" x86 %LIB_NAME%_vs22.sln -if not "x%VCVARS_20xx%" == "x" call :BuildLibs "%VCVARS_20xx%" x64 %LIB_NAME%_vs22.sln +if not "x%VCVARS_20xx%" == "x" call :BuildLibs "%VCVARS_20xx%" x86 %LIB_NAME%.sln +if not "x%VCVARS_20xx%" == "x" call :BuildLibs "%VCVARS_20xx%" x64 %LIB_NAME%.sln goto:eof ::----------------------------------------------------------------------------- diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp index 43202d0..20d7cc4 100644 --- a/src/SBaseFileTable.cpp +++ b/src/SBaseFileTable.cpp @@ -317,29 +317,54 @@ static ULONGLONG DetermineArchiveSize_V2( ULONGLONG MpqOffset, ULONGLONG FileSize) { - ULONGLONG EndOfMpq = FileSize; - DWORD dwArchiveSize32; + ULONGLONG TableOffset; + ULONGLONG TableSize; + ULONGLONG MaxOffset = 0; // This could only be called for MPQs version 2.0 assert(pHeader->wFormatVersion == MPQ_FORMAT_VERSION_2); - // Check if we can rely on the archive size in the header - if((FileSize >> 0x20) == 0) + // Is the hash table end greater than max offset? + TableOffset = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos); + TableSize = (ULONGLONG)pHeader->dwHashTableSize * sizeof(TMPQHash); + if((TableOffset + TableSize) > MaxOffset) + MaxOffset = TableOffset + TableSize; + + // Is the block table end greater than max offset? + TableOffset = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos); + TableSize = (ULONGLONG)pHeader->dwBlockTableSize * sizeof(TMPQBlock); + if((TableOffset + TableSize) > MaxOffset) + MaxOffset = TableOffset + TableSize; + + // Is the hi-block table end greater than max offset? + if((TableOffset = pHeader->HiBlockTablePos64) != 0) { - if(pHeader->dwBlockTablePos < pHeader->dwArchiveSize) - { - if((pHeader->dwArchiveSize - pHeader->dwBlockTablePos) <= (pHeader->dwBlockTableSize * sizeof(TMPQBlock))) - return pHeader->dwArchiveSize; + TableSize = (ULONGLONG)pHeader->dwBlockTableSize * sizeof(USHORT); + if((TableOffset + TableSize) > MaxOffset) + MaxOffset = TableOffset + TableSize; + } + + // Cut to the file size + if(MaxOffset > (FileSize - MpqOffset)) + MaxOffset = FileSize - MpqOffset; + return MaxOffset; +} + +static ULONGLONG DetermineBlockTableSize_V2(TMPQHeader * pHeader) +{ + ULONGLONG BlockTableOffset = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos); + ULONGLONG TableOffset; + ULONGLONG TableSize = (pHeader->ArchiveSize64 - BlockTableOffset); - // If the archive size in the header is less than real file size - dwArchiveSize32 = (DWORD)(FileSize - MpqOffset); - if(pHeader->dwArchiveSize <= dwArchiveSize32) - return pHeader->dwArchiveSize; + // Subtract the offset of the hi-block table + if((TableOffset = pHeader->HiBlockTablePos64) != 0) + { + if(TableOffset > BlockTableOffset) + { + TableSize = TableOffset - BlockTableOffset; } } - - // Return the calculated archive size - return (EndOfMpq - MpqOffset); + return TableSize; } static ULONGLONG DetermineArchiveSize_V4( @@ -564,9 +589,10 @@ DWORD ConvertMpqHeaderToFormat4( { // Determine real archive size pHeader->ArchiveSize64 = DetermineArchiveSize_V2(pHeader, ByteOffset, FileSize); + pHeader->dwArchiveSize = (DWORD)(pHeader->ArchiveSize64); // Calculate size of the block table - pHeader->BlockTableSize64 = pHeader->ArchiveSize64 - BlockTablePos64; + pHeader->BlockTableSize64 = DetermineBlockTableSize_V2(pHeader); assert(pHeader->BlockTableSize64 <= (pHeader->dwBlockTableSize * sizeof(TMPQBlock))); } } diff --git a/test/StormTest.cpp b/test/StormTest.cpp index 2f45e96..82668cf 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -4183,30 +4183,23 @@ int _tmain(int argc, TCHAR * argv[]) // Initialize storage and mix the random number generator printf("==== Test Suite for StormLib version %s ====\n", STORMLIB_VERSION_STRING); dwErrCode = InitializeMpqDirectory(argv, argc); -/* + // Check creation of the MPQ with LZMA compression - LPCTSTR szArchiveName = _T("E:\\new-mpq.mpq"); + LPCTSTR szArchiveName = _T("e:\\MemoryCorruption.SC2Replay"); HANDLE hFile = NULL; HANDLE hMpq = NULL; - - DeleteFile(szArchiveName); - if(SFileCreateArchive(szArchiveName, MPQ_CREATE_ARCHIVE_V2 | MPQ_CREATE_LISTFILE | MPQ_CREATE_ATTRIBUTES, 0x1000, &hMpq)) +/* + if(SFileOpenArchive(szArchiveName, 0, 0, &hMpq)) { - SFileAddFileEx(hMpq, _T("e:\\DlgSearchFile.cpp"), "DlgSearchFile.cpp", MPQ_FILE_SINGLE_UNIT | MPQ_FILE_COMPRESS, MPQ_COMPRESSION_LZMA, MPQ_COMPRESSION_NEXT_SAME); - SFileCloseArchive(hMpq); - - if(SFileOpenArchive(szArchiveName, 0, 0, &hMpq)) + if(SFileOpenFileEx(hMpq, "DlgSearchFile.cpp", 0, &hFile)) { - if(SFileOpenFileEx(hMpq, "DlgSearchFile.cpp", 0, &hFile)) - { - DWORD dwBytesRead = 0; - BYTE Buffer[0x100]; + DWORD dwBytesRead = 0; + BYTE Buffer[0x100]; - SFileReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL); - SFileCloseFile(hFile); - } - SFileCloseArchive(hMpq); + SFileReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL); + SFileCloseFile(hFile); } + SFileCloseArchive(hMpq); } */ #ifdef TEST_COMMAND_LINE -- cgit v1.2.3