diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..21256661 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto \ No newline at end of file diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..f43861fa --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +ko_fi: theotherroles diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..4a6bd9d4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[Bug Report]" +labels: "\U0001F974 bug" +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**System (please complete the following information):** + - OS: [e.g. Windows 11] + - Among Us Version [e.g. v2021.11.15s] + - TheOtherRoles Version [e.g. v3.3.3] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..7b673cf1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for the mod +title: "[Suggestion]" +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution / role you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..bd61d495 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +name: AutoBuild .NET + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/cache@v2 + with: + path: | + ~/.nuget/packages + ~/.cache/bepinex + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget- + + - uses: actions/checkout@v2 + with: + submodules: true + + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.x + + - name: Build + run: dotnet build TheOtherRoles/TheOtherRoles.csproj --configuration Release + + - name: Upload TheOtherRoles + uses: actions/upload-artifact@v2 + with: + name: TheOtherRoles.dll + path: TheOtherRoles/bin/Release/net6.0/TheOtherRoles.dll + diff --git a/.gitignore b/.gitignore index f0be608f..ed41176b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,362 @@ -.vs -.vscode/tasks.json -TheOtherRoles/bin/ -TheOtherRoles/libs/ -TheOtherRoles/obj/ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.DS_Store +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates +.DS_Store +*/.DS_Store + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Bb]in/ +[Bb]inPublic/ +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +*/[Bb]in/* +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ ~$* -*.diff -TODO +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# .idea stuff +.idea +*.iml + +*.suo +*.user +.vs/ +[Bb]in/ +[Oo]bj/ +_UpgradeReport_Files/ + +Thumbs.db +Desktop.ini .DS_Store -Strings-Dev.xlsx \ No newline at end of file + +.build +tools + +Among Us/*.* +Among Us/*/* \ No newline at end of file diff --git a/LOGO.png b/LOGO.png new file mode 100644 index 00000000..04fb4d3d Binary files /dev/null and b/LOGO.png differ diff --git a/Strings.xlsx b/Strings.xlsx index f80f254b..0563794c 100644 Binary files a/Strings.xlsx and b/Strings.xlsx differ diff --git a/TheOtherRoles.sln b/TheOtherRoles.sln index a7a47e74..3c00efe9 100644 --- a/TheOtherRoles.sln +++ b/TheOtherRoles.sln @@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheOtherRoles", "TheOtherRoles\TheOtherRoles.csproj", "{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TheOtherUpdater", "TheOtherUpdater\TheOtherUpdater.vcxproj", "{73A5662B-9C59-4C97-95C5-F5B2A8BBDDCA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/TheOtherRoles/Buttons.cs b/TheOtherRoles/Buttons.cs index e9ab6adf..eac2ec9b 100644 --- a/TheOtherRoles/Buttons.cs +++ b/TheOtherRoles/Buttons.cs @@ -303,7 +303,7 @@ private static void addReplacementHandcuffedButton(CustomButton button, Vector3? Vector3 positionOffsetValue = positionOffset ?? button.PositionOffset; // For non custom buttons, we can set these manually. positionOffsetValue.z = -0.1f; couldUse = couldUse ?? button.CouldUse; - CustomButton replacementHandcuffedButton = new CustomButton(() => { }, () => { return true; }, couldUse, () => { }, Deputy.getHandcuffedButtonSprite(), positionOffsetValue, button.hudManager, button.hotkey, + CustomButton replacementHandcuffedButton = new(() => { }, () => { return true; }, couldUse, () => { }, Deputy.getHandcuffedButtonSprite(), positionOffsetValue, button.hudManager, button.hotkey, true, Deputy.handcuffDuration, () => { }, button.mirror); replacementHandcuffedButton.actionButtonGameObject.ForEachChild((Il2CppSystem.Action)((c) => { if (c.name.Equals("HotKeyGuide")) GameObject.Destroy(c); })); ButtonEffect.SetMouseActionIcon(replacementHandcuffedButton.actionButtonGameObject, true, ModTranslation.getString("buttonsHandcuffed"), false); @@ -3539,7 +3539,7 @@ Func fortuneTellerHasButton(byte index) void setButtonPos(byte index) { Vector3 pos = fortuneTellerCalcPos(index); - Vector3 scale = new Vector3(0.4f, 0.5f, 1.0f); + Vector3 scale = new(0.4f, 0.5f, 1.0f); Vector3 iconBase = new Vector3(-0.82f, 0.19f, 0) + IntroCutsceneOnDestroyPatch.bottomLeft; diff --git a/TheOtherRoles/CustomGameModes/GameModePatches.cs b/TheOtherRoles/CustomGameModes/GameModePatches.cs new file mode 100644 index 00000000..59604161 --- /dev/null +++ b/TheOtherRoles/CustomGameModes/GameModePatches.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Epic.OnlineServices.Presence; +using HarmonyLib; +using TheOtherRoles.Utilities; +using TMPro; +using UnityEngine; +using static UnityEngine.UI.Button; +using UnityEngine.Events; +using Hazel; +using TheOtherRoles.Players; + +namespace TheOtherRoles.CustomGameModes +{ + [HarmonyPatch] + class GameModePatches + { + /* + Creates a button in the info pane in the lobby to cycle through the game modes of TOR. + */ + [HarmonyPatch(typeof(LobbyInfoPane), nameof(LobbyInfoPane.Update))] + class LobbyInfoPanePatch + { + + private static GameObject gameModeButton = null; + public static void Postfix(LobbyInfoPane __instance) + { + if (gameModeButton != null || !AmongUsClient.Instance.AmHost) { return; } + + var template = GameObject.Find("PRIVATE BUTTON"); + var GameModeText = GameObject.Find("GameModeText"); + if (template == null || GameModeText == null) { return; } + gameModeButton = GameObject.Instantiate(template, template.transform.parent); //, GameModeText.transform); + gameModeButton.transform.localPosition = template.transform.localPosition + new Vector3(0f, 0.65f, -2f); + gameModeButton.name = "TOR GameModeButton"; + + var pButton = gameModeButton.GetComponent(); + pButton.buttonText.text = GameModeText.GetComponent().text; + pButton.OnClick.RemoveAllListeners(); + pButton.OnClick = new ButtonClickedEvent(); + __instance.StartCoroutine(Effects.Lerp(0.1f, new Action(p => { pButton.buttonText.text = Helpers.cs(Color.yellow, GameModeText.GetComponent().text); }))); + gameModeButton.transform.GetChild(1).GetComponent().color = new Color(0.1f, 0.1f, 0.1f); + gameModeButton.transform.GetChild(2).GetComponent().color = new Color(0f, 0f, 0f); + pButton.OnClick.AddListener((Action)(() => + { + TORMapOptions.gameMode = (CustomGamemodes)((int)(TORMapOptions.gameMode + 1) % Enum.GetNames(typeof(CustomGamemodes)).Length); + __instance.StartCoroutine(Effects.Lerp(0.1f, new Action(p => { pButton.buttonText.text = Helpers.cs(Color.yellow, GameModeText.GetComponent().text); }))); + MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.ShareGamemode, Hazel.SendOption.Reliable, -1); + writer.Write((byte)TORMapOptions.gameMode); + AmongUsClient.Instance.FinishRpcImmediately(writer); + RPCProcedure.shareGamemode((byte)TORMapOptions.gameMode); + })); + pButton.OnMouseOut = new UnityEvent(); + pButton.OnMouseOver = new UnityEvent(); + pButton.OnMouseOver.AddListener((Action)(() => { + gameModeButton.transform.GetChild(1).gameObject.SetActive(true); + gameModeButton.transform.GetChild(2).gameObject.SetActive(false); + })); + pButton.OnMouseOut.AddListener((Action)(() => { + gameModeButton.transform.GetChild(1).gameObject.SetActive(false); + gameModeButton.transform.GetChild(2).gameObject.SetActive(true); + })); + + } + } + } +} \ No newline at end of file diff --git a/TheOtherRoles/CustomGameModes/GuesserGM.cs b/TheOtherRoles/CustomGameModes/GuesserGM.cs index cc0c8cbb..dc4f0d2f 100644 --- a/TheOtherRoles/CustomGameModes/GuesserGM.cs +++ b/TheOtherRoles/CustomGameModes/GuesserGM.cs @@ -3,7 +3,7 @@ namespace TheOtherRoles.CustomGameModes { class GuesserGM { // Guesser Gamemode - public static List guessers = new List(); + public static List guessers = new(); public static Color color = new Color32(255, 255, 0, byte.MaxValue); public PlayerControl guesser = null; diff --git a/TheOtherRoles/CustomGameModes/HideNSeekGM.cs b/TheOtherRoles/CustomGameModes/HideNSeekGM.cs index 0908fd39..109f636e 100644 --- a/TheOtherRoles/CustomGameModes/HideNSeekGM.cs +++ b/TheOtherRoles/CustomGameModes/HideNSeekGM.cs @@ -26,7 +26,7 @@ public static bool isHunter() { } public static List getHunters() { - List hunters = new List(CachedPlayer.AllPlayers); + List hunters = new(CachedPlayer.AllPlayers); hunters.RemoveAll(x => !x.Data.Role.IsImpostor); return hunters; } @@ -60,10 +60,10 @@ public static void clearAndReload() { } public static class Hunter { - public static List localArrows = new List(); - public static List lightActive = new List(); + public static List localArrows = new(); + public static List lightActive = new(); public static bool arrowActive = false; - public static Dictionary playerKillCountMap = new Dictionary(); + public static Dictionary playerKillCountMap = new(); public static float lightCooldown = 30f; public static float lightDuration = 5f; @@ -118,7 +118,7 @@ public static void clearAndReload() { } public static class Hunted { - public static List timeshieldActive = new List(); + public static List timeshieldActive = new(); public static int shieldCount = 3; public static float shieldCooldown = 30f; diff --git a/TheOtherRoles/CustomOptionHolder.cs b/TheOtherRoles/CustomOptionHolder.cs index f255cef1..402b3c4d 100644 --- a/TheOtherRoles/CustomOptionHolder.cs +++ b/TheOtherRoles/CustomOptionHolder.cs @@ -601,7 +601,7 @@ public class CustomOptionHolder { public static CustomOption huntedShieldRewindTime; public static CustomOption huntedShieldNumber; - internal static Dictionary blockedRolePairings = new Dictionary(); + internal static Dictionary blockedRolePairings = new(); public static string cs(Color c, string s) { return string.Format("{4}", ToByte(c.r), ToByte(c.g), ToByte(c.b), ToByte(c.a), s); diff --git a/TheOtherRoles/GameHistory.cs b/TheOtherRoles/GameHistory.cs index 42525897..9a45e1ec 100644 --- a/TheOtherRoles/GameHistory.cs +++ b/TheOtherRoles/GameHistory.cs @@ -45,8 +45,8 @@ public DeadPlayer(PlayerControl player, DateTime timeOfDeath, CustomDeathReason } static class GameHistory { - public static List> localPlayerPositions = new List>(); - public static List deadPlayers = new List(); + public static List> localPlayerPositions = new(); + public static List deadPlayers = new(); public static void clearGameHistory() { localPlayerPositions = new List>(); diff --git a/TheOtherRoles/Helpers.cs b/TheOtherRoles/Helpers.cs index 1746e214..85c7437e 100644 --- a/TheOtherRoles/Helpers.cs +++ b/TheOtherRoles/Helpers.cs @@ -50,10 +50,10 @@ public static class Direction public static Vector2 down = Vector2.down; public static Vector2 left = Vector2.left; public static Vector2 right = Vector2.right; - public static Vector2 upleft = new Vector2(-0.70710677f, 0.70710677f); - public static Vector2 upright = new Vector2(0.70710677f, 0.70710677f); - public static Vector2 downleft = new Vector2(-0.70710677f, -0.70710677f); - public static Vector2 downright = new Vector2(0.70710677f, -0.70710677f); + public static Vector2 upleft = new(-0.70710677f, 0.70710677f); + public static Vector2 upright = new(0.70710677f, 0.70710677f); + public static Vector2 downleft = new(-0.70710677f, -0.70710677f); + public static Vector2 downright = new(0.70710677f, -0.70710677f); } public static class Helpers @@ -82,7 +82,7 @@ public static Sprite loadSpriteFromResource(Texture2D texture, float pixelsPerUn public static unsafe Texture2D loadTextureFromResources(string path) { try { - Texture2D texture = new Texture2D(2, 2, TextureFormat.ARGB32, true); + Texture2D texture = new(2, 2, TextureFormat.ARGB32, true); Assembly assembly = Assembly.GetExecutingAssembly(); Stream stream = assembly.GetManifestResourceStream(path); var length = stream.Length; @@ -102,7 +102,7 @@ public static unsafe Texture2D loadTextureFromResources(string path) { public static Texture2D loadTextureFromDisk(string path) { try { if (File.Exists(path)) { - Texture2D texture = new Texture2D(2, 2, TextureFormat.ARGB32, true); + Texture2D texture = new(2, 2, TextureFormat.ARGB32, true); var byteTexture = Il2CppSystem.IO.File.ReadAllBytes(path); ImageConversion.LoadImage(texture, byteTexture, false); return texture; @@ -151,7 +151,7 @@ public static PlayerControl playerById(byte id) public static Dictionary allPlayersById() { - Dictionary res = new Dictionary(); + Dictionary res = new(); foreach (PlayerControl player in CachedPlayer.AllPlayers) res.Add(player.PlayerId, player); return res; @@ -558,7 +558,7 @@ public static int ComputeConstantHash(this string str) public static string ComputeConstantHashAsString(this string str) { var val = str.ComputeConstantHash(); - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new(); while (val > 0) { builder.Append((char)('a' + (val % 26))); @@ -661,7 +661,7 @@ private static byte ToByte(float f) { public static KeyValuePair MaxPair(this Dictionary self, out bool tie) { tie = true; - KeyValuePair result = new KeyValuePair(byte.MaxValue, int.MinValue); + KeyValuePair result = new(byte.MaxValue, int.MinValue); foreach (KeyValuePair keyValuePair in self) { if (keyValuePair.Value > result.Value) @@ -1116,6 +1116,8 @@ public static bool roleCanUseVents(this PlayerControl player) { roleCouldUse = true; else if (Thief.canUseVents && Thief.thief != null && Thief.thief == player) roleCouldUse = true; + else if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.schrodingersCat == player && SchrodingersCat.hasTeam() && SchrodingersCat.team != SchrodingersCat.Team.Crewmate) + roleCouldUse = true; else if (player.Data?.Role != null && player.Data.Role.CanVent) { if (Janitor.janitor != null && Janitor.janitor == CachedPlayer.LocalPlayer.PlayerControl) roleCouldUse = false; @@ -1287,7 +1289,7 @@ public static void shareGameVersion() { } public static List getKillerTeamMembers(PlayerControl player) { - List team = new List(); + List team = new(); foreach(PlayerControl p in CachedPlayer.AllPlayers) { if (player.Data.Role.IsImpostor && p.Data.Role.IsImpostor && player.PlayerId != p.PlayerId && team.All(x => x.PlayerId != p.PlayerId)) team.Add(p); else if (player == Jackal.jackal && p == Sidekick.sidekick) team.Add(p); @@ -1404,7 +1406,8 @@ public static bool hasImpVision(NetworkedPlayerInfo player) { || (CreatedMadmate.createdMadmate != null && CreatedMadmate.createdMadmate.PlayerId == player.PlayerId && CreatedMadmate.hasImpostorVision) || (Moriarty.moriarty != null && Moriarty.moriarty.PlayerId == player.PlayerId) || (JekyllAndHyde.jekyllAndHyde != null && !JekyllAndHyde.isJekyll() && JekyllAndHyde.jekyllAndHyde.PlayerId == player.PlayerId) - || (Fox.fox != null && Fox.fox.PlayerId == player.PlayerId); + || (Fox.fox != null && Fox.fox.PlayerId == player.PlayerId) + || (SchrodingersCat.schrodingersCat != null && SchrodingersCat.schrodingersCat.PlayerId == player.PlayerId && SchrodingersCat.hasTeam() && SchrodingersCat.team != SchrodingersCat.Team.Crewmate); } public static object TryCast(this Il2CppObjectBase self, Type type) diff --git a/TheOtherRoles/Main.cs b/TheOtherRoles/Main.cs index 9b265012..85bb1201 100644 --- a/TheOtherRoles/Main.cs +++ b/TheOtherRoles/Main.cs @@ -179,13 +179,13 @@ private static void Prefix() { public static class DebugManager { private static readonly string passwordHash = "d1f51dfdfd8d38027fd2ca9dfeb299399b5bdee58e6c0b3b5e9a45cd4e502848"; - private static readonly System.Random random = new System.Random((int)DateTime.Now.Ticks); - private static List bots = new List(); + private static readonly System.Random random = new((int)DateTime.Now.Ticks); + private static List bots = new(); public static void Postfix(KeyboardJoystick __instance) { // Check if debug mode is active. - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new(); SHA256 sha = SHA256Managed.Create(); Byte[] hashed = sha.ComputeHash(Encoding.UTF8.GetBytes(TheOtherRolesPlugin.DebugMode.Value)); foreach (var b in hashed) { diff --git a/TheOtherRoles/MapOptions.cs b/TheOtherRoles/MapOptions.cs index 01602457..ba5b5813 100644 --- a/TheOtherRoles/MapOptions.cs +++ b/TheOtherRoles/MapOptions.cs @@ -24,9 +24,9 @@ static class TORMapOptions { // Updating values public static int meetingsCount = 0; - public static List camerasToAdd = new List(); - public static List ventsToSeal = new List(); - public static Dictionary playerIcons = new Dictionary(); + public static List camerasToAdd = new(); + public static List ventsToSeal = new(); + public static Dictionary playerIcons = new(); public static string firstKillName; public static PlayerControl firstKillPlayer; diff --git a/TheOtherRoles/MetaContext/MetaScreen.cs b/TheOtherRoles/MetaContext/MetaScreen.cs index 44ae9e2c..cd64da96 100644 --- a/TheOtherRoles/MetaContext/MetaScreen.cs +++ b/TheOtherRoles/MetaContext/MetaScreen.cs @@ -787,7 +787,7 @@ public float Generate(GameObject screen, Vector2 cursor, Vector2 size, out (floa static public MetaContextOld GetTwoWayButton(Action buttonAction) { - MetaContextOld context = new MetaContextOld(); + MetaContextOld context = new(); for (int i = 0; i < 2; i++) { diff --git a/TheOtherRoles/MetaContext/SpriteLoader.cs b/TheOtherRoles/MetaContext/SpriteLoader.cs index 3be10e4d..4f774d41 100644 --- a/TheOtherRoles/MetaContext/SpriteLoader.cs +++ b/TheOtherRoles/MetaContext/SpriteLoader.cs @@ -27,7 +27,7 @@ public Sprite GetSprite() return sprite; } - static public SpriteLoader FromResource(string address, float pixelsPerUnit) => new SpriteLoader(new ResourceTextureLoader(address), pixelsPerUnit); + static public SpriteLoader FromResource(string address, float pixelsPerUnit) => new(new ResourceTextureLoader(address), pixelsPerUnit); } public interface ITextureLoader @@ -62,7 +62,7 @@ public static Texture2D LoadTextureFromDisk(string path) { if (File.Exists(path)) { - Texture2D texture = new Texture2D(2, 2, TextureFormat.ARGB32, true); + Texture2D texture = new(2, 2, TextureFormat.ARGB32, true); byte[] byteTexture = File.ReadAllBytes(path); LoadImage(texture, byteTexture, false); return texture; @@ -77,7 +77,7 @@ public static Texture2D LoadTextureFromDisk(string path) public static Texture2D LoadTextureFromResources(string path) { - Texture2D texture = new Texture2D(2, 2, TextureFormat.ARGB32, true); + Texture2D texture = new(2, 2, TextureFormat.ARGB32, true); Assembly assembly = Assembly.GetExecutingAssembly(); Stream stream = assembly.GetManifestResourceStream(path); if (stream == null) return null!; @@ -145,7 +145,7 @@ public class DividedSpriteLoader : Image, IDividedSpriteLoader Sprite[] sprites; ITextureLoader texture; Tuple division, size; - public Vector2 Pivot = new Vector2(0.5f, 0.5f); + public Vector2 Pivot = new(0.5f, 0.5f); public DividedSpriteLoader(ITextureLoader textureLoader, float pixelsPerUnit, int x, int y, bool isSize = false) { @@ -202,8 +202,8 @@ public int Length } static public DividedSpriteLoader FromResource(string address, float pixelsPerUnit, int x, int y, bool isSize = false) - => new DividedSpriteLoader(new ResourceTextureLoader(address), pixelsPerUnit, x, y, isSize); + => new(new ResourceTextureLoader(address), pixelsPerUnit, x, y, isSize); static public DividedSpriteLoader FromDisk(string address, float pixelsPerUnit, int x, int y, bool isSize = false) - => new DividedSpriteLoader(new DiskTextureLoader(address), pixelsPerUnit, x, y, isSize); + => new(new DiskTextureLoader(address), pixelsPerUnit, x, y, isSize); } } diff --git a/TheOtherRoles/MetaContext/TextAttribute.cs b/TheOtherRoles/MetaContext/TextAttribute.cs index e928bd17..7b570fb3 100644 --- a/TheOtherRoles/MetaContext/TextAttribute.cs +++ b/TheOtherRoles/MetaContext/TextAttribute.cs @@ -9,7 +9,7 @@ namespace TheOtherRoles.MetaContext { public class TextAttribute { - static public readonly TextAttribute TitleAttr = new TextAttribute() + static public readonly TextAttribute TitleAttr = new() { Alignment = TMPro.TextAlignmentOptions.Left, Styles = TMPro.FontStyles.Bold, @@ -17,7 +17,7 @@ public class TextAttribute FontMinSize = 1f, FontSize = 3f }; - static public readonly TextAttribute ContentAttr = new TextAttribute() + static public readonly TextAttribute ContentAttr = new() { Alignment = TMPro.TextAlignmentOptions.TopLeft, Styles = TMPro.FontStyles.Normal, @@ -26,7 +26,7 @@ public class TextAttribute FontSize = 1.5f, Size = new Vector2(8f, 2f) }; - static public readonly TextAttribute NormalAttr = new TextAttribute() + static public readonly TextAttribute NormalAttr = new() { Alignment = TMPro.TextAlignmentOptions.Center, Styles = TMPro.FontStyles.Normal, @@ -37,7 +37,7 @@ public class TextAttribute }; static public readonly TextAttribute NormalAttrLeft = new(NormalAttr) { Alignment = TMPro.TextAlignmentOptions.Left }; - static public readonly TextAttribute BoldAttr = new TextAttribute() + static public readonly TextAttribute BoldAttr = new() { Alignment = TMPro.TextAlignmentOptions.Center, Styles = TMPro.FontStyles.Bold, diff --git a/TheOtherRoles/MetaContext/TextField.cs b/TheOtherRoles/MetaContext/TextField.cs index 92ab9b88..b1ea5d89 100644 --- a/TheOtherRoles/MetaContext/TextField.cs +++ b/TheOtherRoles/MetaContext/TextField.cs @@ -294,7 +294,7 @@ public void SetText(string text) } private TextAttribute GenerateAttribute(Vector2 size, float fontSize, TextAlignmentOptions alignment) - => new TextAttribute() + => new() { Alignment = alignment, AllowAutoSizing = false, diff --git a/TheOtherRoles/Modules/Achievement.cs b/TheOtherRoles/Modules/Achievement.cs index 2639dd0c..ff78ef07 100644 --- a/TheOtherRoles/Modules/Achievement.cs +++ b/TheOtherRoles/Modules/Achievement.cs @@ -359,7 +359,7 @@ static public void LoadAchievements() static private Dictionary achievements = new(); public static IEnumerable allAchievements => achievements.Values; - public static List allAchievementTokens = new List(); + public static List allAchievementTokens = new(); static public DataSaver AchievementDataSaver = new("Progress"); public enum ClearState { diff --git a/TheOtherRoles/Modules/ButtonEffect.cs b/TheOtherRoles/Modules/ButtonEffect.cs index 2fdfe71e..94ff758c 100644 --- a/TheOtherRoles/Modules/ButtonEffect.cs +++ b/TheOtherRoles/Modules/ButtonEffect.cs @@ -78,7 +78,7 @@ static public GameObject AddKeyGuide(GameObject button, KeyCode key, UnityEngine if (KeyCodeInfo.AllKeyInfo.ContainsKey(key)) numSprite = KeyCodeInfo.AllKeyInfo[key].Sprite; if (numSprite == null) return null; - GameObject obj = new GameObject(); + GameObject obj = new(); obj.name = "HotKeyGuide"; obj.transform.SetParent(button.transform); obj.layer = button.layer; @@ -86,7 +86,7 @@ static public GameObject AddKeyGuide(GameObject button, KeyCode key, UnityEngine renderer.transform.localPosition = (UnityEngine.Vector3)pos + new UnityEngine.Vector3(0f, 0f, -10f); renderer.sprite = keyBindBackgroundSprite.GetSprite(); - GameObject numObj = new GameObject(); + GameObject numObj = new(); numObj.name = "HotKeyText"; numObj.transform.SetParent(obj.transform); numObj.layer = button.layer; @@ -126,7 +126,7 @@ static public GameObject SetMouseActionIcon(GameObject button, bool show, string } else { - GameObject obj = new GameObject(); + GameObject obj = new(); obj.name = "MouseAction"; obj.transform.SetParent(button.transform); obj.layer = button.layer; diff --git a/TheOtherRoles/Modules/ChatCommands.cs b/TheOtherRoles/Modules/ChatCommands.cs index af30a82e..6904813a 100644 --- a/TheOtherRoles/Modules/ChatCommands.cs +++ b/TheOtherRoles/Modules/ChatCommands.cs @@ -113,7 +113,7 @@ public static void Postfix(HudManager __instance) { public static class SetBubbleName { public static void Postfix(ChatBubble __instance, [HarmonyArgument(0)] string playerName) { PlayerControl sourcePlayer = PlayerControl.AllPlayerControls.ToArray().ToList().FirstOrDefault(x => x.Data != null && x.Data.PlayerName.Equals(playerName)); - if (CachedPlayer.LocalPlayer != null && CachedPlayer.LocalPlayer.Data.Role.IsImpostor && (Spy.spy != null && sourcePlayer.PlayerId == Spy.spy.PlayerId || Sidekick.sidekick != null && Sidekick.wasTeamRed && sourcePlayer.PlayerId == Sidekick.sidekick.PlayerId || Jackal.jackal != null && Jackal.wasTeamRed && sourcePlayer.PlayerId == Jackal.jackal.PlayerId) && __instance != null) __instance.NameText.color = Palette.ImpostorRed; + if (sourcePlayer != null && CachedPlayer.LocalPlayer != null && CachedPlayer.LocalPlayer.Data?.Role?.IsImpostor == true && (Spy.spy != null && sourcePlayer.PlayerId == Spy.spy.PlayerId || Sidekick.sidekick != null && Sidekick.wasTeamRed && sourcePlayer.PlayerId == Sidekick.sidekick.PlayerId || Jackal.jackal != null && Jackal.wasTeamRed && sourcePlayer.PlayerId == Jackal.jackal.PlayerId) && __instance != null) __instance.NameText.color = Palette.ImpostorRed; } } diff --git a/TheOtherRoles/Modules/CustomColors.cs b/TheOtherRoles/Modules/CustomColors.cs index e7609194..215dc1df 100644 --- a/TheOtherRoles/Modules/CustomColors.cs +++ b/TheOtherRoles/Modules/CustomColors.cs @@ -7,11 +7,11 @@ namespace TheOtherRoles.Modules { public class CustomColors { - protected static Dictionary ColorStrings = new Dictionary(); - public static List lighterColors = new List(){ 3, 4, 5, 7, 10, 11, 13, 14, 17 }; + protected static Dictionary ColorStrings = new(); + public static List lighterColors = new(){ 3, 4, 5, 7, 10, 11, 13, 14, 17 }; public static uint pickableColors = (uint)Palette.ColorNames.Length; - private static readonly List ORDER = new List() { 7, 37, 14, 5, 33, 41, 25, + private static readonly List ORDER = new() { 7, 37, 14, 5, 33, 41, 25, 4, 30, 0, 35, 3, 27, 17, 13, 23, 8, 32, 38, 1, 21, 40, 31, 10, 34, 22, 28, 36, diff --git a/TheOtherRoles/Modules/CustomHats/CustomHatManager.cs b/TheOtherRoles/Modules/CustomHats/CustomHatManager.cs index e6f1c7eb..1d627f20 100644 --- a/TheOtherRoles/Modules/CustomHats/CustomHatManager.cs +++ b/TheOtherRoles/Modules/CustomHats/CustomHatManager.cs @@ -285,7 +285,7 @@ public static List loadHorseHats() Assembly assembly = Assembly.GetExecutingAssembly(); string[] resourceNames = assembly.GetManifestResourceNames(); List hatFiles = new(); - Dictionary> hatFilesSorted = new Dictionary>(); + Dictionary> hatFilesSorted = new(); foreach (string resourceName in resourceNames) { if (resourceName.Contains("TheOtherRoles.Resources.HorseHats.") && resourceName.Contains(".png")) @@ -304,7 +304,7 @@ public static List loadHorseHats() int i = 0; foreach (var item in hatFilesSorted) { - CustomHat info = new CustomHat(); + CustomHat info = new(); info.Name = $"April Hat {i++:D2}"; info.Author = "A Fool"; info.Resource = item.Value.FirstOrDefault(x => !x.Contains("back")); diff --git a/TheOtherRoles/Modules/CustomHats/CustomHats.cs b/TheOtherRoles/Modules/CustomHats/CustomHats.cs deleted file mode 100644 index 0aa0d6a3..00000000 --- a/TheOtherRoles/Modules/CustomHats/CustomHats.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Text.Json.Serialization; - -namespace TheOtherRoles.Modules.CustomHats; - -public class CustomHat : CustomHatHashes -{ - [JsonPropertyName("author")] public string Author { get; set; } - - [JsonPropertyName("bounce")] public bool Bounce { get; set; } - - [JsonPropertyName("climbresource")] public string ClimbResource { get; set; } - - [JsonPropertyName("condition")] public string Condition { get; set; } - - [JsonPropertyName("name")] public string Name { get; set; } - - [JsonPropertyName("package")] public string Package { get; set; } - - [JsonPropertyName("resource")] public string Resource { get; set; } - - [JsonPropertyName("adaptive")] public bool Adaptive { get; set; } - - [JsonPropertyName("behind")] public bool Behind { get; set; } - - [JsonPropertyName("backresource")] public string BackResource { get; set; } - - [JsonPropertyName("backflipresource")] public string BackFlipResource { get; set; } - - [JsonPropertyName("flipresource")] public string FlipResource { get; set; } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Extentions/HatDataExtentions.cs b/TheOtherRoles/Modules/CustomHats/Extentions/HatDataExtentions.cs deleted file mode 100644 index 74ac55cc..00000000 --- a/TheOtherRoles/Modules/CustomHats/Extentions/HatDataExtentions.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace TheOtherRoles.Modules.CustomHats.Extensions; - -internal static class HatDataExtensions -{ - public static HatExtension GetHatExtension(this HatData hat) - { - if (CustomHatManager.TestExtension != null && CustomHatManager.TestExtension.Condition.Equals(hat.name)) - { - return CustomHatManager.TestExtension; - } - - return CustomHatManager.ExtensionCache.TryGetValue(hat.name, out var extension) ? extension : null; - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/HatExtentions.cs b/TheOtherRoles/Modules/CustomHats/HatExtentions.cs deleted file mode 100644 index 67a39b6e..00000000 --- a/TheOtherRoles/Modules/CustomHats/HatExtentions.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UnityEngine; - -namespace TheOtherRoles.Modules.CustomHats; - -public class HatExtension -{ - public string Author { get; set; } - public string Package { get; set; } - public string Condition { get; set; } - public Sprite FlipImage { get; set; } - public Sprite BackFlipImage { get; set; } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Helpers.cs b/TheOtherRoles/Modules/CustomHats/Helpers.cs deleted file mode 100644 index dc1810e6..00000000 --- a/TheOtherRoles/Modules/CustomHats/Helpers.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.IO; -using UnityEngine; - -namespace TheOtherRoles.Modules.CustomHats; - -internal static class Helpers -{ - public static Texture2D LoadTextureFromPath(string path) - { - if (!File.Exists(path)) return null; - var texture = new Texture2D(2, 2, TextureFormat.ARGB32, true); - try - { - var byteTexture = Il2CppSystem.IO.File.ReadAllBytes(path); - ImageConversion.LoadImage(texture, byteTexture, false); - } - catch - { - TheOtherRolesPlugin.Logger.LogError("Error loading texture from disk: " + path); - return null; - } - - return texture; - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Patches/CosmeticsCachePatch.cs b/TheOtherRoles/Modules/CustomHats/Patches/CosmeticsCachePatch.cs deleted file mode 100644 index fd9522de..00000000 --- a/TheOtherRoles/Modules/CustomHats/Patches/CosmeticsCachePatch.cs +++ /dev/null @@ -1,15 +0,0 @@ -using HarmonyLib; - -namespace TheOtherRoles.Modules.CustomHats.Patches; - -[HarmonyPatch(typeof(CosmeticsCache))] -internal static class CosmeticsCachePatches -{ - [HarmonyPatch(nameof(CosmeticsCache.GetHat))] - [HarmonyPrefix] - private static bool GetHatPrefix(string id, ref HatViewData __result) - { - TheOtherRolesPlugin.Logger.LogMessage($"trying to load hat {id} from cosmetics cache"); - return !CustomHatManager.ViewDataCache.TryGetValue(id, out __result); - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Patches/HatManagerPatch.cs b/TheOtherRoles/Modules/CustomHats/Patches/HatManagerPatch.cs deleted file mode 100644 index ebef55c4..00000000 --- a/TheOtherRoles/Modules/CustomHats/Patches/HatManagerPatch.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Cpp2IL.Core.Extensions; -using HarmonyLib; - -namespace TheOtherRoles.Modules.CustomHats.Patches; - -[HarmonyPatch(typeof(HatManager))] -internal static class HatManagerPatches -{ - private static bool isRunning; - private static bool isLoaded; - private static List allHats; - - [HarmonyPatch(nameof(HatManager.GetHatById))] - [HarmonyPrefix] - private static void GetHatByIdPrefix(HatManager __instance) - { - if (isRunning || isLoaded) return; - isRunning = true; - // Maybe we can use lock keyword to ensure simultaneous list manipulations ? - allHats = __instance.allHats.ToList(); - var cache = CustomHatManager.UnregisteredHats.Clone(); - foreach (var hat in cache) - { - try - { - allHats.Add(CustomHatManager.CreateHatBehaviour(hat)); - CustomHatManager.UnregisteredHats.Remove(hat); - } - catch (Exception) - { - TheOtherRolesPlugin.Logger.LogWarning($"GetHatByIdPrefix: error for hat {hat.Name}"); - } - } - cache.Clear(); - - __instance.allHats = allHats.ToArray(); - isLoaded = true; - } - - [HarmonyPatch(nameof(HatManager.GetHatById))] - [HarmonyPostfix] - private static void GetHatByIdPostfix() - { - isRunning = false; - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Patches/HatParentPatch.cs b/TheOtherRoles/Modules/CustomHats/Patches/HatParentPatch.cs deleted file mode 100644 index e5f9981b..00000000 --- a/TheOtherRoles/Modules/CustomHats/Patches/HatParentPatch.cs +++ /dev/null @@ -1,269 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using HarmonyLib; -using PowerTools; -using TheOtherRoles.Modules.CustomHats; -using UnityEngine; - -namespace TheOtherRoles.Modules.CustomHats.Patches; - -[HarmonyPatch(typeof(HatParent))] -internal static class HatParentPatches -{ - [HarmonyPatch(nameof(HatParent.SetHat), typeof(int))] - [HarmonyPriority(Priority.High)] - [HarmonyPrefix] - private static void SetHatPrefix(HatParent __instance) - { - SetCustomHat(__instance); - } - - [HarmonyPatch(nameof(HatParent.SetHat), typeof(HatData), typeof(int))] - [HarmonyPrefix] - private static bool SetHatPrefix(HatParent __instance, HatData hat, int color) - { - if (SetCustomHat(__instance)) return true; - __instance.PopulateFromHatViewData(); - __instance.SetMaterialColor(color); - return false; - } - - [HarmonyPatch(nameof(HatParent.SetHat), typeof(int))] - [HarmonyPrefix] - private static bool SetHatPrefix(HatParent __instance, int color) - { - if (!__instance.IsCached()) return true; - __instance.hatDataAsset = null; - __instance.PopulateFromHatViewData(); - __instance.SetMaterialColor(color); - return false; - } - - [HarmonyPatch(nameof(HatParent.UpdateMaterial))] - [HarmonyPrefix] - private static bool UpdateMaterialPrefix(HatParent __instance) - { - if (!__instance.TryGetCached(out var asset)) return true; - if (asset && asset.AltShader) - { - __instance.FrontLayer.sharedMaterial = asset.AltShader; - if (__instance.BackLayer) - { - __instance.BackLayer.sharedMaterial = asset.AltShader; - } - } - else - { - __instance.FrontLayer.sharedMaterial = DestroyableSingleton.Instance.DefaultShader; - if (__instance.BackLayer) - { - __instance.BackLayer.sharedMaterial = DestroyableSingleton.Instance.DefaultShader; - } - } - - var colorId = __instance.matProperties.ColorId; - PlayerMaterial.SetColors(colorId, __instance.FrontLayer); - if (__instance.BackLayer) - { - PlayerMaterial.SetColors(colorId, __instance.BackLayer); - } - - __instance.FrontLayer.material.SetInt(PlayerMaterial.MaskLayer, __instance.matProperties.MaskLayer); - if (__instance.BackLayer) - { - __instance.BackLayer.material.SetInt(PlayerMaterial.MaskLayer, __instance.matProperties.MaskLayer); - } - - var maskType = __instance.matProperties.MaskType; - switch (maskType) - { - case PlayerMaterial.MaskType.ScrollingUI: - if (__instance.FrontLayer) - { - __instance.FrontLayer.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; - } - - if (__instance.BackLayer) - { - __instance.BackLayer.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; - } - - break; - case PlayerMaterial.MaskType.Exile: - if (__instance.FrontLayer) - { - __instance.FrontLayer.maskInteraction = SpriteMaskInteraction.VisibleOutsideMask; - } - - if (__instance.BackLayer) - { - __instance.BackLayer.maskInteraction = SpriteMaskInteraction.VisibleOutsideMask; - } - - break; - default: - if (__instance.FrontLayer) - { - __instance.FrontLayer.maskInteraction = SpriteMaskInteraction.None; - } - - if (__instance.BackLayer) - { - __instance.BackLayer.maskInteraction = SpriteMaskInteraction.None; - } - - break; - } - - if (__instance.matProperties.MaskLayer > 0) return false; - PlayerMaterial.SetMaskLayerBasedOnLocalPlayer(__instance.FrontLayer, __instance.matProperties.IsLocalPlayer); - if (!__instance.BackLayer) return false; - PlayerMaterial.SetMaskLayerBasedOnLocalPlayer(__instance.BackLayer, __instance.matProperties.IsLocalPlayer); - - return false; - } - - [HarmonyPatch(nameof(HatParent.LateUpdate))] - [HarmonyPrefix] - private static bool LateUpdatePrefix(HatParent __instance) - { - if (!__instance.Parent || !__instance.Hat) return false; - if (!__instance.TryGetCached(out var hatViewData)) return true; - if (__instance.FrontLayer.sprite != hatViewData.ClimbImage && - __instance.FrontLayer.sprite != hatViewData.FloorImage) - { - if ((__instance.Hat.InFront || hatViewData.BackImage) && hatViewData.LeftMainImage) - { - __instance.FrontLayer.sprite = - __instance.Parent.flipX ? hatViewData.LeftMainImage : hatViewData.MainImage; - } - - if (hatViewData.BackImage && hatViewData.LeftBackImage) - { - __instance.BackLayer.sprite = - __instance.Parent.flipX ? hatViewData.LeftBackImage : hatViewData.BackImage; - return false; - } - - if (!hatViewData.BackImage && !__instance.Hat.InFront && hatViewData.LeftMainImage) - { - __instance.BackLayer.sprite = - __instance.Parent.flipX ? hatViewData.LeftMainImage : hatViewData.MainImage; - return false; - } - } - else if (__instance.FrontLayer.sprite == hatViewData.ClimbImage || - __instance.FrontLayer.sprite == hatViewData.LeftClimbImage) - { - var spriteAnimNodeSync = __instance.SpriteSyncNode != null - ? __instance.SpriteSyncNode - : __instance.GetComponent(); - if (spriteAnimNodeSync) - { - spriteAnimNodeSync.NodeId = 0; - } - } - - return false; - } - - [HarmonyPatch(nameof(HatParent.SetFloorAnim))] - [HarmonyPrefix] - private static bool SetFloorAnimPrefix(HatParent __instance) - { - if (!__instance.TryGetCached(out var hatViewData)) return true; - __instance.BackLayer.enabled = false; - __instance.FrontLayer.enabled = true; - __instance.FrontLayer.sprite = hatViewData.FloorImage; - return false; - } - - [HarmonyPatch(nameof(HatParent.SetIdleAnim))] - [HarmonyPrefix] - private static bool SetIdleAnimPrefix(HatParent __instance, int colorId) - { - if (!__instance.Hat) return false; - if (!__instance.IsCached()) return true; - __instance.hatDataAsset = null; - __instance.PopulateFromHatViewData(); - __instance.SetMaterialColor(colorId); - return false; - } - - [HarmonyPatch(nameof(HatParent.SetClimbAnim))] - [HarmonyPrefix] - private static bool SetClimbAnimPrefix(HatParent __instance) - { - if (!__instance.TryGetCached(out var hatViewData)) return true; - if (!__instance.options.ShowForClimb) return false; - __instance.BackLayer.enabled = false; - __instance.FrontLayer.enabled = true; - __instance.FrontLayer.sprite = hatViewData.ClimbImage; - return false; - } - - [HarmonyPatch(nameof(HatParent.PopulateFromHatViewData))] - [HarmonyPrefix] - private static bool PopulateFromHatViewDataPrefix(HatParent __instance) - { - if (!__instance.TryGetCached(out var asset)) return true; - __instance.UpdateMaterial(); - - var spriteAnimNodeSync = __instance.SpriteSyncNode - ? __instance.SpriteSyncNode - : __instance.GetComponent(); - if (spriteAnimNodeSync) - { - spriteAnimNodeSync.NodeId = __instance.Hat.NoBounce ? 1 : 0; - } - - if (__instance.Hat.InFront) - { - __instance.BackLayer.enabled = false; - __instance.FrontLayer.enabled = true; - __instance.FrontLayer.sprite = asset.MainImage; - } - else if (asset.BackImage) - { - __instance.BackLayer.enabled = true; - __instance.FrontLayer.enabled = true; - __instance.BackLayer.sprite = asset.BackImage; - __instance.FrontLayer.sprite = asset.MainImage; - } - else - { - __instance.BackLayer.enabled = true; - __instance.FrontLayer.enabled = false; - __instance.FrontLayer.sprite = null; - __instance.BackLayer.sprite = asset.MainImage; - } - - if (!__instance.options.Initialized || !__instance.HideHat()) return false; - __instance.FrontLayer.enabled = false; - __instance.BackLayer.enabled = false; - return false; - } - - private static bool SetCustomHat(HatParent hatParent) - { - if (!DestroyableSingleton.InstanceExists) return true; - var dirPath = Path.Combine(CustomHatManager.HatsDirectory, "Test"); - if (!Directory.Exists(dirPath)) Directory.CreateDirectory(dirPath); - var d = new DirectoryInfo(dirPath); - var filePaths = d.GetFiles("*.png").Select(x => x.FullName).ToArray(); - var hats = CustomHatManager.CreateHatDetailsFromFileNames(filePaths, true); - if (hats.Count <= 0) return false; - try - { - hatParent.Hat = CustomHatManager.CreateHatBehaviour(hats[0], true); - } - catch (Exception err) - { - TheOtherRolesPlugin.Logger.LogWarning($"Unable to create test hat \n{err}"); - return true; - } - - return false; - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Patches/HatsTabPatch.cs b/TheOtherRoles/Modules/CustomHats/Patches/HatsTabPatch.cs deleted file mode 100644 index 8d27dee7..00000000 --- a/TheOtherRoles/Modules/CustomHats/Patches/HatsTabPatch.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using AmongUs.Data; -using TheOtherRoles.Modules.CustomHats.Extensions; -using HarmonyLib; -using TMPro; -using UnityEngine; -using Object = UnityEngine.Object; - -namespace TheOtherRoles.Modules.CustomHats.Patches; - -[HarmonyPatch(typeof(HatsTab))] -internal static class HatsTabPatches -{ - private static TextMeshPro textTemplate; - - [HarmonyPatch(nameof(HatsTab.OnEnable))] - [HarmonyPostfix] - private static void OnEnablePostfix(HatsTab __instance) - { - for (var i = 0; i < __instance.scroller.Inner.childCount; i++) - { - Object.Destroy(__instance.scroller.Inner.GetChild(i).gameObject); - } - - __instance.ColorChips = new Il2CppSystem.Collections.Generic.List(); - var unlockedHats = DestroyableSingleton.Instance.GetUnlockedHats(); - var packages = new Dictionary>>(); - - foreach (var hatBehaviour in unlockedHats) - { - var ext = hatBehaviour.GetHatExtension(); - if (ext != null) - { - if (!packages.ContainsKey(ext.Package)) - { - packages[ext.Package] = new List>(); - } - packages[ext.Package].Add(new Tuple(hatBehaviour, ext)); - } - else - { - if (!packages.ContainsKey(CustomHatManager.InnerslothPackageName)) - { - packages[CustomHatManager.InnerslothPackageName] = new List>(); - } - packages[CustomHatManager.InnerslothPackageName].Add(new Tuple(hatBehaviour, null)); - } - } - - var yOffset = __instance.YStart; - textTemplate = GameObject.Find("HatsGroup").transform.FindChild("Text").GetComponent(); - - var orderedKeys = packages.Keys.OrderBy(x => - x switch - { - CustomHatManager.InnerslothPackageName => 1000, - CustomHatManager.DeveloperPackageName => 0, - _ => 500 - }); - foreach (var key in orderedKeys) - { - var value = packages[key]; - yOffset = CreateHatPackage(value, key, yOffset, __instance); - } - - __instance.scroller.ContentYBounds.max = -(yOffset + 4.1f); - } - - private static float CreateHatPackage(List> hats, string packageName, float yStart, - HatsTab hatsTab) - { - var isDefaultPackage = CustomHatManager.InnerslothPackageName == packageName; - if (!isDefaultPackage) - { - hats = hats.OrderBy(x => x.Item1.name).ToList(); - } - - var offset = yStart; - if (textTemplate != null) - { - var title = Object.Instantiate(textTemplate, hatsTab.scroller.Inner); - title.transform.localPosition = new Vector3(2.25f, yStart, -1f); - title.transform.localScale = Vector3.one * 1.5f; - title.fontSize *= 0.5f; - title.enableAutoSizing = false; - hatsTab.StartCoroutine(Effects.Lerp(0.1f, new Action(p => { title.SetText(packageName); }))); - offset -= 0.8f * hatsTab.YOffset; - } - - for (var i = 0; i < hats.Count; i++) - { - var (hat, ext) = hats[i]; - var xPos = hatsTab.XRange.Lerp(i % hatsTab.NumPerRow / (hatsTab.NumPerRow - 1f)); - var yPos = offset - i / hatsTab.NumPerRow * (isDefaultPackage ? 1f : 1.5f) * hatsTab.YOffset; - var colorChip = Object.Instantiate(hatsTab.ColorTabPrefab, hatsTab.scroller.Inner); - if (ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard) - { - colorChip.Button.OnMouseOver.AddListener((Action)(() => hatsTab.SelectHat(hat))); - colorChip.Button.OnMouseOut.AddListener((Action)(() => hatsTab.SelectHat(DestroyableSingleton.Instance.GetHatById(DataManager.Player.Customization.Hat)))); - colorChip.Button.OnClick.AddListener((Action)hatsTab.ClickEquip); - } - else - { - colorChip.Button.OnClick.AddListener((Action)(() => hatsTab.SelectHat(hat))); - } - colorChip.Button.ClickMask = hatsTab.scroller.Hitbox; - colorChip.Inner.SetMaskType(PlayerMaterial.MaskType.ScrollingUI); - hatsTab.UpdateMaterials(colorChip.Inner.FrontLayer, hat); - var background = colorChip.transform.FindChild("Background"); - var foreground = colorChip.transform.FindChild("ForeGround"); - - if (ext != null) - { - if (background != null) - { - background.localPosition = Vector3.down * 0.243f; - background.localScale = new Vector3(background.localScale.x, 0.8f, background.localScale.y); - } - if (foreground != null) - { - foreground.localPosition = Vector3.down * 0.243f; - } - - if (textTemplate != null) - { - var description = Object.Instantiate(textTemplate, colorChip.transform); - description.transform.localPosition = new Vector3(0f, -0.65f, -1f); - description.alignment = TextAlignmentOptions.Center; - description.transform.localScale = Vector3.one * 0.65f; - hatsTab.StartCoroutine(Effects.Lerp(0.1f, new Action(p => { description.SetText($"{hat.name}\nby {ext.Author}"); }))); - } - } - - colorChip.transform.localPosition = new Vector3(xPos, yPos, -1f); - colorChip.Inner.SetHat(hat, hatsTab.HasLocalPlayer() ? PlayerControl.LocalPlayer.Data.DefaultOutfit.ColorId : DataManager.Player.Customization.Color); - colorChip.Inner.transform.localPosition = hat.ChipOffset; - colorChip.Tag = hat; - colorChip.SelectionHighlight.gameObject.SetActive(false); - hatsTab.ColorChips.Add(colorChip); - } - - return offset - (hats.Count - 1) / hatsTab.NumPerRow * (isDefaultPackage ? 1f : 1.5f) * hatsTab.YOffset - - 1.75f; - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomHats/Patches/PlayerPhysicsPatch.cs b/TheOtherRoles/Modules/CustomHats/Patches/PlayerPhysicsPatch.cs deleted file mode 100644 index 4aa64725..00000000 --- a/TheOtherRoles/Modules/CustomHats/Patches/PlayerPhysicsPatch.cs +++ /dev/null @@ -1,44 +0,0 @@ -using TheOtherRoles.Modules.CustomHats.Extensions; -using HarmonyLib; -namespace TheOtherRoles.Modules.CustomHats.Patches; - -[HarmonyPatch(typeof(PlayerPhysics))] -internal static class PlayerPhysicsPatches -{ - [HarmonyPatch(nameof(PlayerPhysics.HandleAnimation))] - [HarmonyPostfix] - private static void HandleAnimationPostfix(PlayerPhysics __instance) - { - var currentAnimation = __instance.Animations.Animator.GetCurrentAnimation(); - if (currentAnimation == __instance.Animations.group.ClimbUpAnim) return; - if (currentAnimation == __instance.Animations.group.ClimbDownAnim) return; - var hatParent = __instance.myPlayer.cosmetics.hat; - if (hatParent == null || hatParent == null) return; - if (!hatParent.TryGetCached(out var viewData)) return; - var extend = hatParent.Hat.GetHatExtension(); - if (extend == null) return; - if (extend.FlipImage != null) - { - if (__instance.FlipX) - { - hatParent.FrontLayer.sprite = extend.FlipImage; - } - else - { - hatParent.FrontLayer.sprite = viewData.MainImage; - } - } - - if (extend.BackFlipImage != null) - { - if (__instance.FlipX) - { - hatParent.FrontLayer.sprite = extend.FlipImage; - } - else - { - hatParent.BackLayer.sprite = viewData.BackImage; - } - } - } -} \ No newline at end of file diff --git a/TheOtherRoles/Modules/CustomOptions.cs b/TheOtherRoles/Modules/CustomOptions.cs index 8eedac52..f0451491 100644 --- a/TheOtherRoles/Modules/CustomOptions.cs +++ b/TheOtherRoles/Modules/CustomOptions.cs @@ -31,7 +31,7 @@ public enum CustomOptionType { HideNSeekRoles } - public static List options = new List(); + public static List options = new(); public static int preset = 0; public static ConfigEntry vanillaSettings; @@ -248,8 +248,8 @@ public void updateSelection(int newSelection, bool notifyUsers = true) { } public static byte[] serializeOptions() { - using (MemoryStream memoryStream = new MemoryStream()) { - using (BinaryWriter binaryWriter = new BinaryWriter(memoryStream)) { + using (MemoryStream memoryStream = new()) { + using (BinaryWriter binaryWriter = new(memoryStream)) { int lastId = -1; foreach (var option in CustomOption.options.OrderBy(x => x.id)) { if (option.id == 0) continue; @@ -267,7 +267,7 @@ public static byte[] serializeOptions() { } public static int deserializeOptions(byte[] inputValues) { - BinaryReader reader = new BinaryReader(new MemoryStream(inputValues)); + BinaryReader reader = new(new MemoryStream(inputValues)); int lastId = -1; bool somethingApplied = false; int errors = 0; @@ -696,7 +696,7 @@ void OnEnable() if (MyPicker.MaxPlayersRoot) { - //ǰΥܥ + //以前のボタンを削除する MyPicker.optionsMenu.ControllerSelectable.Clear(); MyPicker.MaxPlayerButtons.Clear(); @@ -720,7 +720,7 @@ void OnEnable() subMenu.transform.localPosition = new(1.11f, isCustomServer ? -0.4f : 0f, 0f); subMenu.GetComponent().enabled = false; - //4ϤΥץϥॵ`Щ`Τʹÿ + //4人以上のオプションはカスタムサーバーのみ使用可能 for (int i = 4; i <= 6; i++) MyPicker.ImpostorButtons[i - 1].gameObject.SetActive(isCustomServer); var options = MyPicker.GetTargetOptions(); @@ -739,7 +739,7 @@ class CreateGameOptionsShowPatch { public static bool Prefix(CreateOptionsPicker __instance) { - //NOL24˷֤ޤФ + //各種設定の配列長を24人分まで伸ばす NormalGameOptionsV07.MaxImpostors = NormalGameOptionsV08.MaxImpostors = new int[] { 0, 0, 0, 0, 1, 1, @@ -768,7 +768,7 @@ public static bool Prefix(CreateOptionsPicker __instance) 4, 4, 7, 9, 13, 15, 18 }; - //``ɤϥΩ`ޥ̶ + //ゲームモードはノーマル固定 DataManager.Settings.Multiplayer.LastPlayedGameMode = AmongUs.GameOptions.GameModes.Normal; DataManager.Settings.Save(); GameOptionsManager.Instance.SwitchGameMode(AmongUs.GameOptions.GameModes.Normal); @@ -1110,12 +1110,12 @@ public static string buildModifierExtras(CustomOption customOption) { } private static string buildOptionsOfType(CustomOption.CustomOptionType type, bool headerOnly) { - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new("\n"); var options = CustomOption.options.Where(o => o.type == type); if (TORMapOptions.gameMode == CustomGamemodes.Guesser) { if (type == CustomOption.CustomOptionType.General) options = CustomOption.options.Where(o => o.type == type || o.type == CustomOption.CustomOptionType.Guesser); - List remove = new List{ 308, 310, 311, 312, 313, 314, 315, 316, 317, 318 }; + List remove = new() { 308, 310, 311, 312, 313, 314, 315, 316, 317, 318 }; options = options.Where(x => !remove.Contains(x.id)); } else if (TORMapOptions.gameMode == CustomGamemodes.Classic) options = options.Where(x => !(x.type == CustomOption.CustomOptionType.Guesser || x == CustomOptionHolder.crewmateRolesFill)); @@ -1403,13 +1403,16 @@ public static void Postfix(HudManager __instance) { toggleZoomButton.OnClick.RemoveAllListeners(); toggleZoomButton.OnClick.AddListener((Action)(() => Helpers.toggleZoom())); } - var (playerCompleted, playerTotal) = TasksHandler.taskInfo(CachedPlayer.LocalPlayer.Data); - int numberOfLeftTasks = playerTotal - playerCompleted; - bool zoomButtonActive = !(CachedPlayer.LocalPlayer.PlayerControl == null || !CachedPlayer.LocalPlayer.Data.IsDead || (CachedPlayer.LocalPlayer.PlayerControl == Busker.busker && Busker.pseudocideFlag)); - zoomButtonActive &= numberOfLeftTasks <= 0 || !CustomOptionHolder.finishTasksBeforeHauntingOrZoomingOut.getBool(); - toggleZoomButtonObject.SetActive(zoomButtonActive); - var posOffset = Helpers.zoomOutStatus ? new Vector3(-1.27f, -7.92f, -52f) : new Vector3(0, -1.6f, -52f); - toggleZoomButtonObject.transform.localPosition = HudManager.Instance.MapButton.transform.localPosition + posOffset; + if (CachedPlayer.LocalPlayer != null && CachedPlayer.LocalPlayer.PlayerControl != null) + { + var (playerCompleted, playerTotal) = TasksHandler.taskInfo(CachedPlayer.LocalPlayer.Data); + int numberOfLeftTasks = playerTotal - playerCompleted; + bool zoomButtonActive = !(CachedPlayer.LocalPlayer.PlayerControl == null || !CachedPlayer.LocalPlayer.Data.IsDead || (CachedPlayer.LocalPlayer.PlayerControl == Busker.busker && Busker.pseudocideFlag)); + zoomButtonActive &= numberOfLeftTasks <= 0 || !CustomOptionHolder.finishTasksBeforeHauntingOrZoomingOut.getBool(); + toggleZoomButtonObject.SetActive(zoomButtonActive); + var posOffset = Helpers.zoomOutStatus ? new Vector3(-1.27f, -7.92f, -52f) : new Vector3(0, -1.6f, -52f); + toggleZoomButtonObject.transform.localPosition = HudManager.Instance.MapButton.transform.localPosition + posOffset; + } } } } diff --git a/TheOtherRoles/Modules/GameStatistics.cs b/TheOtherRoles/Modules/GameStatistics.cs index d2cab627..3a326ad0 100644 --- a/TheOtherRoles/Modules/GameStatistics.cs +++ b/TheOtherRoles/Modules/GameStatistics.cs @@ -477,7 +477,7 @@ public void Update() } private const float LineHalfWidth = 2.5f; - public static readonly Color MainColor = new Color(0f, 242f / 255f, 156f / 255f); + public static readonly Color MainColor = new(0f, 242f / 255f, 156f / 255f); private const float BackColorRate = 0.4f; private IEnumerator CoShowCriticalMoment(float p, int indexMin, int indexMax) diff --git a/TheOtherRoles/Objects/Arrow.cs b/TheOtherRoles/Objects/Arrow.cs index e10e8a65..d0077bb5 100644 --- a/TheOtherRoles/Objects/Arrow.cs +++ b/TheOtherRoles/Objects/Arrow.cs @@ -41,5 +41,42 @@ public void Update(Vector3 target, Color? color = null) arrowBehaviour.target = target; arrowBehaviour.Update(); } + + public static void UpdateProximity(Vector3 position) + { + if (!GameManager.Instance.GameHasStarted) return; + + if (Tracker.DangerMeterParent == null) + { + Tracker.DangerMeterParent = GameObject.Instantiate(GameObject.Find("ImpostorDetector"), HudManager.Instance.transform); + Tracker.Meter = Tracker.DangerMeterParent.transform.GetChild(0).GetComponent(); + Tracker.DangerMeterParent.transform.localPosition = new(3.7f, -1.6f, 0); + var backgroundrend = Tracker.DangerMeterParent.transform.GetChild(0).GetChild(0).GetComponent(); + backgroundrend.color = backgroundrend.color.SetAlpha(0.5f); + } + Tracker.DangerMeterParent.SetActive(MeetingHud.Instance == null && LobbyBehaviour.Instance == null && !Tracker.tracker.Data.IsDead && Tracker.tracked != null); + Tracker.Meter.gameObject.SetActive(MeetingHud.Instance == null && LobbyBehaviour.Instance == null && !Tracker.tracker.Data.IsDead && Tracker.tracked != null); + if (Tracker.tracker.Data.IsDead) return; + if (Tracker.tracked == null) + { + Tracker.Meter.SetDangerValue(0, 0); + return; + } + if (Tracker.DangerMeterParent.transform.localPosition.x != 3.7f) Tracker.DangerMeterParent.transform.localPosition = new(3.7f, -1.6f, 0); + float num = float.MaxValue; + float dangerLevel1; + float dangerLevel2; + + float sqrMagnitude = (position - Tracker.tracker.transform.position).sqrMagnitude; + if (sqrMagnitude < (55 * GameOptionsManager.Instance.currentNormalGameOptions.PlayerSpeedMod) && num > sqrMagnitude) + { + num = sqrMagnitude; + } + + dangerLevel1 = Mathf.Clamp01((55 - num) / (55 - 15 * GameOptionsManager.Instance.currentNormalGameOptions.PlayerSpeedMod)); + dangerLevel2 = Mathf.Clamp01((15 - num) / (15 * GameOptionsManager.Instance.currentNormalGameOptions.PlayerSpeedMod)); + + Tracker.Meter.SetDangerValue(dangerLevel1, dangerLevel2); + } } } \ No newline at end of file diff --git a/TheOtherRoles/Objects/Bloodytrail.cs b/TheOtherRoles/Objects/Bloodytrail.cs index b3af38f3..b15b031e 100644 --- a/TheOtherRoles/Objects/Bloodytrail.cs +++ b/TheOtherRoles/Objects/Bloodytrail.cs @@ -6,8 +6,8 @@ namespace TheOtherRoles.Objects { class Bloodytrail { - private static List bloodytrail = new List(); - private static List sprites = new List(); + private static List bloodytrail = new(); + private static List sprites = new(); private Color color; private GameObject blood; private SpriteRenderer spriteRenderer; @@ -27,7 +27,7 @@ public Bloodytrail(PlayerControl player, PlayerControl bloodyPlayer) { blood = new GameObject("Blood" + index); - Vector3 position = new Vector3(player.transform.position.x, player.transform.position.y, player.transform.position.y / 1000 + 0.001f); + Vector3 position = new(player.transform.position.x, player.transform.position.y, player.transform.position.y / 1000 + 0.001f); blood.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover); blood.transform.position = position; blood.transform.localPosition = position; diff --git a/TheOtherRoles/Objects/CustomButton.cs b/TheOtherRoles/Objects/CustomButton.cs index 2e054d42..f3131967 100644 --- a/TheOtherRoles/Objects/CustomButton.cs +++ b/TheOtherRoles/Objects/CustomButton.cs @@ -1,6 +1,7 @@ using Il2CppSystem.Runtime.ExceptionServices; using System; using System.Collections.Generic; +using TheOtherRoles.Modules; using TheOtherRoles.Players; using TMPro; using UnityEngine; @@ -9,7 +10,7 @@ namespace TheOtherRoles.Objects { public class CustomButton { - public static List buttons = new List(); + public static List buttons = new(); public ActionButton actionButton; public Vector3 LocalScale = Vector3.one; public GameObject actionButtonGameObject; @@ -36,20 +37,22 @@ public class CustomButton { public bool mirror; public KeyCode? hotkey; public string buttonText = ""; + public string actionName = ""; + public bool shakeOnEnd = true; public bool isHandcuffed = false; private static readonly int Desat = Shader.PropertyToID("_Desat"); public static class ButtonPositions { - public static readonly Vector3 lowerRowRight = new Vector3(-2f, -0.06f, 0); // Not usable for imps beacuse of new button positions! - public static readonly Vector3 lowerRowCenter = new Vector3(-3f, -0.06f, 0); - public static readonly Vector3 lowerRowLeft = new Vector3(-4f, -0.06f, 0); - public static readonly Vector3 upperRowRight = new Vector3(0f, 1f, 0f); // Not usable for imps beacuse of new button positions! - public static readonly Vector3 upperRowCenter = new Vector3(-1f, 1f, 0f); // Not usable for imps beacuse of new button positions! - public static readonly Vector3 upperRowLeft = new Vector3(-2f, 1f, 0f); - public static readonly Vector3 upperRowFarLeft = new Vector3(-3f, 1f, 0f); + public static readonly Vector3 lowerRowRight = new(-2f, -0.06f, 0); // Not usable for imps beacuse of new button positions! + public static readonly Vector3 lowerRowCenter = new(-3f, -0.06f, 0); + public static readonly Vector3 lowerRowLeft = new(-4f, -0.06f, 0); + public static readonly Vector3 upperRowRight = new(0f, 1f, 0f); // Not usable for imps beacuse of new button positions! + public static readonly Vector3 upperRowCenter = new(-1f, 1f, 0f); // Not usable for imps beacuse of new button positions! + public static readonly Vector3 upperRowLeft = new(-2f, 1f, 0f); + public static readonly Vector3 upperRowFarLeft = new(-3f, 1f, 0f); } - public CustomButton(Action OnClick, Func HasButton, Func CouldUse, Action OnMeetingEnds, Sprite Sprite, Vector3 PositionOffset, HudManager hudManager, KeyCode? hotkey, bool HasEffect, float EffectDuration, Action OnEffectEnds, bool mirror = false, string buttonText = "", bool abilityTexture = false) + public CustomButton(Action OnClick, Func HasButton, Func CouldUse, Action OnMeetingEnds, Sprite Sprite, Vector3 PositionOffset, HudManager hudManager, KeyCode? hotkey, bool HasEffect, float EffectDuration, Action OnEffectEnds, bool mirror = false, string buttonText = "", bool abilityTexture = false, string actionName = "", bool shakeOnEnd = true) { this.hudManager = hudManager; this.OnClick = OnClick; @@ -65,6 +68,8 @@ public CustomButton(Action OnClick, Func HasButton, Func CouldUse, A this.mirror = mirror; this.hotkey = hotkey; this.buttonText = buttonText; + this.actionName = actionName; + this.shakeOnEnd = shakeOnEnd; Timer = 16.2f; buttons.Add(this); actionButton = UnityEngine.Object.Instantiate(hudManager.KillButton, hudManager.KillButton.transform.parent); @@ -81,16 +86,16 @@ public CustomButton(Action OnClick, Func HasButton, Func CouldUse, A this.showButtonText = (actionButtonRenderer.sprite == Sprite || buttonText != ""); button.OnClick = new Button.ButtonClickedEvent(); button.OnClick.AddListener((UnityEngine.Events.UnityAction)onClickEvent); - + setKeyBind(); setActive(false); } - public CustomButton(Action OnClick, Func HasButton, Func CouldUse, Action OnMeetingEnds, Sprite Sprite, Vector3 PositionOffset, HudManager hudManager, KeyCode? hotkey, bool mirror = false, string buttonText = "", bool abilityTexture = false) - : this(OnClick, HasButton, CouldUse, OnMeetingEnds, Sprite, PositionOffset, hudManager, hotkey, false, 0f, () => {}, mirror, buttonText, abilityTexture) { } + public CustomButton(Action OnClick, Func HasButton, Func CouldUse, Action OnMeetingEnds, Sprite Sprite, Vector3 PositionOffset, HudManager hudManager, KeyCode? hotkey, bool mirror = false, string buttonText = "", bool abilityTexture = false, string actionName = "", bool shakeOnEnd = true) + : this(OnClick, HasButton, CouldUse, OnMeetingEnds, Sprite, PositionOffset, hudManager, hotkey, false, 0f, () => {}, mirror, buttonText, abilityTexture, actionName, shakeOnEnd) { } public void onClickEvent() { - if ((this.Timer < 0f && HasButton() && CouldUse()) || ((this.HasEffect && this.isEffectActive && this.effectCancellable))) + if ((this.Timer < 0f && HasButton() && CouldUse()) || (this.HasEffect && this.isEffectActive && this.effectCancellable && CouldUse())) { actionButtonRenderer.color = new Color(1f, 1f, 1f, 0.3f); this.OnClick(); @@ -219,8 +224,11 @@ public void Update() } if (Timer >= 0) { - if (HasEffect && isEffectActive) + if (HasEffect && isEffectActive) { Timer -= Time.deltaTime; + if (Timer <= 3f && Timer > 0f && shakeOnEnd) + actionButton.graphic.transform.localPosition = actionButton.transform.localPosition + (Vector3)UnityEngine.Random.insideUnitCircle * 0.05f; + } else if (!localPlayer.PlayerControl.inVent && moveable) Timer -= Time.deltaTime; } @@ -246,5 +254,25 @@ public void Update() OnClick = InitialOnClick; } } + + public void setKeyBind() + { + if (hotkey != null && hotkey != KeyCode.None && hotkey != KeyCode.KeypadPlus) + { + actionButtonGameObject.ForEachChild((Il2CppSystem.Action)((c) => { if (c.name.Equals("HotKeyGuide")) GameObject.Destroy(c); })); + ButtonEffect.SetKeyGuide(actionButtonGameObject, (KeyCode)hotkey, action: actionName != "" ? actionName : (showButtonText && buttonText != "" ? buttonText : ModTranslation.getString("buttonsActionButton"))); + } + } + + public void resetKeyBind() + { + bool isVampire = Sprite == Vampire.getButtonSprite(); + if (buttonText == "" && !isVampire) return; // English or something that doesn't require an update, return + // Specify vampire as not to override things with English language + if (actionName == buttonText.camelString() && (buttonText != "" || isVampire)) return; + actionName = buttonText.camelString(); + actionButtonGameObject.ForEachChild((Il2CppSystem.Action)((c) => { if (c.name.Equals("HotKeyGuide")) GameObject.Destroy(c); })); + setKeyBind(); + } } } \ No newline at end of file diff --git a/TheOtherRoles/Objects/CustomMessage.cs b/TheOtherRoles/Objects/CustomMessage.cs index b1b41373..a94acb2e 100644 --- a/TheOtherRoles/Objects/CustomMessage.cs +++ b/TheOtherRoles/Objects/CustomMessage.cs @@ -8,7 +8,7 @@ namespace TheOtherRoles.Objects { public class CustomMessage { private TMPro.TMP_Text text; - private static List customMessages = new List(); + private static List customMessages = new(); public CustomMessage(string message, float duration) { RoomTracker roomTracker = FastDestroyableSingleton.Instance?.roomTracker; diff --git a/TheOtherRoles/Objects/Footprint.cs b/TheOtherRoles/Objects/Footprint.cs index 5c85a3ba..9b7782cf 100644 --- a/TheOtherRoles/Objects/Footprint.cs +++ b/TheOtherRoles/Objects/Footprint.cs @@ -37,7 +37,7 @@ private class Footprint public Transform Transform; public SpriteRenderer Renderer; public PlayerControl Owner; - public GameData.PlayerInfo Data; + public NetworkedPlayerInfo Data; public float Lifetime; public Footprint() diff --git a/TheOtherRoles/Objects/FungleElectrical.cs b/TheOtherRoles/Objects/FungleElectrical.cs index 94e31731..aa250fdf 100644 --- a/TheOtherRoles/Objects/FungleElectrical.cs +++ b/TheOtherRoles/Objects/FungleElectrical.cs @@ -8,6 +8,7 @@ using UnityEngine.ResourceManagement.AsyncOperations; using System.Collections; using BepInEx.Unity.IL2CPP.Utils.Collections; +using TheOtherRoles.MetaContext; namespace TheOtherRoles.Objects { @@ -94,7 +95,7 @@ public static IEnumerator LoadMaps() } } - [HarmonyPatch(typeof(AmongUsClient), "Awake")] + [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.Awake))] public static class AmongUsClientAwakePatch { private static bool Loaded; @@ -105,6 +106,7 @@ public static void Prefix(AmongUsClient __instance) return; Loaded = true; __instance.StartCoroutine(BepInEx.Unity.IL2CPP.Utils.Collections.CollectionExtensions.WrapToIl2Cpp(MapLoader.LoadMaps())); + VanillaAsset.LoadAssetsOnTitle(); } } } \ No newline at end of file diff --git a/TheOtherRoles/Objects/Garlic.cs b/TheOtherRoles/Objects/Garlic.cs index bc7d5aa7..481d4434 100644 --- a/TheOtherRoles/Objects/Garlic.cs +++ b/TheOtherRoles/Objects/Garlic.cs @@ -3,7 +3,7 @@ namespace TheOtherRoles.Objects { class Garlic { - public static List garlics = new List(); + public static List garlics = new(); public GameObject garlic; private GameObject background; @@ -27,7 +27,7 @@ public Garlic(Vector2 p) { garlic.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover); background = new GameObject("Background"){layer = 11}; background.transform.SetParent(garlic.transform); - Vector3 position = new Vector3(p.x, p.y, p.y / 1000 + 0.001f); // just behind player + Vector3 position = new(p.x, p.y, p.y / 1000 + 0.001f); // just behind player garlic.transform.position = position; background.transform.localPosition = new Vector3(0 , 0, -1f); // before player diff --git a/TheOtherRoles/Objects/JackInTheBox.cs b/TheOtherRoles/Objects/JackInTheBox.cs index 58f94b3b..29162267 100644 --- a/TheOtherRoles/Objects/JackInTheBox.cs +++ b/TheOtherRoles/Objects/JackInTheBox.cs @@ -9,7 +9,7 @@ namespace TheOtherRoles.Objects { public class JackInTheBox { - public static System.Collections.Generic.List AllJackInTheBoxes = new System.Collections.Generic.List(); + public static System.Collections.Generic.List AllJackInTheBoxes = new(); public static int JackInTheBoxLimit = 3; public static bool boxesConvertedToVents = false; public static Sprite[] boxAnimationSprites = new Sprite[18]; @@ -42,7 +42,7 @@ public static void startAnimation(int ventId) { public JackInTheBox(Vector2 p) { gameObject = new GameObject("JackInTheBox"){layer = 11}; gameObject.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover); - Vector3 position = new Vector3(p.x, p.y, p.y/1000f + 0.01f); + Vector3 position = new(p.x, p.y, p.y/1000f + 0.01f); position += (Vector3)CachedPlayer.LocalPlayer.PlayerControl.Collider.offset; // Add collider offset that DoMove moves the player up at a valid position // Create the marker gameObject.transform.position = position; diff --git a/TheOtherRoles/Objects/MapData.cs b/TheOtherRoles/Objects/MapData.cs new file mode 100644 index 00000000..241844b1 --- /dev/null +++ b/TheOtherRoles/Objects/MapData.cs @@ -0,0 +1,292 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +namespace TheOtherRoles.Objects +{ + public abstract class MapData + { + abstract protected Vector2[] MapArea { get; } + + public bool CheckMapArea(Vector2 position) + { + int num = Physics2D.OverlapCircleNonAlloc(position, 0.23f, PhysicsHelpers.colliderHits, Constants.ShipAndAllObjectsMask); + if (num > 0) for (int i = 0; i < num; i++) if (!PhysicsHelpers.colliderHits[i].isTrigger) return false; + + return CheckMapAreaInternal(position); + } + + public bool CheckMapAreaInternal(Vector2 position) + { + Vector2 vector; + float magnitude; + + foreach (Vector2 p in MapArea) + { + vector = p - position; + magnitude = vector.magnitude; + if (magnitude > 12.0f) continue; + + if (!PhysicsHelpers.AnyNonTriggersBetween(position, vector.normalized, magnitude, Constants.ShipAndAllObjectsMask)) return true; + } + + return false; + } + + static private MapData[] AllMapData = new MapData[] { new SkeldData(), new MiraData(), new PolusData(), null!, new AirshipData(), new FungleData() }; + static public MapData GetCurrentMapData() => AllMapData[GameOptionsManager.Instance.CurrentGameOptions.MapId]; + } + + public class FungleData : MapData + { + static private Vector2[] MapPositions = new Vector2[] + { + //ドロップシップ + new(-9.2f,13.4f), + //カフェテリア + new(-19.1f, 7.0f),new(-13.6f,5.0f),new(-20.5f,6.0f), + //カフェ下 + new(-12.9f,2.3f),new(-21.7f,2.41f), + //スプラッシュゾーン + new(-20.2f,-0.3f),new(-19.8f,-2.1f),new(-16.1f,-0.1f),new(-15.6f,-1.8f), + //キャンプファイア周辺 + new(-11.3f,2.0f),new(-0.83f,2.4f),new(-9.4f,0.2f),new(-6.9f,0.2f), + //スプラッシュゾーン下 + new(-17.3f,-4.5f), + //キッチン + new(-15.4f,-9.5f),new(-17.4f,-7.5f), + //キッチン・ジャングル間通路 + new(-11.2f,-6.1f),new(-5.5f,-14.8f), + //ミーティング上 + new(-2.8f,2.2f),new(2.2f,1.0f), + //ストレージ + new(-0.6f,4.2f),new(2.3f,6.2f),new(3.3f,6.7f), + //ミーティング・ドーム + new(-0.15f,-1.77f),new(-4.65f,1.58f),new(-4.8f,-1.44f), + //ラボ + new(-7.1f,-11.9f),new(-4.5f,-6.8f),new(-3.3f,-8.9f),new(-5.4f,-10.2f), + //ジャングル(左) + new(-1.44f,-13.3f),new(3.8f,-12.5f), + //ジャングル(中) + new(7.08f,-15.3f),new(11.6f,-14.3f), + //ジャングル(上) + new(2.7f,-6.0f),new(12.1f,-7.3f), + //グリーンハウス・ジャングル + new(13.6f,-12.1f),new(6.4f,-10f), + //ジャングル(右) + new(15.0f,-6.7f),new(18.1f,-9.1f), + //ジャングル(下) + new(14.9f,-16.3f), + //リアクター + new(21.1f,-6.7f), + //高台 + new(15.9f,0.4f),new(15.6f,4.3f),new(19.2f,1.78f), + //鉱山 + new(12.5f,7.7f),new(13.4f,9.7f), + //ルックアウト + new(6.6f,3.8f),new(8.7f,1f), + //梯子中間 + new(20.1f,7.2f), + //コミュ + new(20.9f,10.8f),new(24.1f,13.2f),new(17.9f,12.7f), + }; + + protected override Vector2[] MapArea => MapPositions; + } + + public class AirshipData : MapData + { + static private Vector2[] MapPositions = new Vector2[] + { + //金庫 + new(-9f, 12.8f), new(-8.7f, 4.9f), new(-12.8f, 8.7f), new(-4.8f, 8.7f), new(-7.1f, 6.8f), new(-10.4f, 6.9f), new(-7f, 10.2f), + //宿舎前 + new(-0.5f, 8.5f), + //エンジン上 + new(-0.4f, 5f), + //エンジン + new(0f, -1.4f), new(3.6f, 0.1f), new(0.4f, -2.5f), new(-6.9f, 1.1f), + //コミュ前 + new(-11f, -1f), + //コミュ + new(-12.3f, 0.9f), + //コックピット + new(-19.9f, -2.6f), new(-19.9f, 0.5f), + //武器庫 + new(-14.5f, -3.6f), new(-9.9f, -6f), new(-15f, -9.4f), + //キッチン + new(-7.5f, -7.5f), new(-7f, -12.8f), new(-2.5f, -11.2f), new(-3.9f, -9.3f), + //左展望 + new(-13.8f, -11.8f), + //セキュ + new(7.3f, -12.3f), new(5.8f, -10.6f), + //右展望 + new(10.3f, -15f), + //エレク + new(10.5f, -8.5f), + //エレクの9部屋 + new(10.5f, -6.3f), new(13.5f, -6.3f), new(16.5f, -6.3f), new(19.4f, -6.3f), new(13.5f, -8.8f), new(16.5f, -8.8f), new(19.4f, -8.8f), new(16.5f, -11f), new(19.4f, -11f), + //エレク右上 + new(19.4f, -4.2f), + //メディカル + new(25.2f, -9.8f), new(22.9f, -6f), new(25.2f, -9.8f), new(29.5f, -6.3f), + //貨物 + new(31.8f, -3.3f), new(34f, 1.4f), new(39f, -0.9f), new(37.6f, -3.4f), new(32.8f, 3.6f), new(35.3f, 3.6f), + //ロミジュリ右 + new(29.8f, -1.5f), + //ラウンジ + new(33.7f, 7.1f), new(32.4f, 7.1f), new(30.9f, 7.1f), new(29.2f, 7.1f), new(30.8f, 5.3f), new(24.9f, 4.9f), new(27.1f, 7.3f), + //レコード + new(22.3f, 9.1f), new(20f, 11.5f), new(17.6f, 9.4f), new(20.1f, 6.6f), + //ギャップ右 + new(15.4f, 9.2f), new(11.2f, 8.5f), new(12.6f, 6.2f), + //シャワー/ロミジュリ左 + new(18.9f, 4.5f), new(17.2f, 5.2f), new(18.5f, 0f), new(21.2f, -2f), new(24f, 0.7f), new(22.3f, 2.5f), + //メインホール + new(10.8f, 0f), new(14.8f, 1.9f), new(11.8f, 1.8f), new(9.7f, 2.5f), new(6.2f, 2.4f), new(6.6f, -3f), new(12.7f, -2.9f), + //ギャップ左 + new(3.8f, 8.8f), + //ミーティング + new(6.5f, 15.3f), new(11.8f, 14.1f), new(11.8f, 16f), new(16.3f, 15.2f), + }; + + protected override Vector2[] MapArea => MapPositions; + } + + public class PolusData : MapData + { + static private Vector2[] MapPositions = new Vector2[] + { + //ドロップシップ + new(16.7f, -2.6f), + //ドロップシップ下 + new(14.1f, -10f), new(22.0f, -7.1f), + //エレクトリカル + new(7.5f, -9.7f), new(3.1f, -11.7f), new(5.4f, -11.5f), new(9.6f, -12.1f), + //O2 + new(4.7f, -19f), new(2.4f, -17f), new(3.1f, -21.7f), new(1.9f, -19.4f), new(2.4f, -23.6f), new(6.3f, -21.3f), + //Elec,O2,Comm周辺外 + new(7.9f, -23.6f), new(9.4f, -20.1f), new(8.2f, -16.0f), new(8.0f, -14.3f), new(13.4f, -13f), + //左上リアクター前通路 + new(10.3f, -7.4f), + //左上リアクター + new(4.6f, -5f), + //Comm + new(11.4f, -15.9f), new(11.7f, -17.3f), + //Weapons + new(13f, -23.5f), + //Storage + new(19.4f, -11.2f), + //オフィス左下 + new(18f, -24.5f), + //オフィス + new(18.6f, -21.5f), new(20.2f, -19.2f), new(19.6f, -17.6f), new(19.6f, -16.4f), new(26.5f, -17.4f), + //アドミン + new(20f, -22.5f), new(21.4f, -25.2f), new(22.4f, -22.6f), new(25f, -20.8f), + //デコン（左） + new(24.1f, -24.7f), + //スペシメン左通路 + new(27.7f, -24.7f), new(33f, -20.6f), + //スペシメン + new(36.8f, -21.6f), new(36.5f, -19.3f), + //スペシメン右通路 + new(39.2f, -15.2f), + //デコン(上) + new(39.8f, -10f), + //ラボ + new(34.7f, -10.2f), new(36.4f, -8f), new(40.5f, -7.6f), new(34.5f, -6.2f), new(31.2f, -7.6f), new(28.4f, -9.6f), new(26.5f, -7f), new(26.5f, -8.3f), + //右リアクター + new(24.2f, -4.5f), + //ストレージ・ラボ下・オフィス右 + new(24f, -14.6f), new(26f, -12.2f), new(29.8f, -15.7f) + }; + + protected override Vector2[] MapArea => MapPositions; + } + + public class MiraData : MapData + { + static private Vector2[] MapPositions = new Vector2[] + { + //ラウンチパッド + new(-4.4f, 3.3f), + //ランチパッド下通路 + new(3.7f, -1.7f), + //メッドベイ + new(15.2f, 0.4f), + //コミュ + new(14f, 4f), + //三叉路 + new(12.3f, 6.7f), new(23.6f, 6.8f), + //ロッカー + new(9f, 5f), new(8.4f, 1.4f), + //デコン + new(6.0f, 5.6f), + //デコン上通路 + new(6.0f, 11.6f), + //リアクター + new(2.5f, 10.3f), new(2.5f, 13f), + //ラボラトリ + new(7.6f, 13.9f), new(9.7f, 10.4f), new(10.7f, 12.2f), + //カフェ + new(21.8f, 5f), new(10.7f, 12.2f), new(28.3f, 0.2f), new(25.5f, 2.3f), new(22.1f, 2.6f), + //ストレージ + new(19.2f, 1.7f), new(18.5f, 4.2f), + //バルコニー + new(18.3f, -3.2f), new(23.7f, -1.9f), + //三叉路上通路 + new(17.8f, 19f), + //オフィス + new(15.7f, 17.2f), new(13.7f, 20.4f), new(13.6f, 18.7f), + //アドミン + new(20.6f, 20.8f), new(22.3f, 18.6f), new(21.2f, 17.3f), new(19.4f, 17.6f), + //グリーンハウス + new(13.2f, 22.3f), new(22.4f, 23.3f), new(20.2f, 24.3f), new(16.5f, 24.4f), new(20.7f, 22.2f), new(18f, 25.3f), + }; + + protected override Vector2[] MapArea => MapPositions; + } + + public class SkeldData : MapData + { + static private Vector2[] MapPositions = new Vector2[] + { + //カフェ + new(0f, 5.3f), new(-5.2f, 1.2f), new(-0.9f, -3.1f), new(4.6f, 1.2f), + //ウェポン + new(10.1f, 3f), + //コの字通路/O2 + new(9.6f, -3.4f), new(11.8f, -6.5f), + //ナビ + new(16.7f, -4.8f), + //シールド + new(9.3f, -10.3f), new(9.5f, -14.1f), + //コミュ上 + new(5.2f, -12.2f), + //コミュ + new(3.8f, -15.4f), + //ストレージ + new(-0.3f, -9.8f), new(-0.28f, -16.4f), new(-4.5f, -14.3f), + //エレク + new(-9.6f, -11.3f), new(-7.5f, -8.4f), + //ロアエンジン右 + new(-12.1f, -11.4f), + //ロアエンジン + new(-15.4f, -13.1f), new(-16.8f, -9.8f), + //アッパーエンジン + new(-16.8f, -1f), new(-15.2f, 2.4f), + //セキュ + new(-13.8f, -4.5f), + //リアクター + new(-20.9f, -5.4f), + //メッドベイ + new(-7.3f, -4.6f), new(-9.2f, -2.1f), + //アドミン + new(2.6f, -7.1f), new(6.3f, -9.5f) + }; + protected override Vector2[] MapArea => MapPositions; + } +} diff --git a/TheOtherRoles/Objects/NinjaTrace.cs b/TheOtherRoles/Objects/NinjaTrace.cs index f3bdd13e..de127b17 100644 --- a/TheOtherRoles/Objects/NinjaTrace.cs +++ b/TheOtherRoles/Objects/NinjaTrace.cs @@ -5,7 +5,7 @@ namespace TheOtherRoles.Objects { class AssassinTrace { - public static List traces = new List(); + public static List traces = new(); private GameObject trace; private float timeRemaining; @@ -21,7 +21,7 @@ public AssassinTrace(Vector2 p, float duration=1f) { trace = new GameObject("AssassinTrace"); trace.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover); //Vector3 position = new Vector3(p.x, p.y, CachedPlayer.LocalPlayer.transform.localPosition.z + 0.001f); // just behind player - Vector3 position = new Vector3(p.x, p.y, p.y / 1000f + 0.01f); + Vector3 position = new(p.x, p.y, p.y / 1000f + 0.01f); trace.transform.position = position; trace.transform.localPosition = position; diff --git a/TheOtherRoles/Objects/Portal.cs b/TheOtherRoles/Objects/Portal.cs index 277fa782..132fd611 100644 --- a/TheOtherRoles/Objects/Portal.cs +++ b/TheOtherRoles/Objects/Portal.cs @@ -87,7 +87,7 @@ public Portal(Vector2 p) { portalGameObject = new GameObject("Portal"){ layer = 11 }; //Vector3 position = new Vector3(p.x, p.y, CachedPlayer.LocalPlayer.transform.position.z + 1f); - Vector3 position = new Vector3(p.x, p.y, p.y / 1000f + 0.01f); + Vector3 position = new(p.x, p.y, p.y / 1000f + 0.01f); // Create the portal portalGameObject.transform.position = position; @@ -95,7 +95,7 @@ public Portal(Vector2 p) portalRenderer = portalGameObject.AddComponent(); portalRenderer.sprite = portalSprite; - Vector3 fgPosition = new Vector3(0, 0, -1f); + Vector3 fgPosition = new(0, 0, -1f); portalFgAnimationGameObject = new GameObject("PortalAnimationFG"); portalFgAnimationGameObject.transform.SetParent(portalGameObject.transform); portalFgAnimationGameObject.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover); @@ -149,10 +149,19 @@ public static void meetingEndsUpdate() { secondPortal.portalGameObject.SetActive(true); bothPlacedAndEnabled = true; HudManagerStartPatch.portalmakerButtonText2.text = "2. " + secondPortal.room; + + if (CachedPlayer.LocalPlayer.PlayerControl == Portalmaker.portalmaker) + Portalmaker.acTokenCommon ??= new("portalmaker.common1"); } // reset teleported players teleportedPlayers = new List(); + + if (CachedPlayer.LocalPlayer.PlayerControl == Portalmaker.portalmaker) + { + if (Portalmaker.acTokenChallenge != null) + Portalmaker.acTokenChallenge.Value.portal = 0; + } } private static void preloadSprites() { diff --git a/TheOtherRoles/Objects/Props.cs b/TheOtherRoles/Objects/Props.cs index afde9cbb..115c0d11 100644 --- a/TheOtherRoles/Objects/Props.cs +++ b/TheOtherRoles/Objects/Props.cs @@ -16,7 +16,7 @@ namespace TheOtherRoles.Objects { public class Props { - public static List skeldSpawn = new List() + public static List skeldSpawn = new() { new Vector3(-1.1028f, 4.9466f, 0.0f), // cafeteria new Vector3(9.119f, 1.4038f, 0.0f), // weapons @@ -33,7 +33,7 @@ public class Props new Vector3(-8.946f, -3.6638f, 0.0f) // medbay }; - public static List miraSpawn = new List() + public static List miraSpawn = new() { new Vector3(-4.5314f, 3.1964f, 0.0f), // launchpad new Vector3(15.3814f, -1.0567f, 0.0f), // medbay @@ -49,7 +49,7 @@ public class Props new Vector3(19.5687f, 2.1507f, 0.0f) }; - public static List polusSpawn = new List() + public static List polusSpawn = new() { new Vector3(16.4563f, -6.9233f, 0.0f), // dropship new Vector3(5.4774f, -9.7978f, 0.0f), // electric @@ -65,7 +65,7 @@ public class Props new Vector3(21.9853f, -19.0738f, 0.0f) }; - public static List airshipSpawn = new List() + public static List airshipSpawn = new() { new Vector3(-13.5475f, -12.1318f, 0.0f), new Vector3(1.9533f, -12.1844f, 0.0f), @@ -80,7 +80,7 @@ public class Props new Vector3(-3.5572f, -1.0386f, 0.0f) }; - public static List fungleSpawn = new List() + public static List fungleSpawn = new() { new Vector3(-7.4664f, 8.8714f, 0.0f), new Vector3(21.3894f, 13.616f, 0.0f), @@ -93,7 +93,7 @@ public class Props new Vector3(20.5093f, -8.3817f, 0.0f) }; - public static List miraDoorway = new List() + public static List miraDoorway = new() { new Vector3(7.2639f, 14.1907f, 0.0f), new Vector3(6.2961f, 3.7184f, 0.0f), @@ -108,15 +108,15 @@ public class Props new Vector3(17.8747f, 15.9618f, 0.0f) }; - public static List propPos = new List(); + public static List propPos = new(); public class AccelTrap { private static Sprite accelTrapSprite; public GameObject accelTrap; - public static Dictionary acceled = new Dictionary(); + public static Dictionary acceled = new(); - public static List accels = new List(); + public static List accels = new(); public static Sprite getAccelSprite() { @@ -128,7 +128,7 @@ public static Sprite getAccelSprite() public AccelTrap(Vector2 p) { accelTrap = new GameObject("AccelTrap"); - Vector3 position = new Vector3(p.x, p.y, p.y / 1000f + 0.01f); + Vector3 position = new(p.x, p.y, p.y / 1000f + 0.01f); accelTrap.transform.position = position; accelTrap.transform.localPosition = position; var accelRenderer = accelTrap.AddComponent(); @@ -142,6 +142,7 @@ public static void clearAccelTrap() { foreach (AccelTrap acce in accels) { + if (acce.accelTrap == null) continue; acce.accelTrap.SetActive(false); UnityEngine.Object.Destroy(acce.accelTrap); } @@ -149,6 +150,16 @@ public static void clearAccelTrap() acceled = new Dictionary(); } + public static List findAccelPos() + { + if (Helpers.isSkeld()) propPos = skeldSpawn; + else if (Helpers.isMira()) propPos = miraSpawn; + else if (Helpers.isPolus()) propPos = polusSpawn; + else if (Helpers.isAirship()) propPos = airshipSpawn; + else propPos = fungleSpawn; + return propPos; + } + public static void placeAccelTrap() { if (AmongUsClient.Instance.AmHost) @@ -158,7 +169,7 @@ public static void placeAccelTrap() while (count < (int)CustomOptionHolder.numAccelTraps.getFloat()) { bool isDuplicated = false; - byte id = (byte)rnd.Next(propPos.Count); + byte id = (byte)rnd.Next(findAccelPos().Count); for (int i = 0; i < buff.Length; i++) { @@ -191,18 +202,18 @@ public class DecelTrap { private static Sprite decelTrapSprite; public GameObject decelTrap; - public static List decels = new List(); + public static List decels = new(); public static List decelPos; public bool isTriggered = false; public DateTime activateTime = DateTime.UtcNow; - public static Dictionary deceled = new Dictionary(); + public static Dictionary deceled = new(); public DecelTrap(Vector2 p) { decelTrap = new GameObject("DecelTrap"); - Vector3 position = new Vector3(p.x, p.y, p.y / 1000f + 0.01f); + Vector3 position = new(p.x, p.y, p.y / 1000f + 0.01f); decelTrap.transform.position = position; decelTrap.transform.localPosition = position; var decelRenderer = decelTrap.AddComponent(); @@ -223,6 +234,7 @@ public static void clearDecelTrap() { foreach (DecelTrap decel in decels) { + if (decel.decelTrap == null) continue; decel.isTriggered = false; decel.activateTime = DateTime.UtcNow; decel.decelTrap.SetActive(false); @@ -296,11 +308,6 @@ public static void placeDecelTrap() public static void placeProps() { - if (Helpers.isSkeld()) propPos = skeldSpawn; - else if (Helpers.isMira()) propPos = miraSpawn; - else if (Helpers.isPolus()) propPos = polusSpawn; - else if (Helpers.isAirship()) propPos = airshipSpawn; - else propPos = fungleSpawn; AccelTrap.placeAccelTrap(); DecelTrap.placeDecelTrap(); } @@ -311,6 +318,12 @@ public static void clearProps() DecelTrap.clearDecelTrap(); } + public static void clearAndReload() + { + clearProps(); + propPos = new(); + } + [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.FixedUpdate))] public static class PlayerPhysicsPropPatch { diff --git a/TheOtherRoles/Objects/Trap.cs b/TheOtherRoles/Objects/Trap.cs index 77e90ec5..69c51f09 100644 --- a/TheOtherRoles/Objects/Trap.cs +++ b/TheOtherRoles/Objects/Trap.cs @@ -7,6 +7,7 @@ using TheOtherRoles.Players; using TheOtherRoles.Utilities; using UnityEngine; +using static TheOtherRoles.TheOtherRoles; namespace TheOtherRoles.Objects { @@ -287,7 +288,8 @@ public static void Postfix(PlayerPhysics __instance) trap.isActive || CachedPlayer.LocalPlayer.PlayerControl.Data.Role.IsImpostor || CachedPlayer.LocalPlayer.PlayerControl.Data.IsDead || - CachedPlayer.LocalPlayer.PlayerControl == TheOtherRoles.Lighter.lighter; + CachedPlayer.LocalPlayer.PlayerControl == Lighter.lighter || + CachedPlayer.LocalPlayer.PlayerControl == Fox.fox; var opacity = canSee ? 1.0f : 0.0f; if (trap.trap != null) trap.trap.GetComponent().material.color = Color.Lerp(Palette.ClearWhite, Palette.White, opacity); diff --git a/TheOtherRoles/Patches/AirShipSetAntiTpPosition.cs b/TheOtherRoles/Patches/AirShipSetAntiTpPosition.cs deleted file mode 100644 index fcfd22d1..00000000 --- a/TheOtherRoles/Patches/AirShipSetAntiTpPosition.cs +++ /dev/null @@ -1,21 +0,0 @@ -using HarmonyLib; -using System; - -namespace TheOtherRoles.Patches { - [HarmonyPatch] - public static class AirShipSetAntiTpPosition { - - // Save the position of the player prior to starting the climb / gap platform - [HarmonyPrefix] - [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.ClimbLadder))] - public static void prefix() { - AntiTeleport.position = Players.CachedPlayer.LocalPlayer.transform.position; - } - - [HarmonyPrefix] - [HarmonyPatch(typeof(MovingPlatformBehaviour), nameof(MovingPlatformBehaviour.UsePlatform))] - public static void prefix2() { - AntiTeleport.position = Players.CachedPlayer.LocalPlayer.transform.position; - } - } -} diff --git a/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs b/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs index 690ff8bf..9d135994 100644 --- a/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs +++ b/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs @@ -9,7 +9,7 @@ namespace TheOtherRoles.Patches { [HarmonyPatch(typeof(CreateOptionsPicker))] class CreateOptionsPickerPatch { - private static List renderers = new List(); + private static List renderers = new(); [HarmonyPatch(typeof(CreateOptionsPicker), nameof(CreateOptionsPicker.SetGameMode))] public static bool Prefix(CreateOptionsPicker __instance, ref GameModes mode) { diff --git a/TheOtherRoles/Patches/CredentialsPatch.cs b/TheOtherRoles/Patches/CredentialsPatch.cs index 6f03050e..696c1ef4 100644 --- a/TheOtherRoles/Patches/CredentialsPatch.cs +++ b/TheOtherRoles/Patches/CredentialsPatch.cs @@ -137,7 +137,7 @@ public static void updateSprite() { [HarmonyPatch(typeof(MainMenuManager), nameof(MainMenuManager.LateUpdate))] public static class MOTD { - public static List motds = new List(); + public static List motds = new(); private static float timer = 0f; private static float maxTimer = 5f; private static int currentIndex = 0; @@ -167,7 +167,7 @@ public static void Postfix() public static async Task loadMOTDs() { - HttpClient client = new HttpClient(); + HttpClient client = new(); HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/dabao40/GMIAMOTDs/main/MOTDs.txt".getGithubUrl()); response.EnsureSuccessStatusCode(); string motds = await response.Content.ReadAsStringAsync(); diff --git a/TheOtherRoles/Patches/EndGamePatch.cs b/TheOtherRoles/Patches/EndGamePatch.cs index aa4c9256..7e9c13a5 100644 --- a/TheOtherRoles/Patches/EndGamePatch.cs +++ b/TheOtherRoles/Patches/EndGamePatch.cs @@ -61,11 +61,11 @@ enum WinCondition { static class AdditionalTempData { // Should be implemented using a proper GameOverReason in the future public static WinCondition winCondition = WinCondition.Default; - public static List additionalWinConditions = new List(); - public static List playerRoles = new List(); + public static List additionalWinConditions = new(); + public static List playerRoles = new(); public static float timer = 0; - public static Dictionary plagueDoctorInfected = new Dictionary(); - public static Dictionary plagueDoctorProgress = new Dictionary(); + public static Dictionary plagueDoctorInfected = new(); + public static Dictionary plagueDoctorProgress = new(); public static void clear() { playerRoles.Clear(); @@ -147,7 +147,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End AdditionalTempData.plagueDoctorProgress = PlagueDoctor.progress; // Remove Jester, Opportunist, Arsonist, Vulture, Jackal, former Jackals and Sidekick from winners (if they win, they'll be readded) - List notWinners = new List(); + List notWinners = new(); if (Jester.jester != null) notWinners.Add(Jester.jester); if (Sidekick.sidekick != null) notWinners.Add(Sidekick.sidekick); if (Jackal.jackal != null) notWinners.Add(Jackal.jackal); @@ -168,10 +168,11 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End if (Fox.fox != null) notWinners.Add(Fox.fox); if (Immoralist.immoralist != null) notWinners.Add(Immoralist.immoralist); if (SchrodingersCat.schrodingersCat != null) notWinners.Add(SchrodingersCat.schrodingersCat); + if (SchrodingersCat.formerSchrodingersCat != null) notWinners.Add(SchrodingersCat.formerSchrodingersCat); notWinners.AddRange(Jackal.formerJackals); - List winnersToRemove = new List(); + List winnersToRemove = new(); foreach (CachedPlayerData winner in EndGameResult.CachedWinners.GetFastEnumerator()) { if (notWinners.Any(x => x.Data.PlayerName == winner.PlayerName)) winnersToRemove.Add(winner); } @@ -240,6 +241,14 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End EndGameResult.CachedWinners.Add(wpd); } } + else if (p == SchrodingersCat.formerSchrodingersCat) + { + if (SchrodingersCat.team == SchrodingersCat.Team.Impostor) + { + CachedPlayerData wpd = new(p.Data); + EndGameResult.CachedWinners.Add(wpd); + } + } } AdditionalTempData.winCondition = WinCondition.ImpostorWin; } @@ -247,7 +256,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End // Mini lose if (miniLose) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Mini.mini.Data); + CachedPlayerData wpd = new(Mini.mini.Data); wpd.IsYou = false; // If "no one is the Mini", it will display the Mini, but also show defeat to everyone EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.MiniLose; @@ -256,7 +265,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End // Jester win else if (jesterWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Jester.jester.Data); + CachedPlayerData wpd = new(Jester.jester.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.JesterWin; } @@ -264,7 +273,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End // Arsonist win else if (arsonistWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Arsonist.arsonist.Data); + CachedPlayerData wpd = new(Arsonist.arsonist.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.ArsonistWin; } @@ -272,7 +281,7 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End else if (plagueDoctorWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(PlagueDoctor.plagueDoctor.Data); + CachedPlayerData wpd = new(PlagueDoctor.plagueDoctor.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.PlagueDoctorWin; } @@ -287,47 +296,63 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End else if (jekyllAndHydeWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(JekyllAndHyde.jekyllAndHyde.Data); + CachedPlayerData wpd = new(JekyllAndHyde.jekyllAndHyde.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.JekyllAndHydeWin; if (JekyllAndHyde.formerJekyllAndHyde != null) { - CachedPlayerData wpdFormerJekyllAndHyde = new CachedPlayerData(JekyllAndHyde.formerJekyllAndHyde.Data); + CachedPlayerData wpdFormerJekyllAndHyde = new(JekyllAndHyde.formerJekyllAndHyde.Data); EndGameResult.CachedWinners.Add(wpdFormerJekyllAndHyde); } - if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.JekyllAndHyde) + if (SchrodingersCat.team == SchrodingersCat.Team.JekyllAndHyde) { - CachedPlayerData wpdSchrodingersCat = new CachedPlayerData(SchrodingersCat.schrodingersCat.Data); - EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + if (SchrodingersCat.schrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.schrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } + if (SchrodingersCat.formerSchrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.formerSchrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } } } else if (moriartyWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Moriarty.moriarty.Data); + CachedPlayerData wpd = new(Moriarty.moriarty.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.MoriartyWin; if (Moriarty.formerMoriarty != null) { - CachedPlayerData wpdFormerMoriarty = new CachedPlayerData(Moriarty.formerMoriarty.Data); + CachedPlayerData wpdFormerMoriarty = new(Moriarty.formerMoriarty.Data); EndGameResult.CachedWinners.Add(wpdFormerMoriarty); } - if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.Moriarty) + if (SchrodingersCat.team == SchrodingersCat.Team.Moriarty) { - CachedPlayerData wpdSchrodingersCat = new CachedPlayerData(SchrodingersCat.schrodingersCat.Data); - EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + if (SchrodingersCat.schrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.schrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } + if (SchrodingersCat.formerSchrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.formerSchrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } } } // Vulture win else if (vultureWin) { EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Vulture.vulture.Data); + CachedPlayerData wpd = new(Vulture.vulture.Data); EndGameResult.CachedWinners.Add(wpd); AdditionalTempData.winCondition = WinCondition.VultureWin; } @@ -390,24 +415,32 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End // Jackal wins if nobody except jackal is alive AdditionalTempData.winCondition = WinCondition.JackalWin; EndGameResult.CachedWinners = new Il2CppSystem.Collections.Generic.List(); - CachedPlayerData wpd = new CachedPlayerData(Jackal.jackal.Data); + CachedPlayerData wpd = new(Jackal.jackal.Data); wpd.IsImpostor = false; EndGameResult.CachedWinners.Add(wpd); // If there is a sidekick. The sidekick also wins if (Sidekick.sidekick != null) { - CachedPlayerData wpdSidekick = new CachedPlayerData(Sidekick.sidekick.Data); + CachedPlayerData wpdSidekick = new(Sidekick.sidekick.Data); wpdSidekick.IsImpostor = false; EndGameResult.CachedWinners.Add(wpdSidekick); } foreach(var player in Jackal.formerJackals) { - CachedPlayerData wpdFormerJackal = new CachedPlayerData(player.Data); + CachedPlayerData wpdFormerJackal = new(player.Data); wpdFormerJackal.IsImpostor = false; EndGameResult.CachedWinners.Add(wpdFormerJackal); } - if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.Jackal) + if (SchrodingersCat.team == SchrodingersCat.Team.Jackal) { - CachedPlayerData wpdSchrodingersCat = new CachedPlayerData(SchrodingersCat.schrodingersCat.Data); - EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + if (SchrodingersCat.schrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.schrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } + if (SchrodingersCat.formerSchrodingersCat != null) + { + CachedPlayerData wpdSchrodingersCat = new(SchrodingersCat.formerSchrodingersCat.Data); + EndGameResult.CachedWinners.Add(wpdSchrodingersCat); + } } } @@ -440,13 +473,13 @@ public static void Postfix(AmongUsClient __instance, [HarmonyArgument(0)]ref End { foreach (var p in Madmate.madmate) { - CachedPlayerData wpd = new CachedPlayerData(p.Data); + CachedPlayerData wpd = new(p.Data); EndGameResult.CachedWinners.Add(wpd); } } if (CreatedMadmate.createdMadmate != null) { - CachedPlayerData wpd = new CachedPlayerData(CreatedMadmate.createdMadmate.Data); + CachedPlayerData wpd = new(CreatedMadmate.createdMadmate.Data); EndGameResult.CachedWinners.Add(wpd); } } @@ -538,7 +571,7 @@ public static void Postfix(EndGameManager __instance) { PoolablePlayer poolablePlayer = UnityEngine.Object.Instantiate(__instance.PlayerPrefab, __instance.transform); poolablePlayer.transform.localPosition = new Vector3(1f * (float)num2 * (float)num3 * num5, FloatRange.SpreadToEdges(-1.125f, 0f, num3, num), num6 + (float)num3 * 0.01f) * 0.9f; float num7 = Mathf.Lerp(1f, 0.65f, num4) * 0.9f; - Vector3 vector = new Vector3(num7, num7, 1f); + Vector3 vector = new(num7, num7, 1f); poolablePlayer.transform.localScale = vector; if (CachedPlayerData2.IsDead) { diff --git a/TheOtherRoles/Patches/ExileControllerPatch.cs b/TheOtherRoles/Patches/ExileControllerPatch.cs index d5b2e27d..c05ca3ad 100644 --- a/TheOtherRoles/Patches/ExileControllerPatch.cs +++ b/TheOtherRoles/Patches/ExileControllerPatch.cs @@ -291,7 +291,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) // Seer spawn souls if (Seer.deadBodyPositions != null && Seer.seer != null && CachedPlayer.LocalPlayer.PlayerControl == Seer.seer && (Seer.mode == 0 || Seer.mode == 2)) { foreach (Vector3 pos in Seer.deadBodyPositions) { - GameObject soul = new GameObject(); + GameObject soul = new(); //soul.transform.position = pos; soul.transform.position = new Vector3(pos.x, pos.y, pos.y / 1000 - 1f); soul.layer = 5; @@ -346,7 +346,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) PlagueDoctor.updateDead(); FastDestroyableSingleton.Instance.StartCoroutine(Effects.Lerp(PlagueDoctor.immunityTime, new Action((p) => - { // 5ᤫȾ_ʼ + { // 5秒後から感染開始 if (p == 1f) { PlagueDoctor.meetingFlag = false; @@ -411,7 +411,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) if (Medium.futureDeadBodies != null) { foreach ((DeadPlayer db, Vector3 ps) in Medium.futureDeadBodies) { - GameObject s = new GameObject(); + GameObject s = new(); //s.transform.position = ps; s.transform.position = new Vector3(ps.x, ps.y, ps.y / 1000 - 1f); s.layer = 5; @@ -436,7 +436,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) if (CustomOptionHolder.randomGameStartPosition.getBool() && (AntiTeleport.antiTeleport.FindAll(x => x.PlayerId == CachedPlayer.LocalPlayer.PlayerControl.PlayerId).Count == 0)) { //Random spawn on round start - List skeldSpawn = new List() { + List skeldSpawn = new() { new Vector3(-2.2f, 2.2f, 0.0f), //cafeteria. botton. top left. new Vector3(0.7f, 2.2f, 0.0f), //caffeteria. button. top right. new Vector3(-2.2f, -0.2f, 0.0f), //caffeteria. button. bottom left. @@ -477,7 +477,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) new Vector3(-6.5f, -4.5f, 0.0f) //medbay bottom }; - List miraSpawn = new List() { + List miraSpawn = new() { new Vector3(-4.5f, 3.5f, 0.0f), //launchpad top new Vector3(-4.5f, -1.4f, 0.0f), //launchpad bottom new Vector3(8.5f, -1f, 0.0f), //launchpad- med hall @@ -501,7 +501,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) new Vector3(22f, -2f, 0.0f), //balcony }; - List polusSpawn = new List() { + List polusSpawn = new() { new Vector3(16.6f, -1f, 0.0f), //dropship top new Vector3(16.6f, -5f, 0.0f), //dropship bottom new Vector3(20f, -9f, 0.0f), //above storrage @@ -548,7 +548,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) new Vector3(17.5f, -25.7f, 0.0f), //snowman under office }; - List dleksSpawn = new List() { + List dleksSpawn = new() { new Vector3(2.2f, 2.2f, 0.0f), //cafeteria. botton. top left. new Vector3(-0.7f, 2.2f, 0.0f), //caffeteria. button. top right. new Vector3(2.2f, -0.2f, 0.0f), //caffeteria. button. bottom left. @@ -589,7 +589,7 @@ static void WrapUpPostfix(NetworkedPlayerInfo exiled) new Vector3(6.5f, -4.5f, 0.0f) //medbay bottom }; - List fungleSpawn = new List() { + List fungleSpawn = new() { new Vector3(-10.0842f, 13.0026f, 0.013f), new Vector3(0.9815f, 6.7968f, 0.0068f), new Vector3(22.5621f, 3.2779f, 0.0033f), diff --git a/TheOtherRoles/Patches/GameStartManagerPatch.cs b/TheOtherRoles/Patches/GameStartManagerPatch.cs index 3330cba4..703a22ae 100644 --- a/TheOtherRoles/Patches/GameStartManagerPatch.cs +++ b/TheOtherRoles/Patches/GameStartManagerPatch.cs @@ -27,7 +27,7 @@ public static void Prefix(GameStartManager __instance) } public class GameStartManagerPatch { - public static Dictionary playerVersions = new Dictionary(); + public static Dictionary playerVersions = new(); public static float timer = 600f; private static float kickingTimer = 0f; private static bool versionSent = false; @@ -289,7 +289,7 @@ public static bool Prefix(GameStartManager __instance) { // 4 = Airship // 5 = Submerged byte chosenMapId = 0; - List probabilities = new List(); + List probabilities = new(); probabilities.Add(CustomOptionHolder.dynamicMapEnableSkeld.getSelection() / 10f); probabilities.Add(CustomOptionHolder.dynamicMapEnableMira.getSelection() / 10f); probabilities.Add(CustomOptionHolder.dynamicMapEnablePolus.getSelection() / 10f); diff --git a/TheOtherRoles/Patches/IntroPatch.cs b/TheOtherRoles/Patches/IntroPatch.cs index f9ee2349..6bcf01ac 100644 --- a/TheOtherRoles/Patches/IntroPatch.cs +++ b/TheOtherRoles/Patches/IntroPatch.cs @@ -100,7 +100,7 @@ public static void Prefix(IntroCutscene __instance) { if (CustomOptionHolder.randomGameStartPosition.getBool()) { //Random spawn on game start - List skeldSpawn = new List() { + List skeldSpawn = new() { new Vector3(-2.2f, 2.2f, 0.0f), //cafeteria. botton. top left. new Vector3(0.7f, 2.2f, 0.0f), //caffeteria. button. top right. new Vector3(-2.2f, -0.2f, 0.0f), //caffeteria. button. bottom left. @@ -141,7 +141,7 @@ public static void Prefix(IntroCutscene __instance) { new Vector3(-6.5f, -4.5f, 0.0f) //medbay bottom }; - List miraSpawn = new List() { + List miraSpawn = new() { new Vector3(-4.5f, 3.5f, 0.0f), //launchpad top new Vector3(-4.5f, -1.4f, 0.0f), //launchpad bottom new Vector3(8.5f, -1f, 0.0f), //launchpad- med hall @@ -165,7 +165,7 @@ public static void Prefix(IntroCutscene __instance) { new Vector3(22f, -2f, 0.0f), //balcony }; - List polusSpawn = new List() { + List polusSpawn = new() { new Vector3(16.6f, -1f, 0.0f), //dropship top new Vector3(16.6f, -5f, 0.0f), //dropship bottom new Vector3(20f, -9f, 0.0f), //above storrage @@ -212,7 +212,7 @@ public static void Prefix(IntroCutscene __instance) { new Vector3(17.5f, -25.7f, 0.0f), //snowman under office }; - List dleksSpawn = new List() { + List dleksSpawn = new() { new Vector3(2.2f, 2.2f, 0.0f), //cafeteria. botton. top left. new Vector3(-0.7f, 2.2f, 0.0f), //caffeteria. button. top right. new Vector3(2.2f, -0.2f, 0.0f), //caffeteria. button. bottom left. @@ -253,7 +253,7 @@ public static void Prefix(IntroCutscene __instance) { new Vector3(6.5f, -4.5f, 0.0f) //medbay bottom }; - List fungleSpawn = new List() { + List fungleSpawn = new() { new Vector3(-10.0842f, 13.0026f, 0.013f), new Vector3(0.9815f, 6.7968f, 0.0068f), new Vector3(22.5621f, 3.2779f, 0.0033f), diff --git a/TheOtherRoles/Patches/MainMenuPatch.cs b/TheOtherRoles/Patches/MainMenuPatch.cs index 0e2a5772..02993ffe 100644 --- a/TheOtherRoles/Patches/MainMenuPatch.cs +++ b/TheOtherRoles/Patches/MainMenuPatch.cs @@ -214,7 +214,8 @@ public static class MainMenuSetUpPatch public static Sprite discordSprite; public static GameObject modScreen = null; public static GameObject aboutScreen = null; - public static Dictionary contributors = new Dictionary { { "Imp11", "mainMenuDeveloper" }, { "Amongus", "mainMenuDeveloper" }, + public static Dictionary contributors = new() + { { "Imp11", "mainMenuDeveloper" }, { "Amongus", "mainMenuDeveloper" }, { "Fangkuai", "mainMenuArtist" }, { "Yuunozikkyou" , "mainMenuTranslator"} }; public static void Postfix(MainMenuManager __instance) @@ -319,7 +320,7 @@ void createAboutScreen() aboutScreen = Helpers.CreateObject("About", __instance.accountButtons.transform.parent, new Vector3(0, 0, -1f)); aboutScreen.transform.localScale = modScreen!.transform.localScale; var screen = MetaScreen.GenerateScreen(new Vector2(6.2f, 4.1f), aboutScreen.transform, new Vector3(-0.1f, 0, 0f), false, false, false); - TextAttribute detailAttribute = new TextAttribute(TextAttribute.BoldAttr) + TextAttribute detailAttribute = new(TextAttribute.BoldAttr) { FontMaterial = VanillaAsset.StandardMaskedFontMaterial, Size = new Vector2(5.8f, 0.4f), @@ -328,7 +329,7 @@ void createAboutScreen() FontMaxSize = 2f, FontMinSize = 1.7f }; - TextAttribute descriptionAttribute = new TextAttribute(TextAttribute.ContentAttr) + TextAttribute descriptionAttribute = new(TextAttribute.ContentAttr) { FontMaterial = VanillaAsset.StandardMaskedFontMaterial, Size = new Vector2(5.8f, 0.4f), @@ -337,7 +338,7 @@ void createAboutScreen() FontMaxSize = 1.7f, FontMinSize = 1.3f }; - TextAttribute titleAttribute = new TextAttribute(TextAttribute.NormalAttr) + TextAttribute titleAttribute = new(TextAttribute.NormalAttr) { FontMaterial = VanillaAsset.StandardMaskedFontMaterial, Size = new Vector2(3.4f, 0.3f), diff --git a/TheOtherRoles/Patches/MapBehaviourPatch.cs b/TheOtherRoles/Patches/MapBehaviourPatch.cs index c1e9eb45..4e6ae9d7 100644 --- a/TheOtherRoles/Patches/MapBehaviourPatch.cs +++ b/TheOtherRoles/Patches/MapBehaviourPatch.cs @@ -15,7 +15,7 @@ namespace TheOtherRoles.Patches { [HarmonyPatch(typeof(MapBehaviour))] class MapBehaviourPatch { - public static Dictionary herePoints = new Dictionary(); + public static Dictionary herePoints = new(); public static SpriteRenderer targetHerePoint; public static Dictionary impostorHerePoint; @@ -143,7 +143,7 @@ static void Postfix(MapBehaviour __instance) { targetHerePoint.gameObject.SetActive(!EvilTracker.target.Data.IsDead); NetworkedPlayerInfo playerById = GameData.Instance.GetPlayerById(EvilTracker.target.PlayerId); PlayerMaterial.SetColors((playerById != null) ? playerById.DefaultOutfit.ColorId : 0, targetHerePoint); - Vector3 pos = new Vector3(EvilTracker.target.transform.position.x, EvilTracker.target.transform.position.y, EvilTracker.target.transform.position.z); + Vector3 pos = new(EvilTracker.target.transform.position.x, EvilTracker.target.transform.position.y, EvilTracker.target.transform.position.z); pos /= MapUtilities.CachedShipStatus.MapScale; pos.x *= Mathf.Sign(MapUtilities.CachedShipStatus.transform.localScale.x); pos.z = -10; @@ -165,7 +165,7 @@ static void Postfix(MapBehaviour __instance) { impostorHerePoint[p.PlayerId].gameObject.SetActive(!p.Data.IsDead && MeetingHud.Instance == null); NetworkedPlayerInfo playerById = GameData.Instance.GetPlayerById(p.PlayerId); PlayerMaterial.SetColors(0, impostorHerePoint[p.PlayerId]); - Vector3 pos = new Vector3(p.transform.position.x, p.transform.position.y, p.transform.position.z); + Vector3 pos = new(p.transform.position.x, p.transform.position.y, p.transform.position.z); pos /= MapUtilities.CachedShipStatus.MapScale; pos.x *= Mathf.Sign(MapUtilities.CachedShipStatus.transform.localScale.x); pos.z = -10; diff --git a/TheOtherRoles/Patches/MeetingPatch.cs b/TheOtherRoles/Patches/MeetingPatch.cs index b00b01fc..7913a960 100644 --- a/TheOtherRoles/Patches/MeetingPatch.cs +++ b/TheOtherRoles/Patches/MeetingPatch.cs @@ -115,7 +115,7 @@ static bool Prefix(MeetingHud __instance) { NetworkedPlayerInfo exiled = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(v => !tie && v.PlayerId == max.Key && !v.IsDead); // TieBreaker - List potentialExiled = new List(); + List potentialExiled = new(); bool skipIsTie = false; if (self.Count > 0) { Tiebreaker.isTiebreak = false; @@ -514,7 +514,7 @@ static void guesserOnClick(int buttonTarget, MeetingHud __instance) { UnityEngine.Object.Destroy(container.gameObject); })); - List buttons = new List(); + List buttons = new(); Transform selectedButton = null; foreach (RoleInfo roleInfo in RoleInfo.allRoleInfos) { diff --git a/TheOtherRoles/Patches/PlayerControlPatch.cs b/TheOtherRoles/Patches/PlayerControlPatch.cs index a6fe2e93..c4a9c491 100644 --- a/TheOtherRoles/Patches/PlayerControlPatch.cs +++ b/TheOtherRoles/Patches/PlayerControlPatch.cs @@ -257,6 +257,7 @@ static void jackalSetTarget() { // Only exclude sidekick from beeing targeted if the jackal can create sidekicks from impostors if (Sidekick.sidekick != null) untargetablePlayers.Add(Sidekick.sidekick); } + if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.Jackal) untargetablePlayers.Add(SchrodingersCat.schrodingersCat); if (Mini.mini != null && !Mini.isGrownUp()) untargetablePlayers.Add(Mini.mini); // Exclude Jackal from targeting the Mini unless it has grown up Jackal.currentTarget = setTarget(untargetablePlayers: untargetablePlayers); setPlayerOutline(Jackal.currentTarget, Palette.ImpostorRed); @@ -267,6 +268,7 @@ static void sidekickSetTarget() { var untargetablePlayers = new List(); if (Jackal.jackal != null) untargetablePlayers.Add(Jackal.jackal); if (Mini.mini != null && !Mini.isGrownUp()) untargetablePlayers.Add(Mini.mini); // Exclude Sidekick from targeting the Mini unless it has grown up + if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.Jackal) untargetablePlayers.Add(SchrodingersCat.schrodingersCat); Sidekick.currentTarget = setTarget(untargetablePlayers: untargetablePlayers); if (Sidekick.canKill) setPlayerOutline(Sidekick.currentTarget, Palette.ImpostorRed); } @@ -285,7 +287,7 @@ static void sidekickCheckPromotion() { static void eraserSetTarget() { if (Eraser.eraser == null || Eraser.eraser != CachedPlayer.LocalPlayer.PlayerControl) return; - List untargetables = new List(); + List untargetables = new(); if (Spy.spy != null) untargetables.Add(Spy.spy); if (Sidekick.wasTeamRed) untargetables.Add(Sidekick.sidekick); if (Jackal.wasTeamRed) untargetables.Add(Jackal.jackal); @@ -416,7 +418,7 @@ static void engineerUpdate() { } } - if (CachedPlayer.LocalPlayer.PlayerControl == Engineer.engineer && Engineer.acTokenChallenge != null) + if (Engineer.engineer != null && CachedPlayer.LocalPlayer.PlayerControl == Engineer.engineer && MapUtilities.CachedShipStatus?.AllVents != null && Engineer.acTokenChallenge != null) { if (!CachedPlayer.LocalPlayer.PlayerControl.Data.IsDead) { @@ -457,11 +459,14 @@ static void impostorSetTarget() { static void schrodingersCatSetTarget() { + var untargetables = new List(); if (SchrodingersCat.schrodingersCat == CachedPlayer.LocalPlayer.PlayerControl && SchrodingersCat.team == SchrodingersCat.Team.Jackal) { if (!SchrodingersCat.isTeamJackalAlive() || !SchrodingersCat.cantKillUntilLastOne) { - SchrodingersCat.currentTarget = setTarget(); + if (Jackal.jackal != null) untargetables.Add(Jackal.jackal); + if (Sidekick.sidekick != null) untargetables.Add(Sidekick.sidekick); + SchrodingersCat.currentTarget = setTarget(untargetablePlayers: untargetables); setPlayerOutline(SchrodingersCat.currentTarget, Jackal.color); } } @@ -469,7 +474,8 @@ static void schrodingersCatSetTarget() { if (JekyllAndHyde.jekyllAndHyde == null || JekyllAndHyde.jekyllAndHyde.Data.IsDead || !SchrodingersCat.cantKillUntilLastOne) { - SchrodingersCat.currentTarget = setTarget(); + if (JekyllAndHyde.jekyllAndHyde != null) untargetables.Add(JekyllAndHyde.jekyllAndHyde); + SchrodingersCat.currentTarget = setTarget(untargetablePlayers: untargetables); setPlayerOutline(SchrodingersCat.currentTarget, JekyllAndHyde.color); } } @@ -477,7 +483,8 @@ static void schrodingersCatSetTarget() { if (Moriarty.moriarty == null || Moriarty.moriarty.Data.IsDead || !SchrodingersCat.cantKillUntilLastOne) { - SchrodingersCat.currentTarget = setTarget(); + if (Moriarty.moriarty != null) untargetables.Add(Moriarty.moriarty); + SchrodingersCat.currentTarget = setTarget(untargetablePlayers: untargetables); setPlayerOutline(SchrodingersCat.currentTarget, Moriarty.color); } } @@ -559,7 +566,9 @@ static void moriartySetTarget() { if (Moriarty.moriarty == null || Moriarty.moriarty != CachedPlayer.LocalPlayer.PlayerControl) return; Moriarty.currentTarget = setTarget(); - if (Moriarty.target != null) Moriarty.killTarget = setTarget(targetingPlayer: Moriarty.target); + var untargetablePlayers = new List(); + if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.Moriarty) untargetablePlayers.Add(SchrodingersCat.schrodingersCat); + if (Moriarty.target != null) Moriarty.killTarget = setTarget(untargetablePlayers: untargetablePlayers, targetingPlayer: Moriarty.target); else Moriarty.killTarget = null; setPlayerOutline(Moriarty.currentTarget, Moriarty.color); } @@ -717,7 +726,7 @@ public static void plagueDoctorUpdate() { if (!PlagueDoctor.meetingFlag && (PlagueDoctor.canWinDead || !PlagueDoctor.plagueDoctor.Data.IsDead)) { - List newInfected = new List(); + List newInfected = new(); foreach (PlayerControl target in CachedPlayer.AllPlayers) { if (target == PlagueDoctor.plagueDoctor || target.Data.IsDead || PlagueDoctor.infected.ContainsKey(target.PlayerId) || target.inVent) continue; @@ -830,6 +839,7 @@ static void trackerUpdate() { { Tracker.DangerMeterParent?.SetActive(false); Tracker.Meter?.gameObject.SetActive(false); + if (Tracker.arrow?.arrow != null) Tracker.arrow.arrow.SetActive(false); } } @@ -874,7 +884,8 @@ static void foxSetTarget() List untargetablePlayers = new(); foreach (var p in PlayerControl.AllPlayerControls.GetFastEnumerator()) { - if (p.Data.Role.IsImpostor || p == Jackal.jackal || p == JekyllAndHyde.jekyllAndHyde || p == Moriarty.moriarty) + if (p.Data.Role.IsImpostor || p == Jackal.jackal || p == JekyllAndHyde.jekyllAndHyde || p == Moriarty.moriarty + || (p == SchrodingersCat.schrodingersCat && SchrodingersCat.hasTeam() && SchrodingersCat.team != SchrodingersCat.Team.Crewmate)) { untargetablePlayers.Add(p); } @@ -910,8 +921,8 @@ public static void playerSizeUpdate(PlayerControl p) { } public static void updatePlayerInfo() { - Vector3 colorBlindTextMeetingInitialLocalPos = new Vector3(0.3384f, -0.16666f, -0.01f); - Vector3 colorBlindTextMeetingInitialLocalScale = new Vector3(0.9f, 1f, 1f); + Vector3 colorBlindTextMeetingInitialLocalPos = new(0.3384f, -0.16666f, -0.01f); + Vector3 colorBlindTextMeetingInitialLocalScale = new(0.9f, 1f, 1f); foreach (PlayerControl p in CachedPlayer.AllPlayers) { // Colorblind Text in Meeting @@ -1097,7 +1108,7 @@ static void bountyHunterUpdate() { if (BountyHunter.bountyHunter == null || CachedPlayer.LocalPlayer.PlayerControl != BountyHunter.bountyHunter) return; if (BountyHunter.bountyHunter.Data.IsDead) { - if (BountyHunter.arrow != null || BountyHunter.arrow.arrow != null) UnityEngine.Object.Destroy(BountyHunter.arrow.arrow); + if (BountyHunter.arrow != null) UnityEngine.Object.Destroy(BountyHunter.arrow.arrow); BountyHunter.arrow = null; if (BountyHunter.cooldownText != null && BountyHunter.cooldownText.gameObject != null) UnityEngine.Object.Destroy(BountyHunter.cooldownText.gameObject); BountyHunter.cooldownText = null; @@ -1162,7 +1173,9 @@ static void bountyHunterUpdate() { static void jekyllAndHydeSetTarget() { if (JekyllAndHyde.jekyllAndHyde == null || CachedPlayer.LocalPlayer.PlayerControl != JekyllAndHyde.jekyllAndHyde || JekyllAndHyde.jekyllAndHyde.Data.IsDead || JekyllAndHyde.isJekyll()) return; - JekyllAndHyde.currentTarget = setTarget(); + var untargetables = new List(); + if (SchrodingersCat.schrodingersCat != null && SchrodingersCat.team == SchrodingersCat.Team.JekyllAndHyde) untargetables.Add(SchrodingersCat.schrodingersCat); + JekyllAndHyde.currentTarget = setTarget(untargetablePlayers : untargetables); setPlayerOutline(JekyllAndHyde.currentTarget, JekyllAndHyde.color); } @@ -1731,7 +1744,7 @@ public static void impostorArrowUpdate() return; } - Arrow arrow = new Arrow(FortuneTeller.color); + Arrow arrow = new(FortuneTeller.color); arrow.arrow.SetActive(true); arrow.Update(FortuneTeller.fortuneTeller.transform.position); FortuneTeller.arrows.Add(arrow); @@ -1839,7 +1852,7 @@ static void createdMadmateUpdate(PlayerControl player) static void assassinSetTarget() { if (Assassin.assassin == null || Assassin.assassin != CachedPlayer.LocalPlayer.PlayerControl) return; - List untargetables = new List(); + List untargetables = new(); if (Spy.spy != null && !Spy.impostorsCanKillAnyone) untargetables.Add(Spy.spy); if (Mini.mini != null && !Mini.isGrownUp()) untargetables.Add(Mini.mini); if (Sidekick.wasTeamRed && !Spy.impostorsCanKillAnyone) untargetables.Add(Sidekick.sidekick); @@ -1852,7 +1865,7 @@ static void assassinSetTarget() static void thiefSetTarget() { if (Thief.thief == null || Thief.thief != CachedPlayer.LocalPlayer.PlayerControl) return; - List untargetables = new List(); + List untargetables = new(); if (Mini.mini != null && !Mini.isGrownUp()) untargetables.Add(Mini.mini); //if (Ninja.ninja != null && Ninja.stealthed && !Ninja.canBeTargeted) untargetables.Add(Ninja.ninja); //if (Sprinter.sprinter != null && Sprinter.sprinting) untargetables.Add(Sprinter.sprinter); @@ -2285,7 +2298,7 @@ public static void Prefix(PlayerControl __instance, [HarmonyArgument(0)]PlayerCo public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)]PlayerControl target) { // Collect dead player info - DeadPlayer deadPlayer = new DeadPlayer(target, DateTime.UtcNow, DeadPlayer.CustomDeathReason.Kill, __instance); + DeadPlayer deadPlayer = new(target, DateTime.UtcNow, DeadPlayer.CustomDeathReason.Kill, __instance); GameHistory.deadPlayers.Add(deadPlayer); // Reset killer to crewmate if resetToCrewmate @@ -2963,7 +2976,7 @@ public static class ExilePlayerPatch public static void Postfix(PlayerControl __instance) { // Collect dead player info - DeadPlayer deadPlayer = new DeadPlayer(__instance, DateTime.UtcNow, DeadPlayer.CustomDeathReason.Exile, null); + DeadPlayer deadPlayer = new(__instance, DateTime.UtcNow, DeadPlayer.CustomDeathReason.Exile, null); GameHistory.deadPlayers.Add(deadPlayer); diff --git a/TheOtherRoles/Patches/RoleAssignmentPatch.cs b/TheOtherRoles/Patches/RoleAssignmentPatch.cs index 419de8c0..993addbd 100644 --- a/TheOtherRoles/Patches/RoleAssignmentPatch.cs +++ b/TheOtherRoles/Patches/RoleAssignmentPatch.cs @@ -44,7 +44,7 @@ class RoleManagerSelectRolesPatch { private static int impValues; private static bool isEvilGuesser; private static bool isEvilWatcher; - private static List> playerRoleMap = new List>(); + private static List> playerRoleMap = new(); public static bool isGuesserGamemode { get { return TORMapOptions.gameMode == CustomGamemodes.Guesser; } } public static void Postfix() { MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.ResetVaribles, Hazel.SendOption.Reliable, -1); @@ -106,9 +106,9 @@ public static RoleAssignmentData getRoleAssignmentData() { int maxImpostorRoles = Mathf.Min(impostors.Count, impCountSettings); // Fill in the lists with the roles that should be assigned to players. Note that the special roles (like Mafia or Lovers) are NOT included in these lists - Dictionary impSettings = new Dictionary(); - Dictionary neutralSettings = new Dictionary(); - Dictionary crewSettings = new Dictionary(); + Dictionary impSettings = new(); + Dictionary neutralSettings = new(); + Dictionary crewSettings = new(); impSettings.Add((byte)RoleId.Morphling, CustomOptionHolder.morphlingSpawnRate.getSelection()); impSettings.Add((byte)RoleId.Camouflager, CustomOptionHolder.camouflagerSpawnRate.getSelection()); @@ -299,7 +299,7 @@ private static void assignEnsuredRoles(RoleAssignmentData data) { (data.maxNeutralRoles > 0 && ensuredNeutralRoles.Count > 0) ))) { - Dictionary> rolesToAssign = new Dictionary>(); + Dictionary> rolesToAssign = new(); if (data.crewmates.Count > 0 && data.maxCrewmateRoles > 0 && ensuredCrewmateRoles.Count > 0) rolesToAssign.Add(RoleType.Crewmate, ensuredCrewmateRoles); if (data.crewmates.Count > 0 && data.maxNeutralRoles > 0 && ensuredNeutralRoles.Count > 0) rolesToAssign.Add(RoleType.Neutral, ensuredNeutralRoles); if (data.impostors.Count > 0 && data.maxImpostorRoles > 0 && ensuredImpostorRoles.Count > 0) rolesToAssign.Add(RoleType.Impostor, ensuredImpostorRoles); @@ -474,7 +474,7 @@ private static void assignChanceRoles(RoleAssignmentData data) { (data.maxNeutralRoles > 0 && neutralTickets.Count > 0) ))) { - Dictionary> rolesToAssign = new Dictionary>(); + Dictionary> rolesToAssign = new(); if (data.crewmates.Count > 0 && data.maxCrewmateRoles > 0 && crewmateTickets.Count > 0) rolesToAssign.Add(RoleType.Crewmate, crewmateTickets); if (data.crewmates.Count > 0 && data.maxNeutralRoles > 0 && neutralTickets.Count > 0) rolesToAssign.Add(RoleType.Neutral, neutralTickets); if (data.impostors.Count > 0 && data.maxImpostorRoles > 0 && impostorTickets.Count > 0) rolesToAssign.Add(RoleType.Impostor, impostorTickets); @@ -550,9 +550,9 @@ private static void assignModifiers() { if (modifierCount == 0) return; - List allModifiers = new List(); - List ensuredModifiers = new List(); - List chanceModifiers = new List(); + List allModifiers = new(); + List ensuredModifiers = new(); + List chanceModifiers = new(); allModifiers.AddRange(new List { RoleId.Tiebreaker, RoleId.Mini, @@ -570,8 +570,8 @@ private static void assignModifiers() { if (rnd.Next(1, 101) <= CustomOptionHolder.modifierLover.getSelection() * 10) { // Assign lover bool isEvilLover = rnd.Next(1, 101) <= CustomOptionHolder.modifierLoverImpLoverRate.getSelection() * 10; byte firstLoverId; - List impPlayer = new List(players); - List crewPlayer = new List(players); + List impPlayer = new(players); + List crewPlayer = new(players); impPlayer.RemoveAll(x => !x.Data.Role.IsImpostor || x == NekoKabocha.nekoKabocha); if (MimicK.ifOneDiesBothDie) impPlayer.RemoveAll(y => y == MimicK.mimicK || y == MimicA.mimicA); if (BomberA.ifOneDiesBothDie) impPlayer.RemoveAll(z => z == BomberA.bomberA || z == BomberB.bomberB); @@ -595,7 +595,7 @@ private static void assignModifiers() { modifierCount -= ensuredModifiers.Count; if (modifierCount <= 0) return; int chanceModifierCount = Mathf.Min(modifierCount, chanceModifiers.Count); - List chanceModifierToAssign = new List(); + List chanceModifierToAssign = new(); while (chanceModifierCount > 0 && chanceModifiers.Count > 0) { var index = rnd.Next(0, chanceModifiers.Count); RoleId modifierId = chanceModifiers[index]; @@ -687,7 +687,7 @@ private static void assignModifiersToPlayers(List modifiers, List crewPlayer = new List(playerList); + List crewPlayer = new(playerList); crewPlayer.RemoveAll(x => x.Data.Role.IsImpostor || RoleInfo.getRoleInfoForPlayer(x).Any(r => r.isNeutral)); /*if (modifiers.Contains(RoleId.Shifter)) { var crewPlayerShifter = new List(crewPlayer); @@ -805,9 +805,9 @@ private static void setRolesAgain() public class RoleAssignmentData { public List crewmates {get;set;} public List impostors {get;set;} - public Dictionary impSettings = new Dictionary(); - public Dictionary neutralSettings = new Dictionary(); - public Dictionary crewSettings = new Dictionary(); + public Dictionary impSettings = new(); + public Dictionary neutralSettings = new(); + public Dictionary crewSettings = new(); public int maxCrewmateRoles {get;set;} public int maxNeutralRoles {get;set;} public int maxImpostorRoles {get;set;} diff --git a/TheOtherRoles/Patches/TaskMasterTaskHelper.cs b/TheOtherRoles/Patches/TaskMasterTaskHelper.cs index 13f8bc85..489762f5 100644 --- a/TheOtherRoles/Patches/TaskMasterTaskHelper.cs +++ b/TheOtherRoles/Patches/TaskMasterTaskHelper.cs @@ -25,7 +25,7 @@ public static byte[] GetTaskMasterTasks(PlayerControl pc) if (!TaskMaster.isTaskMaster(pc.PlayerId)) return null; - List list = new List(10); + List list = new(10); taskMasterAddCommonTasks = SetTasksToList( ref list, MapUtilities.CachedShipStatus.CommonTasks.ToList(), @@ -49,7 +49,7 @@ private static int SetTasksToList( { if (numConfiguredTasks == 0) return 0; - List taskTypesList = new List(); + List taskTypesList = new(); playerTasks.Shuffle(); int count = 0; int numTasks = Math.Min(playerTasks.Count, numConfiguredTasks); diff --git a/TheOtherRoles/Patches/UpdatePatch.cs b/TheOtherRoles/Patches/UpdatePatch.cs index e7cb2eb7..d25d5c6f 100644 --- a/TheOtherRoles/Patches/UpdatePatch.cs +++ b/TheOtherRoles/Patches/UpdatePatch.cs @@ -502,7 +502,7 @@ static void updateVentButton(HudManager __instance) if (Deputy.handcuffedKnows.ContainsKey(CachedPlayer.LocalPlayer.PlayerId) && Deputy.handcuffedKnows[CachedPlayer.LocalPlayer.PlayerId] > 0 || MeetingHud.Instance || CachedPlayer.LocalPlayer.PlayerControl.roleCanUseVents() == false) __instance.ImpostorVentButton.Hide(); else if (CachedPlayer.LocalPlayer.PlayerControl.roleCanUseVents() && !__instance.ImpostorVentButton.isActiveAndEnabled) __instance.ImpostorVentButton.Show(); - if (Madmate.madmate.Any(x => CachedPlayer.LocalPlayer.PlayerId == x.PlayerId) && Madmate.canVent && CachedPlayer.LocalPlayer.PlayerControl != Engineer.engineer) __instance.ImpostorVentButton.transform.localPosition = __instance.UseButton.transform.localPosition + CustomButton.ButtonPositions.upperRowFarLeft; + if (Madmate.madmate.Any(x => CachedPlayer.LocalPlayer.PlayerId == x.PlayerId) && CachedPlayer.LocalPlayer.PlayerControl != Engineer.engineer) __instance.ImpostorVentButton.transform.localPosition = __instance.UseButton.transform.localPosition + CustomButton.ButtonPositions.upperRowFarLeft; else if (Madmate.madmate.Any(x => x.PlayerId == CachedPlayer.LocalPlayer.PlayerId) && Madmate.canVent && CachedPlayer.LocalPlayer.PlayerControl == Engineer.engineer) __instance.ImpostorVentButton.transform.localPosition = __instance.UseButton.transform.localPosition + CustomButton.ButtonPositions.lowerRowRight; if (CreatedMadmate.createdMadmate != null && CreatedMadmate.createdMadmate == CachedPlayer.LocalPlayer.PlayerControl && CreatedMadmate.canEnterVents) __instance.ImpostorVentButton.transform.localPosition = __instance.UseButton.transform.localPosition + CustomButton.ButtonPositions.lowerRowRight; if (CachedPlayer.LocalPlayer.PlayerControl == Ninja.ninja && Ninja.canUseVents == false) __instance.ImpostorVentButton.Hide(); diff --git a/TheOtherRoles/Patches/UsablesPatch.cs b/TheOtherRoles/Patches/UsablesPatch.cs index 2203710d..365ed827 100644 --- a/TheOtherRoles/Patches/UsablesPatch.cs +++ b/TheOtherRoles/Patches/UsablesPatch.cs @@ -359,7 +359,7 @@ static void Postfix(SwitchMinigame __instance) { [HarmonyPatch] class VitalsMinigamePatch { - private static List hackerTexts = new List(); + private static List hackerTexts = new(); [HarmonyPatch(typeof(VitalsMinigame), nameof(VitalsMinigame.Begin))] class VitalsMinigameStartPatch { @@ -504,7 +504,7 @@ static void Postfix(VitalsMinigame __instance) { [HarmonyPatch] class AdminPanelPatch { - static Dictionary> players = new Dictionary>(); + static Dictionary> players = new(); static TMPro.TextMeshPro restrictInfo = null; [HarmonyPatch(typeof(MapCountOverlay), nameof(MapCountOverlay.Update))] class MapCountOverlayUpdatePatch { @@ -560,7 +560,7 @@ static bool Prefix(MapCountOverlay __instance) { for (int i = 0; i < __instance.CountAreas.Length; i++) { CounterArea counterArea = __instance.CountAreas[i]; - List roomColors = new List(); + List roomColors = new(); players.Add(counterArea.RoomType, roomColors); if (!commsActive) @@ -570,7 +570,7 @@ static bool Prefix(MapCountOverlay __instance) { if (plainShipRoom != null && plainShipRoom.roomArea) { - HashSet hashSet = new HashSet(); + HashSet hashSet = new(); int num = plainShipRoom.roomArea.OverlapCollider(__instance.filter, __instance.buffer); int num2 = 0; for (int j = 0; j < num; j++) { diff --git a/TheOtherRoles/Players/CachedPlayer.cs b/TheOtherRoles/Players/CachedPlayer.cs index 2cbee9ab..39dcf972 100644 --- a/TheOtherRoles/Players/CachedPlayer.cs +++ b/TheOtherRoles/Players/CachedPlayer.cs @@ -19,7 +19,7 @@ public class CachedPlayer public PlayerControl PlayerControl; public PlayerPhysics PlayerPhysics; public CustomNetworkTransform NetTransform; - public GameData.PlayerInfo Data; + public NetworkedPlayerInfo Data; public byte PlayerId; public static implicit operator bool(CachedPlayer player) @@ -99,7 +99,7 @@ public static void RemoveCachedPlayerPatch(PlayerControl __instance) CachedPlayer.PlayerPtrs.Remove(__instance.Pointer); } - [HarmonyPatch(typeof(GameData), nameof(GameData.Deserialize))] + [HarmonyPatch(typeof(NetworkedPlayerInfo), nameof(NetworkedPlayerInfo.Deserialize))] [HarmonyPostfix] public static void AddCachedDataOnDeserialize() { diff --git a/TheOtherRoles/RPC.cs b/TheOtherRoles/RPC.cs index 1ccaf5a3..503bf7e9 100644 --- a/TheOtherRoles/RPC.cs +++ b/TheOtherRoles/RPC.cs @@ -664,7 +664,7 @@ public static void useUncheckedVent(int ventId, byte playerId, byte isEnter) { PlayerControl player = Helpers.playerById(playerId); if (player == null) return; // Fill dummy MessageReader and call MyPhysics.HandleRpc as the corountines cannot be accessed - MessageReader reader = new MessageReader(); + MessageReader reader = new(); byte[] bytes = BitConverter.GetBytes(ventId); if (!BitConverter.IsLittleEndian) Array.Reverse(bytes); @@ -1143,6 +1143,7 @@ public static void shifterShift(byte targetId) if (player == Moriarty.formerMoriarty) Moriarty.formerMoriarty = oldShifter; if (player == JekyllAndHyde.formerJekyllAndHyde) JekyllAndHyde.formerJekyllAndHyde = oldShifter; if (player == SchrodingersCat.schrodingersCat) SchrodingersCat.schrodingersCat = oldShifter; + if (player == SchrodingersCat.formerSchrodingersCat) SchrodingersCat.formerSchrodingersCat = oldShifter; if (Lawyer.lawyer != null && Lawyer.target == player) { @@ -1318,10 +1319,10 @@ public static void evilHackerCreatesMadmate(byte targetId) if (CachedPlayer.LocalPlayer.PlayerControl == EvilHacker.evilHacker) EvilHacker.acTokenCommon ??= new("evilHacker.common1"); - // JackalХ + // Jackalバグ対応 List tmpFormerJackals = new(Jackal.formerJackals); - // ʤץ쥤`MadmateˤʤäϤϥ`ȥҪ굱Ƥ + // タスクがないプレイヤーがMadmateになった場合はショートタスクを必要数割り当てる if (Helpers.hasFakeTasks(player)) { if (CreatedMadmate.hasTasks) @@ -1332,7 +1333,7 @@ public static void evilHackerCreatesMadmate(byte targetId) } erasePlayerRoles(player.PlayerId, true, true); - // JackalХ + // Jackalバグ対応 Jackal.formerJackals = tmpFormerJackals; CreatedMadmate.createdMadmate = player; @@ -1362,7 +1363,7 @@ public static void shareRealTasks(MessageReader reader) float x = System.BitConverter.ToSingle(taskTmp, 0); taskTmp = reader.ReadBytes(4); float y = System.BitConverter.ToSingle(taskTmp, 0); - Vector2 pos = new Vector2(x, y); + Vector2 pos = new(x, y); if (!MapBehaviourPatch.realTasks.ContainsKey(playerId)) MapBehaviourPatch.realTasks[playerId] = new Il2CppSystem.Collections.Generic.List(); MapBehaviourPatch.realTasks[playerId].Add(pos); } @@ -1393,7 +1394,7 @@ public static void fortuneTellerUsedDivine(byte fortuneTellerId, byte targetId) GameHistory.overrideDeathReasonAndKiller(target, DeadPlayer.CustomDeathReason.Divined, fortuneTeller); } - // ݥ`ΈϤռλäʸӡʾ + // インポスターの場合は占い師の位置に矢印を表示 if (PlayerControl.LocalPlayer.Data.Role.IsImpostor) { FortuneTeller.fortuneTellerMessage(ModTranslation.getString("fortuneTellerDivinedSomeone"), 7f, Color.white); @@ -2333,7 +2334,7 @@ public static void plantBomb(byte playerId) public static void releaseBomb(byte killer, byte target) { - // ͬrѺǥ֥륭뤬kΤֹ뤿BomberAһܤȡäƤgФ + // 同時押しでダブルキルが発生するのを防止するためにBomberAで一度受け取ってから実行する if (CachedPlayer.LocalPlayer.PlayerControl == BomberA.bomberA) { if (BomberA.bombTarget != null && BomberB.bombTarget != null) @@ -2710,6 +2711,11 @@ public static void thiefStealsRole(byte playerId) { JekyllAndHyde.jekyllAndHyde = thief; JekyllAndHyde.formerJekyllAndHyde = target; } + if (target == SchrodingersCat.schrodingersCat) + { + SchrodingersCat.schrodingersCat = thief; + SchrodingersCat.formerSchrodingersCat = target; + } if (target == Guesser.evilGuesser) { Guesser.evilGuesser = thief; diff --git a/TheOtherRoles/Resources/BrainwashButton.png b/TheOtherRoles/Resources/BrainwashButton.png new file mode 100644 index 00000000..7e74d996 Binary files /dev/null and b/TheOtherRoles/Resources/BrainwashButton.png differ diff --git a/TheOtherRoles/Resources/Cross.png b/TheOtherRoles/Resources/Cross.png new file mode 100644 index 00000000..d9225055 Binary files /dev/null and b/TheOtherRoles/Resources/Cross.png differ diff --git a/TheOtherRoles/Resources/DecelerationButton.png b/TheOtherRoles/Resources/DecelerateButton.png similarity index 100% rename from TheOtherRoles/Resources/DecelerationButton.png rename to TheOtherRoles/Resources/DecelerateButton.png diff --git a/TheOtherRoles/Resources/FungleVentSealed.png b/TheOtherRoles/Resources/FungleVentSealed.png new file mode 100644 index 00000000..16b157c5 Binary files /dev/null and b/TheOtherRoles/Resources/FungleVentSealed.png differ diff --git a/TheOtherRoles/Resources/HelpButton.png b/TheOtherRoles/Resources/HelpButton.png index c414eb91..d54cde30 100644 Binary files a/TheOtherRoles/Resources/HelpButton.png and b/TheOtherRoles/Resources/HelpButton.png differ diff --git a/TheOtherRoles/Resources/HideNSeekArrowButton.png b/TheOtherRoles/Resources/HideNSeekArrowButton.png index 9e8708a8..e3f35b0e 100644 Binary files a/TheOtherRoles/Resources/HideNSeekArrowButton.png and b/TheOtherRoles/Resources/HideNSeekArrowButton.png differ diff --git a/TheOtherRoles/Resources/Remember.png b/TheOtherRoles/Resources/Remember.png deleted file mode 100644 index cd1cc80d..00000000 Binary files a/TheOtherRoles/Resources/Remember.png and /dev/null differ diff --git a/TheOtherRoles/Resources/RightPanelCloseButton.png b/TheOtherRoles/Resources/RightPanelCloseButton.png new file mode 100644 index 00000000..0ca9f81d Binary files /dev/null and b/TheOtherRoles/Resources/RightPanelCloseButton.png differ diff --git a/TheOtherRoles/Resources/SoundEffects/blackmailerSilence.raw b/TheOtherRoles/Resources/SoundEffects/blackmailerSilence.raw new file mode 100644 index 00000000..5ae0418d Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/blackmailerSilence.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/bomberPlantBomb.raw b/TheOtherRoles/Resources/SoundEffects/bomberPlantBomb.raw new file mode 100644 index 00000000..384248c7 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/bomberPlantBomb.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/jekyllAndHydeDrug.raw b/TheOtherRoles/Resources/SoundEffects/jekyllAndHydeDrug.raw new file mode 100644 index 00000000..8f5daaef Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/jekyllAndHydeDrug.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/moriartyBrainwash.raw b/TheOtherRoles/Resources/SoundEffects/moriartyBrainwash.raw new file mode 100644 index 00000000..04c2f610 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/moriartyBrainwash.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/ninjaStealth.raw b/TheOtherRoles/Resources/SoundEffects/ninjaStealth.raw new file mode 100644 index 00000000..49d6c8c6 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/ninjaStealth.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/plagueDoctorSyringe.raw b/TheOtherRoles/Resources/SoundEffects/plagueDoctorSyringe.raw new file mode 100644 index 00000000..1d656527 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/plagueDoctorSyringe.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/sherlockInvestigate.raw b/TheOtherRoles/Resources/SoundEffects/sherlockInvestigate.raw new file mode 100644 index 00000000..6b747db0 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/sherlockInvestigate.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/teleporterSample.raw b/TheOtherRoles/Resources/SoundEffects/teleporterSample.raw new file mode 100644 index 00000000..040ed820 Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/teleporterSample.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/teleporterTeleport.raw b/TheOtherRoles/Resources/SoundEffects/teleporterTeleport.raw new file mode 100644 index 00000000..354d744a Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/teleporterTeleport.raw differ diff --git a/TheOtherRoles/Resources/SoundEffects/veteranAlert.raw b/TheOtherRoles/Resources/SoundEffects/veteranAlert.raw new file mode 100644 index 00000000..b800a0ce Binary files /dev/null and b/TheOtherRoles/Resources/SoundEffects/veteranAlert.raw differ diff --git a/TheOtherRoles/Resources/stringData.json b/TheOtherRoles/Resources/stringData.json index 52369954..154650d2 100644 --- a/TheOtherRoles/Resources/stringData.json +++ b/TheOtherRoles/Resources/stringData.json @@ -125,7 +125,7 @@ }, "shieldFirstKill": { "0": "Shield Last Game First Kill", - "11": "\u30b7\u30fc\u30eb\u30c9\u306b\u3088\u308b\u30e9\u30b9\u30c8\u30b2\u30fc\u30e0\u30fb\u30d5\u30a1\u30fc\u30b9\u30c8\u30ad\u30eb", + "11": "\u524d\u56de\u306e\u8a66\u5408\u306b\u521d\u624b\u30ad\u30eb\u3055\u308c\u305f\u30d7\u30ec\u30a4\u30e4\u30fc\u306b\u521d\u624b\u306e\u307f\u30b7\u30fc\u30eb\u30c9\u3092\u4ed8\u4e0e", "13": "\u5c06\u62a4\u76fe\u7ed9\u4e88\u4e0a\u4e00\u8f6e\u88ab\u9996\u5200\u7684\u73a9\u5bb6", "14": "\u5c07\u8b77\u76fe\u7d66\u4e88\u4e0a\u4e00\u8f2a\u88ab\u9996\u5200\u7684\u73a9\u5bb6" }, @@ -1254,6 +1254,7 @@ }, "jackalCanSabotageLights": { "0": "Jackal Can Sabotage Lights", + "11": "\u30b8\u30e3\u30c3\u30ab\u30eb\u304c\u505c\u96fb\u3092\u8d77\u3053\u305b\u308b", "13": "\u8c7a\u72fc\u53ef\u4ee5\u7834\u574f\u706f\u5149" }, "jackalAndSidekickHaveImpostorVision": { @@ -1294,6 +1295,7 @@ }, "sidekickCanSabotageLights": { "0": "Sidekick Can Sabotage Lights", + "11": "\u30b5\u30a4\u30c9\u30ad\u30c3\u30af\u304c\u505c\u96fb\u3092\u8d77\u3053\u305b\u308b", "13": "\u8ddf\u73ed\u53ef\u4ee5\u7834\u574f\u706f\u5149" }, "jackalPromotedFromSidekickCanCreateSidekick": { @@ -3643,6 +3645,7 @@ }, "showChatNotification": { "0": "Show Chat Notifications", + "11": "\u753b\u9762\u4e0a\u90e8\u306e\u30c1\u30e3\u30c3\u30c8\u901a\u77e5\u3092\u8868\u793a\u3059\u308b", "13": "\u542f\u7528\u804a\u5929\u63d0\u793a" }, "modOptionsText": { @@ -3925,7 +3928,7 @@ }, "buttonsActionButton": { "0": "Action", - "11": "\u884c\u52d5", + "11": "\u30a2\u30af\u30b7\u30e7\u30f3", "13": "\u4f7f\u7528\u6280\u80fd" }, "buttonsDescription": { @@ -3940,22 +3943,27 @@ }, "buttonLeftClick": { "0": "Left Click: {0}", + "11": "\u5de6\u30af\u30ea\u30c3\u30af: {0}", "13": "\u5de6\u952e: {0}" }, "buttonGuess": { "0": "Guess", + "11": "\u63a8\u6e2c", "13": "\u731c\u6d4b" }, "buttonTrack": { "0": "Track", + "11": "\u8ffd\u8de1", "13": "\u8ffd\u8e2a" }, "buttonForceExile": { "0": "Force Exile", + "11": "\u5f37\u5236\u8ffd\u653e", "13": "\u88c1\u51b3" }, "buttonSwap": { "0": "Swap", + "11": "\u30b9\u30ef\u30c3\u30d7", "13": "\u6362\u7968" }, "eventKilled": { @@ -4416,12 +4424,13 @@ }, "modifiersAreHidden": { "0": "Hide After Death Modifiers", - "11": "\u6b7b\u5f8c\u306e\u5c5e\u6027\u3092\u96a0\u3059", + "11": "\u6b7b\u4ea1\u3059\u308b\u307e\u3067\u5c5e\u6027\u3092\u96a0\u3059", "13": "\u9690\u85cf\u6b7b\u540e\u53d1\u6325\u6548\u679c\u7684\u526f\u804c\u4e1a", "14": "\u96b1\u85cf\u6b7b\u5f8c\u767c\u63ee\u6548\u679c\u7684\u526f\u8077\u696d" }, "vipbloodyHidden": { "0": "VIP & Bloody Are Hidden", + "11": "VIP\u3068\u30d6\u30e9\u30c3\u30c7\u30a3\u3092\u96a0\u3059", "13": "\u9690\u85cfVIP\u4e0e\u6e85\u8840\u8005" }, "modifiersQuantity": { @@ -5582,6 +5591,7 @@ }, "moriartyIndicator": { "0": "The Moriarty has killed someone!", + "11": "\u30e2\u30ea\u30a2\u30fc\u30c6\u30a3\u304c\u8ab0\u304b\u3092\u6bba\u3057\u305f\uff01", "13": "\u83ab\u91cc\u4e9a\u8482\u5f3a\u5927\u7684\u80fd\u529b\u8feb\u4f7f\u73a9\u5bb6\u6b7b\u4ea1\uff01" }, "akujo": { @@ -5765,13 +5775,13 @@ }, "blackmailerIntroDesc": { "0": "Blackmail those who seek to hurt you", - "11": "\u30af\u30eb\u30fc\u3092\u8105\u8feb\u3057\u3066\u9ed9\u3089\u305b\u308d", + "11": "\u6c88\u9ed9\u306e\u4f1a\u8b70", "13": "\u52d2\u7d22\u5176\u4ed6\u73a9\u5bb6", "14": "\u4e0d\u8a31\u8aaa\u8a71\uff01" }, "blackmailerShortDesc": { "0": "Blackmail those who seek to hurt you", - "11": "\u30af\u30eb\u30fc\u3092\u8105\u8feb\u3057\u3066\u9ed9\u3089\u305b\u308d", + "11": "\u6c88\u9ed9\u306e\u4f1a\u8b70", "13": "\u52d2\u7d22\u8bd5\u56fe\u4f24\u5bb3\u4f60\u7684\u73a9\u5bb6", "14": "\u52d2\u7d22\u8a66\u5716\u50b7\u5bb3\u59b3\u7684\u73a9\u5bb6" }, @@ -6029,38 +6039,47 @@ }, "schrodingersCat": { "0": "Schrodinger's Cat", + "11": "\u30b7\u30e5\u30ec\u30c7\u30a3\u30f3\u30ac\u30fc\u306e\u732b", "13": "\u859b\u5b9a\u8c14\u7684\u732b" }, "schrodingersCatIntroDesc": { "0": "Get killed and join the killer's team", + "11": "\u6bba\u3055\u308c\u3066\u9663\u55b6\u306b\u6240\u5c5e\u3057\u308d", "13": "\u901a\u8fc7\u88ab\u51fb\u6740\u52a0\u5165\u51f6\u624b\u9635\u8425" }, "schrodingersCatShortDesc": { "0": "Get killed and join the killer's team", + "11": "\u6bba\u3055\u308c\u3066\u9663\u55b6\u306b\u6240\u5c5e\u3057\u308d", "13": "\u901a\u8fc7\u88ab\u51fb\u6740\u52a0\u5165\u51f6\u624b\u9635\u8425" }, "schrodingersCatKillCooldown": { "0": "Kill Cooldown", + "11": "\u30ad\u30eb\u30af\u30fc\u30eb\u30c0\u30a6\u30f3", "13": "\u859b\u5b9a\u8c14\u7684\u732b\u51fb\u6740\u51b7\u5374" }, "schrodingersCatBecomesImpostor": { "0": "Becomes Impostor Instead Of Madmate", + "11": "\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc\u306b\u30ad\u30eb\u3055\u308c\u305f\u969b\u306b\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc\u306b\u306a\u308b", "13": "\u88ab\u5185\u9b3c\u51fb\u6740\u65f6\u6210\u4e3a\u5185\u9b3c\u800c\u5e76\u975e\u53db\u5f92" }, "schrodingersCatCantKillUntilLastOne": { "0": "Cant Kill Until Last One On Team", + "11": "\u9663\u55b6\u306e\u6700\u5f8c\u306e\u4e00\u4eba\u306b\u306a\u308b\u307e\u3067\u30ad\u30eb\u3067\u304d\u306a\u3044", "13": "\u76f4\u5230\u6210\u4e3a\u6240\u5728\u9635\u8425\u7684\u6700\u540e\u4e00\u4eba\u4e0d\u53ef\u51fb\u6740" }, "schrodingersCatJustDieOnKilledByCrew": { "0": "Just Dies If Killed By Crewmate", + "11": "\u30af\u30eb\u30fc\u30e1\u30a4\u30c8\u306b\u30ad\u30eb\u3055\u308c\u305f\u5834\u5408\u6b7b\u4ea1\u3059\u308b", "13": "\u88ab\u8239\u5458\u51fb\u6740\u65f6\u76f4\u63a5\u6b7b\u4ea1" }, "schrodingersCatHideRole": { "0": "Hide Schrodinger's Cat Role", + "11": "\u30b7\u30e5\u30ec\u30c7\u30a3\u30f3\u30ac\u30fc\u306e\u732b\u306e\u5f79\u8077\u3092\u96a0\u3059", "13": "\u9690\u85cf\u859b\u5b9a\u8c14\u7684\u732b\u804c\u4e1a" }, "schrodingersCatCanChooseTeam": { "0": "Can Choose Which Team To Be On", + "11": "\u3069\u306e\u9663\u55b6\u306b\u6240\u5c5e\u3059\u308b\u304b\u9078\u3079\u308b", "13": "\u5b8c\u6210\u4efb\u52a1\u540e\u53ef\u81ea\u7531\u9009\u62e9\u9635\u8425" }, "colorSalmon": { @@ -6167,30 +6186,37 @@ }, "colorFuchsia": { "0": "Fuchsia", + "11": "\u30d5\u30e5\u30fc\u30b7\u30e3", "13": "\u7d2b\u7ea2\u8272" }, "colorRoyalGreen": { "0": "Royal Green", + "11": "\u30ed\u30a4\u30e4\u30eb\u30b0\u30ea\u30fc\u30f3", "13": "\u7687\u5bb6\u7eff" }, "colorSlime": { "0": "Slime", + "11": "\u30b9\u30e9\u30a4\u30e0", "13": "\u8367\u5149\u7eff" }, "colorNavy": { "0": "Navy", + "11": "\u30cd\u30a4\u30d3\u30fc", "13": "\u85cf\u84dd\u8272" }, "colorDarkness": { "0": "Darkness", + "11": "\u30c0\u30fc\u30af\u30cd\u30b9", "13": "\u6697\u9ed1\u8272" }, "colorOcean": { "0": "Ocean", + "11": "\u30aa\u30fc\u30b7\u30e3\u30f3", "13": "\u6d77\u84dd\u8272" }, "colorSundown": { "0": "Sundown", + "11": "\u30b5\u30f3\u30c0\u30a6\u30f3", "13": "\u65e5\u843d\u9ec4" }, "CamoText": { @@ -7029,6 +7055,7 @@ }, "schrodingersCatFullDesc": { "0": "The Schrodinger's Cat is a Neutral role whom, when killed for the first time,\njoins the killer's team. The Schrodinger's Cat will just die if being killed for\nthe second time or killed by a Crewmate killer (depending on the options).\nThe Schrodinger's Cat may find themselves Crewmates at the beginning of the\ngame, only revealing their identity when all tasks have been completed. They may\nalso choose their teams freely when all tasks completed.", + "11": "\u30b7\u30e5\u30ec\u30c7\u30a3\u30f3\u30ac\u30fc\u306e\u732b\u306f\u30b2\u30fc\u30e0\u958b\u59cb\u6642\u306b\u306f\u52dd\u5229\u6761\u4ef6\u3092\u6301\u305f\u306a\u3044\u7b2c3\u9663\u55b6\n\u30ad\u30eb\u3055\u308c\u308b\u3068\u30ad\u30e9\u30fc\u306e\u9663\u55b6\u306b\u6240\u5c5e\u3057\u52dd\u5229\u6761\u4ef6\u3092\u5f97\u308b\n\n\u8ffd\u653e\u3055\u308c\u305f\u5834\u5408\u306f\u30af\u30eb\u30fc\u9663\u55b6\u306b\u306a\u308b\n\n\u6240\u5c5e\u3057\u305f\u9663\u55b6\u3054\u3068\u306b\u80fd\u529b\u3092\u5f97\u308b\n\u30b8\u30e3\u30c3\u30ab\u30eb: \u30ad\u30eb\n\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc: \u30ad\u30eb\u30fb\u30b5\u30dc\u30bf\u30fc\u30b8\u30e5 / \u80fd\u529b\u306a\u3057 (\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u3088\u308b\uff09\n\u30af\u30eb\u30fc\u30e1\u30a4\u30c8: \u80fd\u529b\u306a\u3057\u3001\u30bf\u30b9\u30af\u306a\u3057", "13": "\u859b\u5b9a\u8c14\u7684\u732b\u662f\u4e00\u4e2a\u53ef\u4ee5\u5728\u7b2c\u4e00\u6b21\u88ab\u51fb\u6740\u65f6\u52a0\u5165\u51f6\u624b\u9635\u8425\u7684\u4e2d\u7acb\u804c\u4e1a\u3002\u5f53\u859b\u5b9a\u8c14\u7684\u732b\u88ab\u51fb\u6740\n\u7b2c\u4e8c\u6b21\u6216\uff0c\u6839\u636e\u8bbe\u7f6e\uff0c\u88ab\u8239\u5458\u804c\u4e1a\u51fb\u6740\u65f6\uff0c\u4ed6\u4eec\u5c06\u76f4\u63a5\u6b7b\u4ea1\u3002\u859b\u5b9a\u8c14\u7684\u732b\u5728\u521a\u5f00\u59cb\u53ef\u80fd\u4f1a\n\u8bef\u4ee5\u4e3a\u81ea\u5df1\u662f\u666e\u901a\u8239\u5458\uff0c\u53ea\u6709\u5728\u5b8c\u6210\u6240\u6709\u4efb\u52a1\u65f6\u624d\u89c9\u9192\u53d1\u73b0\u81ea\u5df1\u771f\u5b9e\u8eab\u4efd\u3002\u6839\u636e\u8bbe\u7f6e\uff0c\n\u4ed6\u4eec\u8fd8\u53ef\u4ee5\u81ea\u7531\u9009\u62e9\u9635\u8425\u6765\u52a0\u5165\u3002" }, "bloodyFullDesc": { @@ -7530,38 +7557,47 @@ }, "niceGuessercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "niceGuessercommon1AchievementGoal": { "0": "Guess A Player", + "11": "\u30ca\u30a4\u30b9\u30b2\u30c3\u30b5\u30fc\u3067\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u4e00\u540d\u73a9\u5bb6" }, "niceGuessercommon1AchievementTitle": { "0": "Guess!", + "11": "\u5b8c\u7f8e\u306a\u5224\u65ad", "13": "\u731c\u6d4b\u8005\uff01" }, "niceGuesserchallenge1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "niceGuesserchallenge1AchievementGoal": { "0": "Guess 3 Players", + "11": "\u30ca\u30a4\u30b9\u30b2\u30c3\u30b5\u30fc\u3067\u8a66\u5408\u4e2d\u306b3\u4eba\u3092\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u81f3\u5c113\u540d\u73a9\u5bb6" }, "niceGuesserchallenge1AchievementTitle": { "0": "Master Of Guesser", + "11": "\u63a8\u6e2c\u306e\u9054\u4eba", "13": "\u8d4c\u795e\u9644\u4f53" }, "niceGuesserchallenge2AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "niceGuesserchallenge2AchievementGoal": { "0": "Guess The Evil Guesser", + "11": "\u30a4\u30d3\u30eb\u30b2\u30c3\u30b5\u30fc\u3092\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u90aa\u6076\u7684\u8d4c\u602a" }, "niceGuesserchallenge2AchievementTitle": { "0": "Battle Of The Two", + "11": "\u6b63\u7fa9\u3068\u60aa", "13": "\u72d9\u51fb\u624b\u7684\u5bf9\u51b3" }, "seercommon1AchievementCond": { @@ -8045,626 +8081,782 @@ }, "noisemakercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "noisemakercommon1AchievementGoal": { "0": "Make A Successful Alert", + "11": "\u30a2\u30e9\u30fc\u30c8\u3092\u6210\u529f\u3055\u305b\u308b\u3002", "13": "\u5e7f\u64ad\u4e00\u6b21\u6210\u529f\u7684\u6b7b\u4ea1\u8b66\u544a" }, "noisemakercommon1AchievementTitle": { "0": "Alert Active", + "11": "\u8b66\u5831\u306e\u97f3", "13": "\u5168\u4f53\u6ce8\u610f\uff01" }, "noisemakerchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "noisemakerchallengeAchievementGoal": { "0": "Make 3 Successful Alerts", + "11": "\u30a2\u30e9\u30fc\u30c8\u30923\u56de\u6210\u529f\u3055\u305b\u308b\u3002", "13": "\u5e7f\u64ad\u81f3\u5c113\u6b21\u6210\u529f\u7684\u6b7b\u4ea1\u8b66\u544a" }, "noisemakerchallengeAchievementTitle": { "0": "Warn The Crew", + "11": "\u4e57\u7d44\u54e1\u3078\u306e\u8b66\u5831", "13": "\u8b66\u60d5\u5427\uff0c\u8239\u5458\u4eec" }, "mafiosoanother1AchievementCond": { "0": "You Must Be Alive When The Godfather Is Killed", + "11": "\u30b4\u30c3\u30c9\u30d5\u30a1\u30fc\u30b6\u30fc\u304c\u30ad\u30eb\u3055\u308c\u305f\u969b\u306b\u81ea\u8eab\u304c\u751f\u5b58\u3057\u3066\u3044\u308b\u3053\u3068\u3002", "13": "\u4f60\u5fc5\u987b\u5728\u6559\u7236\u6b7b\u65f6\u5b58\u6d3b" }, "mafiosoanother1AchievementGoal": { "0": "Have The Godfather Killed", + "11": "\u30b4\u30c3\u30c9\u30d5\u30a1\u30fc\u30b6\u30fc\u304c\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u6559\u7236\u6b7b\u540e\u83b7\u5f97\u51fb\u6740\u80fd\u529b" }, "mafiosoanother1AchievementTitle": { "0": "Boss Around!", + "11": "\u65b0\u305f\u306a\u30dc\u30b9", "13": "\u52a0\u5b98\u8fdb\u7235\uff01" }, "janitorcommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "janitorcommon1AchievementGoal": { "0": "Clean A Dead Body", + "11": "\u30b8\u30e3\u30cb\u30bf\u30fc\u3067\u6b7b\u4f53\u3092\u6383\u9664\u3059\u308b\u3002", "13": "\u6e05\u6d01\u4e00\u540d\u73a9\u5bb6\u7684\u5c38\u4f53" }, "janitorcommon1AchievementTitle": { "0": "Leave No Trace", + "11": "\u8a3c\u62e0\u3092\u6b8b\u3055\u305a", "13": "\u6beb\u65e0\u75d5\u8ff9" }, "morphlingcommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "morphlingcommon1AchievementGoal": { "0": "Sample And Morph Into A Player", + "11": "\u30b5\u30f3\u30d7\u30eb\u3092\u53d6\u5f97\u3057\u3001\u5909\u8eab\u3059\u308b\u3002", "13": "\u53d6\u6837\u5e76\u5316\u5f62\u4e3a\u4e00\u540d\u73a9\u5bb6" }, "morphlingcommon1AchievementTitle": { "0": "Messed Up", + "11": "\u79c1\u3053\u305d\u304c\u672c\u7269", "13": "\u5f7b\u5e95\u6df7\u4e71" }, "morphlinganother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "morphlinganother1AchievementGoal": { "0": "Get Killed While In The Victim's Outfit", + "11": "\u5909\u8eab\u3057\u305f\u72b6\u614b\u3067\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u5316\u5f62\u671f\u95f4\u88ab\u51fb\u6740" }, "morphlinganother1AchievementTitle": { "0": "Discovered...", + "11": "\u79c1\u306f\u507d\u7269", "13": "\u88ab\u53d1\u73b0\u4e86..." }, "morphlingchallengeAchievementCond": { "0": "You Must Kill Someone While Morphing", + "11": "\u5909\u8eab\u4e2d\u306b\u8ab0\u304b\u3092\u30ad\u30eb\u3059\u308b\u3053\u3068\u3002", "13": "\u4f60\u5fc5\u987b\u5728\u5316\u5f62\u671f\u95f4\u51fb\u6740\u4e00\u540d\u73a9\u5bb6" }, "morphlingchallengeAchievementGoal": { "0": "Exile Your Morph Target", + "11": "\u5909\u8eab\u5bfe\u8c61\u3092\u8ffd\u653e\u3055\u305b\u308b\u3002", "13": "\u9a71\u9010\u88ab\u5316\u5f62\u7684\u5bf9\u8c61" }, "morphlingchallengeAchievementTitle": { "0": "You Are All Fooled!", + "11": "\u51a4\u7f6a", "13": "\u6df7\u6c8c\uff01" }, "camouflagercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "camouflagercommon1AchievementGoal": { "0": "Activate The Camouflage", + "11": "\u30ab\u30e2\u30d5\u30e9\u30fc\u30b8\u30e5\u3092\u767a\u52d5\u3059\u308b\u3002", "13": "\u542f\u7528\u9690\u853d\u6280\u80fd" }, "camouflagercommon1AchievementTitle": { "0": "Black And White", + "11": "\u6f06\u9ed2\u3068\u7d14\u767d", "13": "\u9ed1\u4e0e\u767d" }, "camouflageranother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "camouflageranother1AchievementGoal": { "0": "Get Yourself Killed While Camouflage", + "11": "\u30ab\u30e2\u30d5\u30e9\u30fc\u30b8\u30e5\u4e2d\u306b\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u9690\u853d\u671f\u95f4\u88ab\u6740\u5bb3" }, "camouflageranother1AchievementTitle": { "0": "Eat Your Own Medicine", + "11": "\u4eba\u6df7\u307f\u306b\u7d1b\u308c\u3066", "13": "\u4ee5\u5176\u4eba\u4e4b\u9053\u8fd8\u6cbb\u5176\u4eba\u4e4b\u8eab" }, "camouflagerchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "camouflagerchallengeAchievementGoal": { "0": "Have At Least 3 Players Killed During Camouflage", + "11": "\u30ab\u30e2\u30d5\u30e9\u30fc\u30b8\u30e5\u4e2d\u306b3\u4eba\u306e\u30d7\u30ec\u30a4\u30e4\u30fc\u304c\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u9690\u853d\u671f\u95f4\u81f3\u5c11\u67093\u540d\u73a9\u5bb6\u88ab\u51fb\u6740" }, "camouflagerchallengeAchievementTitle": { "0": "Massacre", + "11": "\u5927\u6df7\u4e71", "13": "\u5927\u5c60\u6740" }, "vampirecommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "vampirecommon1AchievementGoal": { "0": "Bite A Player", + "11": "\u30af\u30eb\u30fc\u3092\u5438\u8840\u3059\u308b\u3002", "13": "\u54ac\u6740\u4e00\u540d\u73a9\u5bb6" }, "vampirecommon1AchievementTitle": { "0": "Blood Straining", + "11": "\u3042\u305f\u3057\u30f4\u30a1\u30f3\u30d1\u30a4\u30a2", "13": "\u6591\u9a73\u8840\u8ff9" }, "vampirechallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "vampirechallengeAchievementGoal": { "0": "Report The Bitten Player's Body Within 3 Seconds After His Death", + "11": "\u5438\u8840\u306b\u3088\u3063\u3066\u6b7b\u4ea1\u3057\u305f\u30af\u30eb\u30fc\u306e\u6b7b\u4f53\u304c\u6b7b\u5f8c3\u79d2\u4ee5\u5185\u306b\u30ec\u30dd\u30fc\u30c8\u3055\u308c\u308b\u3002", "13": "\u5728\u88ab\u5438\u8840\u7684\u73a9\u5bb6\u6b7b\u4ea1\u540e3\u79d2\u4e4b\u5185\u62a5\u544a\u4ed6\u7684\u5c38\u4f53" }, "vampirechallengeAchievementTitle": { "0": "Flawless Crime", + "11": "\u5b8c\u5168\u72af\u7f6a", "13": "\u5b8c\u7f8e\u7684\u72af\u7f6a" }, "erasercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "erasercommon1AchievementGoal": { "0": "Erase One Player's Role", + "11": "\u8ab0\u304b\u306e\u5f79\u8077\u3092\u6d88\u53bb\u3059\u308b\u3002", "13": "\u62b9\u9664\u4e00\u540d\u73a9\u5bb6\u7684\u804c\u4e1a" }, "erasercommon1AchievementTitle": { "0": "Say Goodbye To Your Role", + "11": "\u30d7\u30ec\u30bc\u30f3\u30c8", "13": "\u5bf9\u4f60\u7684\u804c\u4e1a\u8bf4\u518d\u89c1" }, "eraseranother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "eraseranother1AchievementGoal": { "0": "Erase An Impostor's Role", + "11": "\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc\u306e\u5f79\u8077\u3092\u6d88\u53bb\u3059\u308b\u3002", "13": "\u62b9\u9664\u4e00\u540d\u5185\u9b3c\u7684\u804c\u4e1a" }, "eraseranother1AchievementTitle": { "0": "I Didn't Mean It", + "11": "\u60aa\u6c17\u306f\u306a\u304b\u3063\u305f", "13": "\u6211\u4e0d\u662f\u6545\u610f\u7684" }, "eraserchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "eraserchallengeAchievementGoal": { "0": "Erase 3 Players' Roles", + "11": "\u8a66\u5408\u4e2d\u306b3\u4eba\u4ee5\u4e0a\u306e\u5f79\u8077\u3092\u6d88\u53bb\u3059\u308b\u3002", "13": "\u62b9\u96643\u540d\u73a9\u5bb6\u7684\u804c\u4e1a" }, "eraserchallengeAchievementTitle": { "0": "From Useful To Useless", + "11": "\u6709\u7528\u304b\u3089\u7121\u7528", "13": "\u4ece\u6709\u7528\u5230\u65e0\u7528" }, "trickstercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "trickstercommon1AchievementGoal": { "0": "Have The Trickster Boxes Converted To Vents", + "11": "\u7bb1\u3092\u6d3b\u6027\u5316\u3055\u305b\u308b\u3002", "13": "\u653e\u7f6e3\u4e2a\u9a97\u672f\u76d2\u5b50\u5e76\u8fde\u6210\u7ba1\u9053" }, "trickstercommon1AchievementTitle": { "0": "New Vents", + "11": "\u50d5\u3060\u3051\u306e\u7bb1", "13": "\u65b0\u7684\u901a\u98ce\u7ba1" }, "trickstercommon2AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "trickstercommon2AchievementGoal": { "0": "Use Your Lights Out Ability", + "11": "\u5f37\u5236\u505c\u96fb\u3092\u4f7f\u7528\u3059\u308b\u3002", "13": "\u7528\u4f60\u7684\u5173\u706f\u6280\u80fd" }, "trickstercommon2AchievementTitle": { "0": "Lights Out", + "11": "\u95c7\u306b\u7d1b\u308c\u3066", "13": "\u5f3a\u5236\u7184\u706f" }, "tricksterchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "tricksterchallengeAchievementGoal": { "0": "Have At Least 2 Players Killed During Your Lights Out", + "11": "\u5f37\u5236\u505c\u96fb\u4e2d\u306b2\u4eba\u4ee5\u4e0a\u304c\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u5f3a\u5236\u5173\u706f\u671f\u95f4\u81f3\u5c11\u67092\u540d\u73a9\u5bb6\u88ab\u6740\u5bb3" }, "tricksterchallengeAchievementTitle": { "0": "Going Too Soon", + "11": "\u6697\u95c7\u306e\u6697\u6bba\u8005", "13": "\u8d70\u5f97\u592a\u65e9\u4e86" }, "cleanercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "cleanercommon1AchievementGoal": { "0": "Clean A Dead Body", + "11": "\u30af\u30ea\u30fc\u30ca\u30fc\u3067\u6b7b\u4f53\u3092\u6383\u9664\u3059\u308b\u3002", "13": "\u6e05\u7406\u4e00\u540d\u73a9\u5bb6\u7684\u5c38\u4f53" }, "cleanercommon1AchievementTitle": { "0": "Clean Up", + "11": "\u304d\u308c\u3044\u597d\u304d", "13": "\u6253\u626b\u5e72\u51c0" }, "cleanerchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "cleanerchallengeAchievementGoal": { "0": "Clean 3 Dead Bodies", + "11": "3\u6b7b\u4f53\u4ee5\u4e0a\u6383\u9664\u3059\u308b\u3002", "13": "\u6e05\u7406\u81f3\u5c113\u540d\u73a9\u5bb6\u7684\u5c38\u4f53" }, "cleanerchallengeAchievementTitle": { "0": "No More Dead Bodies", + "11": "\u5143\u304b\u3089\u6b7b\u4f53\u306a\u3069\u7121\u3044", "13": "\u518d\u65e0\u5c38\u4f53\uff01" }, "warlockcommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "warlockcommon1AchievementGoal": { "0": "Curse And Kill A Player", + "11": "\u30af\u30eb\u30fc\u3092\u546a\u6bba\u3059\u308b\u3002", "13": "\u8bc5\u5492\u5e76\u51fb\u6740\u4e00\u540d\u73a9\u5bb6" }, "warlockcommon1AchievementTitle": { "0": "I Curse You!", + "11": "\u546a\u3063\u3066\u3084\u308b", "13": "\u6211\u8bc5\u5492\u4f60\uff01" }, "warlockanother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "warlockanother1AchievementGoal": { "0": "Curse And Kill Yourself", + "11": "\u81ea\u8eab\u3092\u546a\u6bba\u3059\u308b\u3002", "13": "\u8bc5\u5492\u5e76\u5c06\u81ea\u5df1\u51fb\u6740" }, "warlockanother1AchievementTitle": { "0": "Be Careful!", + "11": "\u546a\u308f\u308c\u3066\u3084\u308b", "13": "\u5c0f\u5fc3\u70b9\u5427" }, "warlockchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "warlockchallengeAchievementGoal": { "0": "Kill At Least 3 Players With Your Curse", + "11": "\u30af\u30eb\u30fc\u30923\u4eba\u4ee5\u4e0a\u546a\u6bba\u3059\u308b\u3002", "13": "\u7528\u4f60\u7684\u5492\u6740\u81f3\u5c11\u51fb\u67403\u540d\u73a9\u5bb6" }, "warlockchallengeAchievementTitle": { "0": "Deadly Curse", + "11": "\u6b7b\u306e\u546a\u3044", "13": "\u6b7b\u4ea1\u7684\u8bc5\u5492" }, "bountyHuntercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "bountyHuntercommon1AchievementGoal": { "0": "Kill Your Bounty", + "11": "\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ad\u30eb\u3059\u308b\u3002", "13": "\u51fb\u6740\u8d4f\u91d1\u76ee\u6807" }, "bountyHuntercommon1AchievementTitle": { "0": "Hunting Down", + "11": "\u8cde\u91d1\u7372\u5f97", "13": "\u72e9\u730e\u65f6\u523b\uff01" }, "bountyHunteranother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "bountyHunteranother1AchievementGoal": { "0": "Kill A Non-Bounty Player", + "11": "\u30bf\u30fc\u30b2\u30c3\u30c8\u4ee5\u5916\u3092\u30ad\u30eb\u3059\u308b\u3002", "13": "\u51fb\u6740\u975e\u8d4f\u91d1\u76ee\u6807" }, "bountyHunteranother1AchievementTitle": { "0": "Wrong Prey", + "11": "\u6b21\u3053\u305d\u306f...", "13": "\u6293\u9519\u4e86..." }, "bountyHunterchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "bountyHunterchallengeAchievementGoal": { "0": "Kill 3 Players Within 30 seconds", + "11": "30\u79d2\u4ee5\u5185\u306b3\u4eba\u4ee5\u4e0a\u30ad\u30eb\u3059\u308b\u3002", "13": "\u572830\u79d2\u5185\u51fb\u6740\u81f3\u5c113\u540d\u73a9\u5bb6" }, "bountyHunterchallengeAchievementTitle": { "0": "Killing Is Everything", + "11": "\u6bba\u3057\u304c\u5168\u3066\u3002", "13": "\u5feb\u5200\u65a9\u4e71\u9ebb" }, "witchcommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "witchcommon1AchievementGoal": { "0": "Spell A Player", + "11": "\u30af\u30eb\u30fc\u306b\u9b54\u8853\u3092\u304b\u3051\u308b\u3002", "13": "\u7ed9\u4e00\u540d\u73a9\u5bb6\u4e0b\u5492" }, "witchcommon1AchievementTitle": { "0": "Murky Witch", + "11": "\u9b54\u6cd5\u4f7f\u3044", "13": "\u9634\u6697\u7684\u5973\u5deb" }, "witchchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "witchchallengeAchievementGoal": { "0": "Spell 3 Players", + "11": "3\u4eba\u4ee5\u4e0a\u9b54\u8853\u3092\u304b\u3051\u308b\u3002", "13": "\u7ed93\u540d\u73a9\u5bb6\u4e0b\u5492" }, "witchchallengeAchievementTitle": { "0": "Spell Master", + "11": "\u9b54\u8853\u3092\u6975\u3081\u3057\u8005", "13": "\u4e0b\u5492\u5927\u5e08" }, "assassincommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "assassincommon1AchievementGoal": { "0": "Assassinate A Player", + "11": "\u30af\u30eb\u30fc\u3092\u6697\u6bba\u3059\u308b\u3002", "13": "\u523a\u6740\u4e00\u540d\u73a9\u5bb6" }, "assassincommon1AchievementTitle": { "0": "Assassination Complete", + "11": "\u4efb\u52d9\u5b8c\u4e86", "13": "\u523a\u6740\u4efb\u52a1\u5b8c\u6210" }, "assassinchallengeAchievementCond": { "0": "You Must Be Seen By At Least 1 Player", + "11": "1\u4eba\u4ee5\u4e0a\u306e\u30d7\u30ec\u30a4\u30e4\u30fc\u306b\u73fe\u884c\u72af\u3092\u898b\u3089\u308c\u3066\u3044\u308b\u3053\u3068\u3002", "13": "\u4f60\u9700\u8981\u81f3\u5c11\u88ab\u4e00\u540d\u73a9\u5bb6\u770b\u89c1" }, "assassinchallengeAchievementGoal": { "0": "Assassinate A Player And Be Caught Red-Handed", + "11": "\u30af\u30eb\u30fc\u3092\u6697\u6bba\u3057\u3001\u8ffd\u653e\u3055\u308c\u308b\u3002", "13": "\u523a\u6740\u65f6\u88ab\u6293\u6b63\u7740" }, "assassinchallengeAchievementTitle": { "0": "Not Afraid Of That", + "11": "\u3053\u308c\u3082\u4f7f\u547d", "13": "\u52c7\u6562\u9762\u5200\uff01" }, "ninjacommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "ninjacommon1AchievementGoal": { "0": "Use Your Stealth Ability", + "11": "\u900f\u660e\u5316\u3059\u308b\u3002", "13": "\u4f7f\u7528\u4f60\u7684\u9690\u8eab\u6280\u80fd" }, "ninjacommon1AchievementTitle": { "0": "Invisible!", + "11": "\u96a0\u308c\u8eab\u306e\u8853", "13": "\u9690\u8eab\uff01" }, "ninjaanother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "ninjaanother1AchievementGoal": { "0": "Get Killed While Invisible", + "11": "\u900f\u660e\u5316\u4e2d\u306b\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u9690\u8eab\u671f\u95f4\u88ab\u6740\u5bb3" }, "ninjaanother1AchievementTitle": { "0": "How Did You Find Me", + "11": "\u4f55\u6545\u62d9\u8005\u306e\u5834\u6240\u3092", "13": "\u4f60\u600e\u4e48\u770b\u89c1\u6211\u7684\uff1f" }, "ninjachallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "ninjachallengeAchievementGoal": { "0": "Stealth And Kill 2 Players", + "11": "\u900f\u660e\u5316\u4e2d\u306b2\u4eba\u3092\u6bba\u5bb3\u3002", "13": "\u9690\u8eab\u5e76\u51fb\u6740\u81f3\u5c112\u540d\u73a9\u5bb6" }, "ninjachallengeAchievementTitle": { "0": "Stalker", + "11": "\u8cb4\u65b9\u306e\u5f8c\u308d", "13": "\u6f5c\u4f0f\u8005" }, "nekoKabochachallengeAchievementCond": { "0": "You Must Be Killed", + "11": "\u30ad\u30eb\u3055\u308c\u308b\u3053\u3068\u3002", "13": "\u4f60\u5fc5\u987b\u88ab\u51fb\u6740" }, "nekoKabochachallengeAchievementGoal": { "0": "Revenge On Your Killer", + "11": "\u30ad\u30eb\u3057\u305f\u4eba\u306b\u5fa9\u8b90\u3059\u308b\u3002", "13": "\u5411\u4f60\u7684\u51f6\u624b\u590d\u4ec7" }, "nekoKabochachallengeAchievementTitle": { "0": "Revenge!", + "11": "\u5fa9\u8b90", "13": "\u590d\u4ec7\u7684\u6ecb\u5473" }, "serialKillercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "serialKillercommon1AchievementGoal": { "0": "Have The First Taste Of Blood", + "11": "\u8840\u306e\u5473\u3092\u77e5\u308b\u3002(\u8a66\u5408\u4e2d\u306b\u521d\u3081\u3066\u30ad\u30eb\u3092\u3059\u308b\u3002)", "13": "\u51fb\u6740\u7b2c\u4e00\u540d\u73a9\u5bb6" }, "serialKillercommon1AchievementTitle": { "0": "Blood Thirsty", + "11": "\u8840\u306e\u6e07\u304d", "13": "\u9c9c\u8840\u7684\u6e34\u671b" }, "serialKilleranother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "serialKilleranother1AchievementGoal": { "0": "Driven Crazy By The Thirst Of Blood", + "11": "\u8840\u306e\u6e07\u304d\u306b\u72c2\u308f\u3055\u308c\u308b\u3002(\u81ea\u7206\u3059\u308b\u3002)", "13": "\u56e0\u6e34\u671b\u9c9c\u8840\u800c\u81ea\u6740" }, "serialKilleranother1AchievementTitle": { "0": "Mad Or Not?", + "11": "\u72c2\u6c17\u304b\u5426\u304b", "13": "\u5f7b\u5e95\u75af\u766b" }, "evilGuessercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilGuessercommon1AchievementGoal": { "0": "Guess A Player", + "11": "\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u4e00\u540d\u73a9\u5bb6" }, "evilGuessercommon1AchievementTitle": { "0": "Shoot!", + "11": "\u5b8c\u74a7\u306a\u63a8\u6e2c", "13": "\u72d9\u6740\uff01" }, "evilGuesserchallenge1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilGuesserchallenge1AchievementGoal": { "0": "Guess 3 Players", + "11": "\u8a66\u5408\u4e2d\u306b3\u4eba\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u81f3\u5c113\u540d\u73a9\u5bb6" }, "evilGuesserchallenge1AchievementTitle": { "0": "Gambling", + "11": "\u30ae\u30e3\u30f3\u30d6\u30e9\u30fc", "13": "\u8d4c\u535a" }, "evilGuesserchallenge2AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilGuesserchallenge2AchievementGoal": { "0": "Guess The Nice Guesser", + "11": "\u30ca\u30a4\u30b9\u30b2\u30c3\u30b5\u30fc\u3092\u63a8\u6bba\u3059\u308b\u3002", "13": "\u8d4c\u6740\u6b63\u4e49\u7684\u8d4c\u602a" }, "evilGuesserchallenge2AchievementTitle": { "0": "Once And For All", + "11": "\u79c1\u304c\u6b63\u7fa9", "13": "\u4e00\u52b3\u6c38\u9038\uff01" }, "evilTrackercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilTrackercommon1AchievementGoal": { "0": "Track A Player", + "11": "\u8ab0\u304b\u3092\u8ffd\u8de1\u3059\u308b\u3002", "13": "\u8ffd\u8e2a\u4e00\u540d\u73a9\u5bb6" }, "evilTrackercommon1AchievementTitle": { "0": "Tracked", + "11": "\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0", "13": "\u8ffd\u8e2a\uff01" }, "evilTrackercommon2AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilTrackercommon2AchievementGoal": { "0": "View The Tracked Target's Tasks", + "11": "\u8ffd\u8de1\u5bfe\u8c61\u306e\u30bf\u30b9\u30af\u6570\u3092\u78ba\u8a8d\u3059\u308b\u3002", "13": "\u89c2\u5bdf\u8ffd\u8e2a\u76ee\u6807\u7684\u4efb\u52a1" }, "evilTrackercommon2AchievementTitle": { "0": "Task Tracker", + "11": "\u30bf\u30b9\u30af\u30c8\u30e9\u30c3\u30ab\u30fc", "13": "\u4efb\u52a1\u8ffd\u8e2a\u5668" }, "evilHackercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilHackercommon1AchievementGoal": { "0": "Create A Madmate", + "11": "\u30de\u30c3\u30c9\u30e1\u30a4\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3002", "13": "\u62db\u52df\u4e00\u540d\u73a9\u5bb6\u4e3a\u53db\u5f92" }, "evilHackercommon1AchievementTitle": { "0": "\"Impostor\" Pal", + "11": "\u4ef2\u9593\u5165\u308a", "13": "\"\u5185\u9b3c\"\u4f19\u4f34" }, "evilHackerchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilHackerchallengeAchievementGoal": { "0": "View The Portable Admin And Make A Kill", + "11": "\u30dd\u30fc\u30bf\u30d6\u30eb\u30a2\u30c9\u30df\u30f3\u3092\u898b\u305f\u5f8c\u306b\u30ad\u30eb\u3092\u3059\u308b\u3002", "13": "\u67e5\u770b\u4fbf\u643a\u5f0f\u7ba1\u7406\u5730\u56fe\u540e\u51fb\u6740\u4e00\u540d\u73a9\u5bb6" }, "evilHackerchallengeAchievementTitle": { "0": "Admin-ish", + "11": "\u5168\u3066\u898b\u3066\u3044\u308b", "13": "\u79fb\u52a8\u7ba1\u7406\u5730\u56fe" }, "evilSwapperchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilSwapperchallengeAchievementGoal": { "0": "Swap Votes And Protect An Impostor", + "11": "\u30b9\u30ef\u30c3\u30d7\u3092\u884c\u3044\u3001\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc\u3092\u8ffd\u653e\u304b\u3089\u5b88\u308b\u3002", "13": "\u901a\u8fc7\u6362\u7968\u5e87\u62a4\u4e00\u540d\u5185\u9b3c" }, "evilSwapperchallengeAchievementTitle": { "0": "Ally Protector", - "13": "\u540c\u76df\u4fdd\u62a4\u7740" + "11": "\u6700\u5f37\u306e\u5b88\u8b77\u8005", + "13": "\u540c\u76df\u4fdd\u62a4\u8005" }, "evilSwapperanother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilSwapperanother1AchievementGoal": { "0": "Swap Votes And Exile A Jester", + "11": "\u30b9\u30ef\u30c3\u30d7\u3092\u884c\u3044\u3001\u30b8\u30a7\u30b9\u30bf\u30fc\u3092\u8ffd\u653e\u3059\u308b\u3002", "13": "\u6362\u7968\u9a71\u9010\u5c0f\u4e11" }, "evilSwapperanother1AchievementTitle": { "0": "Mistaken...", + "11": "\u30df\u30b9\u30c6\u30a4\u30af", "13": "\u770b\u9519\u4eba\u4e86" }, "trappercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "trappercommon1AchievementGoal": { "0": "Kill A Player With Your Trap", + "11": "\u30c8\u30e9\u30c3\u30d7\u3067\u30af\u30eb\u30fc\u3092\u30ad\u30eb\u3059\u308b\u3002", "13": "\u7528\u9677\u9631\u51fb\u6740\u4e00\u540d\u73a9\u5bb6" }, "trappercommon1AchievementTitle": { "0": "Traps", + "11": "\u3053\u308c\u306f\u7f60\u3060\uff01", "13": "\u8bbe\u9677\uff01" }, "trapperchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "trapperchallengeAchievementGoal": { "0": "Kill 3 Players With Your Trap", + "11": "3\u4eba\u4ee5\u4e0a\u3092\u30c8\u30e9\u30c3\u30d7\u3067\u30ad\u30eb\u3059\u308b\u3002", "13": "\u7528\u9677\u9631\u51fb\u6740\u81f3\u5c113\u540d\u73a9\u5bb6" }, "trapperchallengeAchievementTitle": { "0": "Killing Traps", + "11": "\u6bba\u3057\u306e\u7f60", "13": "\u6b7b\u4ea1\u7684\u9677\u9631" }, "undertakercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "undertakercommon1AchievementGoal": { "0": "Drag A Dead Body", + "11": "\u6b7b\u4f53\u3092\u63b4\u3080\u3002", "13": "\u62d6\u62fd\u4e00\u4e2a\u5c38\u4f53" }, "undertakercommon1AchievementTitle": { "0": "Body Dragger", + "11": "\u6b7b\u4f53\u904b\u9001\u8005", "13": "\u4e27\u4e8b\u529e\u7406" }, "undertakeranother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "undertakeranother1AchievementGoal": { "0": "Get Killed While Dragging The Body", + "11": "\u6b7b\u4f53\u3092\u63b4\u3093\u3067\u904b\u3093\u3067\u3044\u308b\u9593\u306b\u30ad\u30eb\u3055\u308c\u308b\u3002", "13": "\u5728\u62d6\u62fd\u5c38\u4f53\u65f6\u88ab\u51fb\u6740" }, "undertakeranother1AchievementTitle": { "0": "Soul After Soul", + "11": "\u4ef2\u826f\u6b7b", "13": "\u4e00\u4e2a\u63a5\u7740\u4e00\u4e2a" }, "blackmailercommon1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "blackmailercommon1AchievementGoal": { "0": "Blackmail A Player", + "11": "\u30af\u30eb\u30fc\u3092\u8105\u8feb\u3059\u308b\u3002", "13": "\u52d2\u7d22\u4e00\u540d\u73a9\u5bb6" }, "blackmailercommon1AchievementTitle": { "0": "Shhh", + "11": "\u30b7\u30fc\u30fc\u30c3\uff01", "13": "\u5618" }, "blackmailerchallengeAchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "blackmailerchallengeAchievementGoal": { "0": "Blackmail One Of Those Who Have Seen You Kill", + "11": "\u30ad\u30eb\u306e\u76ee\u6483\u8005\u3092\u8105\u8feb\u3059\u308b\u3002", "13": "\u5bf9\u4e00\u540d\u76ee\u7779\u4f60\u51fb\u6740\u7684\u73a9\u5bb6\u8fdb\u884c\u52d2\u7d22" }, "blackmailerchallengeAchievementTitle": { "0": "Silence!", + "11": "\u6c88\u9ed9", "13": "\u95ed\u5634\uff01" }, "evilYasunaanother1AchievementCond": { "0": "[BLANK]", + "11": "[BLANK]", "13": "[BLANK]" }, "evilYasunaanother1AchievementGoal": { "0": "Force Exile A Non-Impostor", + "11": "\u30a4\u30f3\u30dd\u30b9\u30bf\u30fc\u4ee5\u5916\u3092\u8ffd\u653e\u3059\u308b\u3002", "13": "\u5f3a\u5236\u9a71\u9010\u4e00\u540d\u975e\u5185\u9b3c\u73a9\u5bb6" }, "evilYasunaanother1AchievementTitle": { "0": "Retrive Your Votes!", + "11": "\u52d8\u306e\u3044\u3044\u30af\u30eb\u30fc\u306f\u5acc\u3044\u3060\u3088", "13": "\u4f60\u4eec\u7684\u7968\u90fd\u4e0d\u7b97\u6570\uff01" } } \ No newline at end of file diff --git a/TheOtherRoles/RoleInfo.cs b/TheOtherRoles/RoleInfo.cs index 5c54e63d..25ebf89a 100644 --- a/TheOtherRoles/RoleInfo.cs +++ b/TheOtherRoles/RoleInfo.cs @@ -30,113 +30,113 @@ public RoleInfo(string name, Color color, RoleId roleId, bool isNeutral = false, this.isModifier = isModifier; } - public static RoleInfo jester = new RoleInfo("jester", Jester.color, RoleId.Jester, true); - public static RoleInfo mayor = new RoleInfo("mayor", Mayor.color, RoleId.Mayor); - public static RoleInfo portalmaker = new RoleInfo("portalmaker", Portalmaker.color, RoleId.Portalmaker); - public static RoleInfo engineer = new RoleInfo("engineer", Engineer.color, RoleId.Engineer); - public static RoleInfo sheriff = new RoleInfo("sheriff", Sheriff.color, RoleId.Sheriff); - public static RoleInfo deputy = new RoleInfo("deputy", Sheriff.color, RoleId.Deputy); - public static RoleInfo lighter = new RoleInfo("lighter", Lighter.color, RoleId.Lighter); - public static RoleInfo godfather = new RoleInfo("godfather", Godfather.color, RoleId.Godfather); - public static RoleInfo mafioso = new RoleInfo("mafioso", Mafioso.color, RoleId.Mafioso); - public static RoleInfo janitor = new RoleInfo("janitor", Janitor.color, RoleId.Janitor); - public static RoleInfo morphling = new RoleInfo("morphling", Morphling.color, RoleId.Morphling); - public static RoleInfo camouflager = new RoleInfo("camouflager", Camouflager.color, RoleId.Camouflager); - public static RoleInfo vampire = new RoleInfo("vampire", Vampire.color, RoleId.Vampire); - public static RoleInfo eraser = new RoleInfo("eraser", Eraser.color, RoleId.Eraser); - public static RoleInfo trickster = new RoleInfo("trickster", Trickster.color, RoleId.Trickster); - public static RoleInfo cleaner = new RoleInfo("cleaner", Cleaner.color, RoleId.Cleaner); - public static RoleInfo warlock = new RoleInfo("warlock", Warlock.color, RoleId.Warlock); - public static RoleInfo bountyHunter = new RoleInfo("bountyHunter", BountyHunter.color, RoleId.BountyHunter); - public static RoleInfo detective = new RoleInfo("detective", Detective.color, RoleId.Detective); - public static RoleInfo bait = new RoleInfo("bait", Bait.color, RoleId.Bait); - public static RoleInfo timeMaster = new RoleInfo("timeMaster", TimeMaster.color, RoleId.TimeMaster); - public static RoleInfo medic = new RoleInfo("medic", Medic.color, RoleId.Medic); - public static RoleInfo niceSwapper = new RoleInfo("niceSwapper", Swapper.color, RoleId.Swapper); - public static RoleInfo seer = new RoleInfo("seer", Seer.color, RoleId.Seer); - public static RoleInfo hacker = new RoleInfo("hacker", Hacker.color, RoleId.Hacker); - public static RoleInfo niceshifter = new RoleInfo("niceShifter", Shifter.color, RoleId.Shifter); - public static RoleInfo tracker = new RoleInfo("tracker", Tracker.color, RoleId.Tracker); - public static RoleInfo snitch = new RoleInfo("snitch", Snitch.color, RoleId.Snitch); - public static RoleInfo jackal = new RoleInfo("jackal", Jackal.color, RoleId.Jackal, true); - public static RoleInfo sidekick = new RoleInfo("sidekick", Sidekick.color, RoleId.Sidekick, true); - public static RoleInfo spy = new RoleInfo("spy", Spy.color, RoleId.Spy); - public static RoleInfo securityGuard = new RoleInfo("securityGuard", SecurityGuard.color, RoleId.SecurityGuard); - public static RoleInfo arsonist = new RoleInfo("arsonist", Arsonist.color, RoleId.Arsonist, true); - public static RoleInfo goodGuesser = new RoleInfo("niceGuesser", Guesser.color, RoleId.NiceGuesser); - public static RoleInfo badGuesser = new RoleInfo("evilGuesser", Palette.ImpostorRed, RoleId.EvilGuesser); - public static RoleInfo niceWatcher = new RoleInfo("niceWatcher", Watcher.color, RoleId.NiceWatcher); - public static RoleInfo evilWatcher = new RoleInfo("evilWatcher", Palette.ImpostorRed, RoleId.EvilWatcher); - public static RoleInfo vulture = new RoleInfo("vulture", Vulture.color, RoleId.Vulture, true); - public static RoleInfo medium = new RoleInfo("medium", Medium.color, RoleId.Medium); + public static RoleInfo jester = new("jester", Jester.color, RoleId.Jester, true); + public static RoleInfo mayor = new("mayor", Mayor.color, RoleId.Mayor); + public static RoleInfo portalmaker = new("portalmaker", Portalmaker.color, RoleId.Portalmaker); + public static RoleInfo engineer = new("engineer", Engineer.color, RoleId.Engineer); + public static RoleInfo sheriff = new("sheriff", Sheriff.color, RoleId.Sheriff); + public static RoleInfo deputy = new("deputy", Sheriff.color, RoleId.Deputy); + public static RoleInfo lighter = new("lighter", Lighter.color, RoleId.Lighter); + public static RoleInfo godfather = new("godfather", Godfather.color, RoleId.Godfather); + public static RoleInfo mafioso = new("mafioso", Mafioso.color, RoleId.Mafioso); + public static RoleInfo janitor = new("janitor", Janitor.color, RoleId.Janitor); + public static RoleInfo morphling = new("morphling", Morphling.color, RoleId.Morphling); + public static RoleInfo camouflager = new("camouflager", Camouflager.color, RoleId.Camouflager); + public static RoleInfo vampire = new("vampire", Vampire.color, RoleId.Vampire); + public static RoleInfo eraser = new("eraser", Eraser.color, RoleId.Eraser); + public static RoleInfo trickster = new("trickster", Trickster.color, RoleId.Trickster); + public static RoleInfo cleaner = new("cleaner", Cleaner.color, RoleId.Cleaner); + public static RoleInfo warlock = new("warlock", Warlock.color, RoleId.Warlock); + public static RoleInfo bountyHunter = new("bountyHunter", BountyHunter.color, RoleId.BountyHunter); + public static RoleInfo detective = new("detective", Detective.color, RoleId.Detective); + public static RoleInfo bait = new("bait", Bait.color, RoleId.Bait); + public static RoleInfo timeMaster = new("timeMaster", TimeMaster.color, RoleId.TimeMaster); + public static RoleInfo medic = new("medic", Medic.color, RoleId.Medic); + public static RoleInfo niceSwapper = new("niceSwapper", Swapper.color, RoleId.Swapper); + public static RoleInfo seer = new("seer", Seer.color, RoleId.Seer); + public static RoleInfo hacker = new("hacker", Hacker.color, RoleId.Hacker); + public static RoleInfo niceshifter = new("niceShifter", Shifter.color, RoleId.Shifter); + public static RoleInfo tracker = new("tracker", Tracker.color, RoleId.Tracker); + public static RoleInfo snitch = new("snitch", Snitch.color, RoleId.Snitch); + public static RoleInfo jackal = new("jackal", Jackal.color, RoleId.Jackal, true); + public static RoleInfo sidekick = new("sidekick", Sidekick.color, RoleId.Sidekick, true); + public static RoleInfo spy = new("spy", Spy.color, RoleId.Spy); + public static RoleInfo securityGuard = new("securityGuard", SecurityGuard.color, RoleId.SecurityGuard); + public static RoleInfo arsonist = new("arsonist", Arsonist.color, RoleId.Arsonist, true); + public static RoleInfo goodGuesser = new("niceGuesser", Guesser.color, RoleId.NiceGuesser); + public static RoleInfo badGuesser = new("evilGuesser", Palette.ImpostorRed, RoleId.EvilGuesser); + public static RoleInfo niceWatcher = new("niceWatcher", Watcher.color, RoleId.NiceWatcher); + public static RoleInfo evilWatcher = new("evilWatcher", Palette.ImpostorRed, RoleId.EvilWatcher); + public static RoleInfo vulture = new("vulture", Vulture.color, RoleId.Vulture, true); + public static RoleInfo medium = new("medium", Medium.color, RoleId.Medium); //public static RoleInfo trapper = new RoleInfo("Trapper", Trapper.color, "Place traps to find the Impostors", "Place traps", RoleId.Trapper); - public static RoleInfo lawyer = new RoleInfo("lawyer", Lawyer.color, RoleId.Lawyer, true); + public static RoleInfo lawyer = new("lawyer", Lawyer.color, RoleId.Lawyer, true); //public static RoleInfo prosecutor = new RoleInfo("Prosecutor", Lawyer.color, "Vote out your target", "Vote out your target", RoleId.Prosecutor, true); - public static RoleInfo pursuer = new RoleInfo("pursuer", Pursuer.color, RoleId.Pursuer, true); - public static RoleInfo impostor = new RoleInfo("impostor", Palette.ImpostorRed, RoleId.Impostor); - public static RoleInfo crewmate = new RoleInfo("crewmate", Color.white, RoleId.Crewmate); - public static RoleInfo witch = new RoleInfo("witch", Witch.color, RoleId.Witch); - public static RoleInfo assassin = new RoleInfo("assassin", Assassin.color, RoleId.Assassin); - public static RoleInfo thief = new RoleInfo("thief", Thief.color, RoleId.Thief, true); + public static RoleInfo pursuer = new("pursuer", Pursuer.color, RoleId.Pursuer, true); + public static RoleInfo impostor = new("impostor", Palette.ImpostorRed, RoleId.Impostor); + public static RoleInfo crewmate = new("crewmate", Color.white, RoleId.Crewmate); + public static RoleInfo witch = new("witch", Witch.color, RoleId.Witch); + public static RoleInfo assassin = new("assassin", Assassin.color, RoleId.Assassin); + public static RoleInfo thief = new("thief", Thief.color, RoleId.Thief, true); //public static RoleInfo bomber = new RoleInfo("Bomber", Bomber.color, "Bomb all Crewmates", "Bomb all Crewmates", RoleId.Bomber); // GMIA functional - public static RoleInfo ninja = new RoleInfo("ninja", Ninja.color, RoleId.Ninja); - public static RoleInfo nekoKabocha = new RoleInfo("nekoKabocha", NekoKabocha.color, RoleId.NekoKabocha); - public static RoleInfo serialKiller = new RoleInfo("serialKiller", SerialKiller.color, RoleId.SerialKiller); - public static RoleInfo evilTracker = new RoleInfo("evilTracker", EvilTracker.color, RoleId.EvilTracker); - public static RoleInfo undertaker = new RoleInfo("undertaker", Undertaker.color, RoleId.Undertaker); - public static RoleInfo mimicK = new RoleInfo("mimicK", MimicK.color, RoleId.MimicK); - public static RoleInfo mimicA = new RoleInfo("mimicA", MimicA.color, RoleId.MimicA); - public static RoleInfo bomberA = new RoleInfo("bomber", BomberA.color, RoleId.BomberA); - public static RoleInfo bomberB = new RoleInfo("bomber", BomberB.color, RoleId.BomberB); - public static RoleInfo evilSwapper = new RoleInfo("evilSwapper", Palette.ImpostorRed, RoleId.Swapper); - public static RoleInfo evilHacker = new RoleInfo("evilHacker", EvilHacker.color, RoleId.EvilHacker); - public static RoleInfo trapper = new RoleInfo("trapper", Trapper.color, RoleId.Trapper); - public static RoleInfo blackmailer = new RoleInfo("blackmailer", Blackmailer.color, RoleId.Blackmailer); - public static RoleInfo fortuneTeller = new RoleInfo("fortuneTeller", FortuneTeller.color, RoleId.FortuneTeller); - public static RoleInfo veteran = new RoleInfo("veteran", Veteran.color, RoleId.Veteran); - public static RoleInfo sprinter = new RoleInfo("sprinter", Sprinter.color, RoleId.Sprinter); - public static RoleInfo sherlock = new RoleInfo("sherlock", Sherlock.color, RoleId.Sherlock); - public static RoleInfo yasuna = new RoleInfo("niceYasuna", Yasuna.color, RoleId.Yasuna); - public static RoleInfo taskMaster = new RoleInfo("taskMaster", TaskMaster.color, RoleId.TaskMaster); - public static RoleInfo teleporter = new RoleInfo("teleporter", Teleporter.color, RoleId.Teleporter); - public static RoleInfo prophet = new RoleInfo("prophet", Prophet.color, RoleId.Prophet); - public static RoleInfo busker = new RoleInfo("busker", Busker.color, RoleId.Busker); - public static RoleInfo noisemaker = new RoleInfo("noisemaker", Noisemaker.color, RoleId.Noisemaker); - public static RoleInfo evilYasuna = new RoleInfo("evilYasuna", Palette.ImpostorRed, RoleId.EvilYasuna); - public static RoleInfo opportunist = new RoleInfo("opportunist", Opportunist.color, RoleId.Opportunist, true); - public static RoleInfo chainshifter = new RoleInfo("corruptedShifter", Shifter.color, RoleId.Shifter, true); - public static RoleInfo moriarty = new RoleInfo("moriarty", Moriarty.color, RoleId.Moriarty, true); - public static RoleInfo akujo = new RoleInfo("akujo", Akujo.color, RoleId.Akujo, true); - public static RoleInfo plagueDoctor = new RoleInfo("plagueDoctor", PlagueDoctor.color, RoleId.PlagueDoctor, true); - public static RoleInfo jekyllAndHyde = new RoleInfo("jekyllAndHyde", JekyllAndHyde.color, RoleId.JekyllAndHyde, true); - public static RoleInfo cupid = new RoleInfo("cupid", Cupid.color, RoleId.Cupid, true); - public static RoleInfo cupidLover = new RoleInfo("lover", Cupid.color, RoleId.Lover, false, true); - public static RoleInfo fox = new RoleInfo("fox", Fox.color, RoleId.Fox, true); - public static RoleInfo immoralist = new RoleInfo("immoralist", Immoralist.color, RoleId.Immoralist, true); - public static RoleInfo schrodingersCat = new RoleInfo("schrodingersCat", SchrodingersCat.color, RoleId.SchrodingersCat, true); + public static RoleInfo ninja = new("ninja", Ninja.color, RoleId.Ninja); + public static RoleInfo nekoKabocha = new("nekoKabocha", NekoKabocha.color, RoleId.NekoKabocha); + public static RoleInfo serialKiller = new("serialKiller", SerialKiller.color, RoleId.SerialKiller); + public static RoleInfo evilTracker = new("evilTracker", EvilTracker.color, RoleId.EvilTracker); + public static RoleInfo undertaker = new("undertaker", Undertaker.color, RoleId.Undertaker); + public static RoleInfo mimicK = new("mimicK", MimicK.color, RoleId.MimicK); + public static RoleInfo mimicA = new("mimicA", MimicA.color, RoleId.MimicA); + public static RoleInfo bomberA = new("bomber", BomberA.color, RoleId.BomberA); + public static RoleInfo bomberB = new("bomber", BomberB.color, RoleId.BomberB); + public static RoleInfo evilSwapper = new("evilSwapper", Palette.ImpostorRed, RoleId.Swapper); + public static RoleInfo evilHacker = new("evilHacker", EvilHacker.color, RoleId.EvilHacker); + public static RoleInfo trapper = new("trapper", Trapper.color, RoleId.Trapper); + public static RoleInfo blackmailer = new("blackmailer", Blackmailer.color, RoleId.Blackmailer); + public static RoleInfo fortuneTeller = new("fortuneTeller", FortuneTeller.color, RoleId.FortuneTeller); + public static RoleInfo veteran = new("veteran", Veteran.color, RoleId.Veteran); + public static RoleInfo sprinter = new("sprinter", Sprinter.color, RoleId.Sprinter); + public static RoleInfo sherlock = new("sherlock", Sherlock.color, RoleId.Sherlock); + public static RoleInfo yasuna = new("niceYasuna", Yasuna.color, RoleId.Yasuna); + public static RoleInfo taskMaster = new("taskMaster", TaskMaster.color, RoleId.TaskMaster); + public static RoleInfo teleporter = new("teleporter", Teleporter.color, RoleId.Teleporter); + public static RoleInfo prophet = new("prophet", Prophet.color, RoleId.Prophet); + public static RoleInfo busker = new("busker", Busker.color, RoleId.Busker); + public static RoleInfo noisemaker = new("noisemaker", Noisemaker.color, RoleId.Noisemaker); + public static RoleInfo evilYasuna = new("evilYasuna", Palette.ImpostorRed, RoleId.EvilYasuna); + public static RoleInfo opportunist = new("opportunist", Opportunist.color, RoleId.Opportunist, true); + public static RoleInfo chainshifter = new("corruptedShifter", Shifter.color, RoleId.Shifter, true); + public static RoleInfo moriarty = new("moriarty", Moriarty.color, RoleId.Moriarty, true); + public static RoleInfo akujo = new("akujo", Akujo.color, RoleId.Akujo, true); + public static RoleInfo plagueDoctor = new("plagueDoctor", PlagueDoctor.color, RoleId.PlagueDoctor, true); + public static RoleInfo jekyllAndHyde = new("jekyllAndHyde", JekyllAndHyde.color, RoleId.JekyllAndHyde, true); + public static RoleInfo cupid = new("cupid", Cupid.color, RoleId.Cupid, true); + public static RoleInfo cupidLover = new("lover", Cupid.color, RoleId.Lover, false, true); + public static RoleInfo fox = new("fox", Fox.color, RoleId.Fox, true); + public static RoleInfo immoralist = new("immoralist", Immoralist.color, RoleId.Immoralist, true); + public static RoleInfo schrodingersCat = new("schrodingersCat", SchrodingersCat.color, RoleId.SchrodingersCat, true); - public static RoleInfo hunter = new RoleInfo("hunter", Palette.ImpostorRed, RoleId.Impostor); - public static RoleInfo hunted = new RoleInfo("hunted", Color.white, RoleId.Crewmate); + public static RoleInfo hunter = new("hunter", Palette.ImpostorRed, RoleId.Impostor); + public static RoleInfo hunted = new("hunted", Color.white, RoleId.Crewmate); // Modifier - public static RoleInfo bloody = new RoleInfo("bloody", Color.yellow, RoleId.Bloody, false, true); - public static RoleInfo antiTeleport = new RoleInfo("antiTeleportPostfix", Color.yellow, RoleId.AntiTeleport, false, true); - public static RoleInfo tiebreaker = new RoleInfo("tiebreaker", Color.yellow, RoleId.Tiebreaker, false, true); + public static RoleInfo bloody = new("bloody", Color.yellow, RoleId.Bloody, false, true); + public static RoleInfo antiTeleport = new("antiTeleportPostfix", Color.yellow, RoleId.AntiTeleport, false, true); + public static RoleInfo tiebreaker = new("tiebreaker", Color.yellow, RoleId.Tiebreaker, false, true); //public static RoleInfo bait = new RoleInfo("Bait", Color.yellow, "Bait your enemies", "Bait your enemies", RoleId.Bait, false, true); - public static RoleInfo sunglasses = new RoleInfo("sunglasses", Color.yellow, RoleId.Sunglasses, false, true); - public static RoleInfo lover = new RoleInfo("lover", Lovers.color, RoleId.Lover, false, true); - public static RoleInfo mini = new RoleInfo("mini", Color.yellow, RoleId.Mini, false, true); - public static RoleInfo vip = new RoleInfo("vip", Color.yellow, RoleId.Vip, false, true); - public static RoleInfo invert = new RoleInfo("invert", Color.yellow, RoleId.Invert, false, true); - public static RoleInfo chameleon = new RoleInfo("chameleon", Color.yellow, RoleId.Chameleon, false, true); + public static RoleInfo sunglasses = new("sunglasses", Color.yellow, RoleId.Sunglasses, false, true); + public static RoleInfo lover = new("lover", Lovers.color, RoleId.Lover, false, true); + public static RoleInfo mini = new("mini", Color.yellow, RoleId.Mini, false, true); + public static RoleInfo vip = new("vip", Color.yellow, RoleId.Vip, false, true); + public static RoleInfo invert = new("invert", Color.yellow, RoleId.Invert, false, true); + public static RoleInfo chameleon = new("chameleon", Color.yellow, RoleId.Chameleon, false, true); //public static RoleInfo shifter = new RoleInfo("Shifter", Color.yellow, "Shift your role", "Shift your role", RoleId.Shifter, false, true); - public static List allRoleInfos = new List() { + public static List allRoleInfos = new() { impostor, godfather, mafioso, @@ -234,7 +234,7 @@ public RoleInfo(string name, Color color, RoleId roleId, bool isNeutral = false, }; public static List getRoleInfoForPlayer(PlayerControl p, bool showModifier = true, bool includeHidden = false) { - List infos = new List(); + List infos = new(); if (p == null) return infos; // Modifier @@ -326,7 +326,7 @@ public static List getRoleInfoForPlayer(PlayerControl p, bool showModi else infos.Add(TaskMaster.isTaskComplete ? taskMaster : crewmate); } if (p == PlagueDoctor.plagueDoctor) infos.Add(plagueDoctor); - if (p == SchrodingersCat.schrodingersCat) infos.Add(!SchrodingersCat.hideRole || includeHidden || CachedPlayer.LocalPlayer.PlayerControl.Data.IsDead + if (p == SchrodingersCat.schrodingersCat || p == SchrodingersCat.formerSchrodingersCat) infos.Add(!SchrodingersCat.hideRole || includeHidden || CachedPlayer.LocalPlayer.PlayerControl.Data.IsDead || SchrodingersCat.hasTeam() || SchrodingersCat.tasksComplete(CachedPlayer.LocalPlayer.PlayerControl) ? schrodingersCat : crewmate); if (p == Opportunist.opportunist) infos.Add(opportunist); if (p == Shifter.shifter) infos.Add(Shifter.isNeutral ? chainshifter : niceshifter); diff --git a/TheOtherRoles/TheOtherRoles.cs b/TheOtherRoles/TheOtherRoles.cs index a6182e99..5b62a29a 100644 --- a/TheOtherRoles/TheOtherRoles.cs +++ b/TheOtherRoles/TheOtherRoles.cs @@ -24,7 +24,7 @@ namespace TheOtherRoles [HarmonyPatch] public static class TheOtherRoles { - public static System.Random rnd = new System.Random((int)DateTime.Now.Ticks); + public static System.Random rnd = new((int)DateTime.Now.Ticks); public static void clearAndReloadRoles() { Jester.clearAndReload(); @@ -397,7 +397,7 @@ public static class Deputy public static Color color = Sheriff.color; public static PlayerControl currentTarget; - public static List handcuffedPlayers = new List(); + public static List handcuffedPlayers = new(); public static int promotesToSheriff; // No: 0, Immediately: 1, After Meeting: 2 public static bool keepsHandcuffsOnPromotion; public static float handcuffDuration; @@ -405,7 +405,7 @@ public static class Deputy public static float handcuffCooldown; public static bool knowsSheriff; public static bool stopsGameEnd; - public static Dictionary handcuffedKnows = new Dictionary(); + public static Dictionary handcuffedKnows = new(); private static Sprite buttonSprite; private static Sprite handcuffedSprite; @@ -745,7 +745,7 @@ public static PlayerControl getPartner(this PlayerControl player) { public static class Seer { public static PlayerControl seer; public static Color color = new Color32(97, 178, 108, byte.MaxValue); - public static List deadBodyPositions = new List(); + public static List deadBodyPositions = new(); public static float soulDuration = 15f; public static bool limitSoulDuration = false; @@ -961,7 +961,7 @@ public static void clearAndReload() { public static class Tracker { public static PlayerControl tracker; public static Color color = new Color32(100, 58, 220, byte.MaxValue); - public static List localArrows = new List(); + public static List localArrows = new(); public static float updateIntervall = 5f; public static bool resetTargetAfterMeeting = false; @@ -970,13 +970,13 @@ public static class Tracker { public static float corpsesTrackingDuration = 5f; public static float corpsesTrackingTimer = 0f; public static int trackingMode = 0; - public static List deadBodyPositions = new List(); + public static List deadBodyPositions = new(); public static PlayerControl currentTarget; public static PlayerControl tracked; public static bool usedTracker = false; public static float timeUntilUpdate = 0f; - public static Arrow arrow = new Arrow(Color.blue); + public static Arrow arrow = new(Color.blue); public static GameObject DangerMeterParent; public static DangerMeter Meter; @@ -1127,7 +1127,7 @@ public static void onAchievementActivate() public static int taskCountForReveal = 1; public static bool isRevealed = false; - public static Dictionary playerRoomMap = new Dictionary(); + public static Dictionary playerRoomMap = new(); public static TMPro.TextMeshPro text = null; public static bool needsUpdate = true; @@ -1150,7 +1150,7 @@ public static class Jackal { public static Color color = new Color32(0, 180, 235, byte.MaxValue); public static PlayerControl fakeSidekick; public static PlayerControl currentTarget; - public static List formerJackals = new List(); + public static List formerJackals = new(); public static float cooldown = 30f; public static float createSidekickCooldown = 30f; @@ -1232,9 +1232,9 @@ public static class Eraser { public static PlayerControl eraser; public static Color color = Palette.ImpostorRed; - public static List alreadyErased = new List(); + public static List alreadyErased = new(); - public static List futureErased = new List(); + public static List futureErased = new(); public static PlayerControl currentTarget; public static float cooldown = 30f; public static bool canEraseAnyone = false; @@ -1561,7 +1561,7 @@ public static class Arsonist { public static PlayerControl currentTarget; public static PlayerControl douseTarget; - public static List dousedPlayers = new List(); + public static List dousedPlayers = new(); private static Sprite douseSprite; public static Sprite getDouseSprite() { @@ -1704,7 +1704,7 @@ public static void clearAndReload() { public static class Vulture { public static PlayerControl vulture; public static Color color = new Color32(139, 69, 19, byte.MaxValue); - public static List localArrows = new List(); + public static List localArrows = new(); public static float cooldown = 30f; public static int vultureNumberToWin = 4; public static int eatenBodies = 0; @@ -1741,9 +1741,9 @@ public static class Medium { public static DeadPlayer target; public static DeadPlayer soulTarget; public static Color color = new Color32(98, 120, 115, byte.MaxValue); - public static List> deadBodies = new List>(); - public static List> futureDeadBodies = new List>(); - public static List souls = new List(); + public static List> deadBodies = new(); + public static List> futureDeadBodies = new(); + public static List souls = new(); public static DateTime meetingStartTime = DateTime.UtcNow; public static float cooldown = 30f; @@ -1809,7 +1809,7 @@ public static void clearAndReload() { public static string getInfo(PlayerControl target, PlayerControl killer) { string msg = ""; - List infos = new List(); + List infos = new(); // collect fitting death info types. // suicides: if (killer == target) { @@ -1983,7 +1983,7 @@ public static class Pursuer { public static PlayerControl pursuer; public static PlayerControl target; public static Color color = Lawyer.color; - public static List blankedList = new List(); + public static List blankedList = new(); public static int blanks = 0; public static Sprite blank; public static bool notAckedExiled = false; @@ -2043,14 +2043,14 @@ public static void arrowUpdate() if (arrows.FirstOrDefault().arrow != null) UnityEngine.Object.Destroy(arrows.FirstOrDefault().arrow); return; } - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow1 in arrows) { if (arrow1 != null && arrow1.arrow != null) @@ -2062,10 +2062,10 @@ public static void arrowUpdate() //if (MimicK.mimicK == null) return; - // ArrowsһE + // Arrows一覧 arrows = new List(); - // ݥ`λäʾArrows軭 + // インポスターの位置を示すArrowsを描画 /*foreach (PlayerControl p in CachedPlayer.AllPlayers) { if (p.Data.IsDead) continue; @@ -2086,7 +2086,7 @@ public static void arrowUpdate() arrow.Update(MimicA.mimicA.transform.position); arrows.Add(arrow); - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -2169,14 +2169,14 @@ public static void arrowUpdate() return; } - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow1 in arrows) { if (arrow1 != null && arrow1.arrow != null) @@ -2188,15 +2188,15 @@ public static void arrowUpdate() //if (MimicA.mimicA == null) return; - // ArrowsһE + // Arrows一覧 arrows = new List(); if (MimicK.mimicK.Data.IsDead || MimicK.mimicK == null) return; - Arrow arrow = new Arrow(Palette.ImpostorRed); + Arrow arrow = new(Palette.ImpostorRed); arrow.arrow.SetActive(true); arrow.Update(MimicK.mimicK.transform.position); arrows.Add(arrow); - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -2237,15 +2237,15 @@ public enum DivineResults public static bool endGameFlag = false; public static bool meetingFlag = false; - public static Dictionary progress = new Dictionary(); - public static Dictionary playerStatus = new Dictionary(); + public static Dictionary progress = new(); + public static Dictionary playerStatus = new(); public static bool divinedFlag = false; public static int numUsed = 0; private static Sprite leftButtonSprite; private static Sprite rightButtonSprite; - public static List arrows = new List(); + public static List arrows = new(); public static float updateTimer = 0f; public static int pageIndex = 1; @@ -2377,7 +2377,7 @@ public static void divine(PlayerControl p) if (Constants.ShouldPlaySfx()) SoundManager.Instance.PlaySound(DestroyableSingleton.Instance.TaskCompleteSound, false, 0.8f); numUsed += 1; - // ռgФȤǰk𤵤I饤Ȥ֪ͨ + // 占いを実行したことで発火される処理を他クライアントに通知 MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.FortuneTellerUsedDivine, Hazel.SendOption.Reliable, -1); writer.Write(PlayerControl.LocalPlayer.PlayerId); writer.Write(p.PlayerId); @@ -2389,7 +2389,7 @@ public static void clearAndReload() { meetingFlag = true; duration = CustomOptionHolder.fortuneTellerDuration.getFloat(); - List arrows = new List(); + List arrows = new(); numTasks = (int)CustomOptionHolder.fortuneTellerNumTasks.getFloat(); distance = CustomOptionHolder.fortuneTellerDistance.getFloat(); divineResult = (DivineResults)CustomOptionHolder.fortuneTellerResults.getSelection(); @@ -2581,6 +2581,7 @@ public static class SchrodingersCat { public static Color color = Color.grey; public static PlayerControl schrodingersCat; + public static PlayerControl formerSchrodingersCat; public static Team team; public static bool isTrueDead; @@ -2848,6 +2849,7 @@ public static void layoutPoolable() public static void clearAndReload() { schrodingersCat = null; + formerSchrodingersCat = null; currentTarget = null; isTrueDead = false; team = Team.None; @@ -2912,14 +2914,14 @@ public static void arrowUpdate() if (arrows.FirstOrDefault().arrow != null) UnityEngine.Object.Destroy(arrows.FirstOrDefault().arrow); return; } - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow != null) @@ -2929,10 +2931,10 @@ public static void arrowUpdate() } } - // ArrowsһE + // Arrows一覧 arrows = new List(); /*if (BomberB.bomberB == null || BomberB.bomberB.Data.IsDead) return; - // ෽λäʾArrows軭 + // 相方の位置を示すArrowsを描画 Arrow arrow = new Arrow(Palette.ImpostorRed); arrow.arrow.SetActive(true); arrow.Update(BomberB.bomberB.transform.position); @@ -2950,7 +2952,7 @@ public static void arrowUpdate() } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -2979,7 +2981,7 @@ public static void playerIconsUpdate() targetText.gameObject.SetActive(true); targetText.transform.parent = icon.gameObject.transform; } - // ෽Oä`åȤʾ + // 相方の設置したターゲットを表示する if (BomberB.bombTarget != null && TORMapOptions.playerIcons.ContainsKey(BomberB.bombTarget.PlayerId) && TORMapOptions.playerIcons[BomberB.bombTarget.PlayerId].gameObject != null) { var icon = TORMapOptions.playerIcons[BomberB.bombTarget.PlayerId]; @@ -3071,7 +3073,7 @@ public static void playerIconsUpdate() targetText.gameObject.SetActive(true); targetText.transform.parent = icon.gameObject.transform; } - // ෽Oä`åȤʾ + // 相方の設置したターゲットを表示する if (BomberA.bombTarget != null && TORMapOptions.playerIcons.ContainsKey(BomberA.bombTarget.PlayerId) && TORMapOptions.playerIcons[BomberA.bombTarget.PlayerId].gameObject != null) { var icon = TORMapOptions.playerIcons[BomberA.bombTarget.PlayerId]; @@ -3101,14 +3103,14 @@ public static void arrowUpdate() if (arrows.FirstOrDefault().arrow != null) UnityEngine.Object.Destroy(arrows.FirstOrDefault().arrow); return; } - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow != null) @@ -3118,10 +3120,10 @@ public static void arrowUpdate() } } - // ArrowsһE + // Arrows一覧 arrows = new List(); /*if (BomberA.bomberA == null || BomberA.bomberA.Data.IsDead) return; - // ෽λäʾArrows軭 + // 相方の位置を示すArrowsを描画 Arrow arrow = new Arrow(Palette.ImpostorRed); arrow.arrow.SetActive(true); @@ -3139,7 +3141,7 @@ public static void arrowUpdate() arrows.Add(arrow); } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -3500,7 +3502,7 @@ public static void clearAndReload() public static class Noisemaker { - public static Color32 color = new Color32(160, 131, 187, byte.MaxValue); + public static Color32 color = new(160, 131, 187, byte.MaxValue); public static PlayerControl noisemaker; public static PlayerControl currentTarget; public static PlayerControl target; @@ -3739,7 +3741,7 @@ public static class Busker { public static PlayerControl busker; public static List buskerList; - public static Color color = new Color(255f / 255f, 172f / 255f, 117f / 255f); + public static Color color = new(255f / 255f, 172f / 255f, 117f / 255f); public static float cooldown = 30f; public static float duration = 10f; @@ -3747,7 +3749,7 @@ public static class Busker public static bool buttonInterrupted = false; public static bool pseudocideComplete = false; public static bool restrictInformation = true; - public static Vector3 deathPosition = new Vector3(); + public static Vector3 deathPosition = new(); public static StaticAchievementToken acTokenCommon = null; public static StaticAchievementToken acTokenAnother = null; @@ -3814,7 +3816,7 @@ public static void clearAndReload() public static class Prophet { public static PlayerControl prophet; - public static Color32 color = new Color32(255, 204, 127, byte.MaxValue); + public static Color32 color = new(255, 204, 127, byte.MaxValue); public static float cooldown = 30f; public static bool powerCrewAsRed = false; @@ -3825,9 +3827,9 @@ public static class Prophet public static int examinesLeft; public static bool revealProphet = true; public static bool isRevealed = false; - public static List arrows = new List(); + public static List arrows = new(); - public static Dictionary examined = new Dictionary(); + public static Dictionary examined = new(); public static PlayerControl currentTarget; public static StaticAchievementToken acTokenUse = null; @@ -3922,14 +3924,14 @@ public static Sprite getArrowSprite() public static void arrowUpdate() { - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow != null && arrow.arrow != null) @@ -3939,10 +3941,10 @@ public static void arrowUpdate() } } - // ArrowsһE + // Arrows一覧 arrows = new List(); - // ݥ`λäʾArrows軭 + // インポスターの位置を示すArrowsを描画 int count = 0; foreach (PlayerControl p in CachedPlayer.AllPlayers) { @@ -3990,7 +3992,7 @@ public static void arrowUpdate() } } - // `åȤλäʾArrow軭 + // ターゲットの位置を示すArrowを描画 if (target != null && !target.Data.IsDead) { Arrow arrow = new(Palette.CrewmateBlue); @@ -4028,7 +4030,7 @@ public static void arrowUpdate() } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -4070,7 +4072,7 @@ public static void clearAndReload() public static class Shifter { public static PlayerControl shifter; - public static List pastShifters = new List(); + public static List pastShifters = new(); public static Color color = new Color32(102, 102, 102, byte.MaxValue); public static PlayerControl futureShift; @@ -4121,7 +4123,7 @@ public static class Witch { public static PlayerControl witch; public static Color color = Palette.ImpostorRed; - public static List futureSpelled = new List(); + public static List futureSpelled = new(); public static PlayerControl currentTarget; public static PlayerControl spellCastingTarget; public static float cooldown = 30f; @@ -4242,7 +4244,7 @@ public static class Assassin { //public static bool isInvisble = false; private static Sprite markButtonSprite; private static Sprite killButtonSprite; - public static Arrow arrow = new Arrow(Color.black); + public static Arrow arrow = new(Color.black); public static StaticAchievementToken acTokenCommon; public static AchievementToken<(bool markKill, bool cleared)> acTokenChallenge; @@ -4321,14 +4323,14 @@ public static Sprite getBrainwashIcon() public static void arrowUpdate() { - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow != null && arrow.arrow != null) @@ -4338,9 +4340,9 @@ public static void arrowUpdate() } } - // ArrowsһE + // Arrows一覧 arrows = new List(); - // `åȤλäʾArrow軭 + // ターゲットの位置を示すArrowを描画 if (target != null && !target.Data.IsDead) { Arrow arrow = new(Palette.CrewmateBlue); @@ -4387,7 +4389,7 @@ public static void arrowUpdate() } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } } @@ -4633,14 +4635,14 @@ public static bool tasksComplete() public static void arrowUpdate() { - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow?.arrow != null) @@ -4650,10 +4652,10 @@ public static void arrowUpdate() } } - // ArrowsһE + // Arrows一覧 arrows = new List(); - // ݥ`λäʾArrows軭 + // インポスターの位置を示すArrowsを描画 foreach (PlayerControl p in CachedPlayer.AllPlayers) { if (p.Data.IsDead) continue; @@ -4681,9 +4683,9 @@ public static void arrowUpdate() { arrow = new Arrow(Moriarty.color); } - else if (p == SchrodingersCat.schrodingersCat) + else if (p == SchrodingersCat.schrodingersCat && SchrodingersCat.hasTeam() && SchrodingersCat.team != SchrodingersCat.Team.Crewmate) { - arrow = new Arrow(SchrodingersCat.color); + arrow = new Arrow(RoleInfo.schrodingersCat.color); } else { @@ -4695,7 +4697,7 @@ public static void arrowUpdate() } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } else @@ -4786,13 +4788,13 @@ public static Sprite getButtonSprite() public static void arrowUpdate() { - // ǰե`फνU^rgޥʥ + // 前フレームからの経過時間をマイナスする updateTimer -= Time.fixedDeltaTime; - // 1U^Arrow + // 1秒経過したらArrowを更新 if (updateTimer <= 0.0f) { - // ǰؤArrow򤹤٤Ɨ + // 前回のArrowをすべて破棄する foreach (Arrow arrow in arrows) { if (arrow?.arrow != null) @@ -4802,10 +4804,10 @@ public static void arrowUpdate() } } - // ArrowһE + // Arrow一覧 arrows = new List(); - // λäʾArrow軭 + // 狐の位置を示すArrowを描画 foreach (PlayerControl p in CachedPlayer.AllPlayers) { if (p.Data.IsDead) continue; @@ -4818,7 +4820,7 @@ public static void arrowUpdate() arrows.Add(arrow); } } - // ީ`˕rg򥻥å + // タイマーに時間をセット updateTimer = arrowUpdateInterval; } else @@ -5245,7 +5247,8 @@ public static void clearAndReload() { } public static bool isFailedThiefKill(PlayerControl target, PlayerControl killer, RoleInfo targetRole) { - return killer == Thief.thief && !target.Data.Role.IsImpostor && !new List { RoleInfo.jackal, canKillSheriff ? RoleInfo.sheriff : null, RoleInfo.sidekick, RoleInfo.moriarty, RoleInfo.jekyllAndHyde }.Contains(targetRole); + return killer == Thief.thief && !target.Data.Role.IsImpostor && !new List { RoleInfo.jackal, canKillSheriff ? RoleInfo.sheriff : null, RoleInfo.sidekick, RoleInfo.moriarty, RoleInfo.jekyllAndHyde, SchrodingersCat.hasTeam() && SchrodingersCat.team != SchrodingersCat.Team.Crewmate ? RoleInfo.schrodingersCat : + null}.Contains(targetRole); } } @@ -5357,9 +5360,9 @@ public static void clearAndReload() { }*/ public static class Bloody { - public static List bloody = new List(); - public static Dictionary active = new Dictionary(); - public static Dictionary bloodyKillerMap = new Dictionary(); + public static List bloody = new(); + public static Dictionary active = new(); + public static Dictionary bloodyKillerMap = new(); public static float duration = 5f; @@ -5372,7 +5375,7 @@ public static void clearAndReload() { } public static class AntiTeleport { - public static List antiTeleport = new List(); + public static List antiTeleport = new(); public static Vector3 position; public static void clearAndReload() { @@ -5403,7 +5406,7 @@ public static void clearAndReload() { } public static class Sunglasses { - public static List sunglasses = new List(); + public static List sunglasses = new(); public static int vision = 1; public static void clearAndReload() { @@ -5443,7 +5446,7 @@ public static bool isGrownUp() { } public static class Vip { - public static List vip = new List(); + public static List vip = new(); public static bool showColor = true; public static void clearAndReload() { @@ -5453,7 +5456,7 @@ public static void clearAndReload() { } public static class Invert { - public static List invert = new List(); + public static List invert = new(); public static int meetings = 3; public static void clearAndReload() { @@ -5465,7 +5468,7 @@ public static void clearAndReload() { public static class Madmate { public static Color color = Palette.ImpostorRed; - public static List madmate = new List(); + public static List madmate = new(); public static bool hasTasks; public static bool canDieToSheriff; public static bool canVent; @@ -5512,7 +5515,7 @@ public static void clearAndReload() } public static class Chameleon { - public static List chameleon = new List(); + public static List chameleon = new(); public static float minVisibility = 0.2f; public static float holdDuration = 1f; public static float fadeDuration = 0.5f; diff --git a/TheOtherRoles/TheOtherRoles.csproj b/TheOtherRoles/TheOtherRoles.csproj index 1cf5ef18..e005f629 100644 --- a/TheOtherRoles/TheOtherRoles.csproj +++ b/TheOtherRoles/TheOtherRoles.csproj @@ -15,6 +15,10 @@ preview + + true + embedded + diff --git a/TheOtherRoles/bin/Debug/net6.0/TheOtherRoles.deps.json b/TheOtherRoles/bin/Debug/net6.0/TheOtherRoles.deps.json index d2487d69..5e0ffb7d 100644 --- a/TheOtherRoles/bin/Debug/net6.0/TheOtherRoles.deps.json +++ b/TheOtherRoles/bin/Debug/net6.0/TheOtherRoles.deps.json @@ -6,13 +6,13 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "TheOtherRoles/1.1.26": { + "TheOtherRoles/1.0.7": { "dependencies": { - "AmongUs.GameLibs.Steam": "2023.10.24", + "AmongUs.GameLibs.Steam": "2023.7.11", "BepInEx.IL2CPP.MSBuild": "2.1.0-rc.1", - "BepInEx.Unity.IL2CPP": "6.0.0-be.674", + "BepInEx.Unity.IL2CPP": "6.0.0-be.670", "Disarm": "2022.1.0-master.26", - "Reactor": "2.2.0", + "Reactor": "2.2.0-ci.235", "Samboy063.Cpp2IL.Core": "2022.1.0-development.886", "Samboy063.LibCpp2IL": "2022.1.0-development.886", "Samboy063.WasmDisassembler": "2022.1.0-development.886", @@ -22,7 +22,7 @@ "TheOtherRoles.dll": {} } }, - "AmongUs.GameLibs.Steam/2023.10.24": {}, + "AmongUs.GameLibs.Steam/2023.7.11": {}, "AsmResolver/5.1.0": { "runtime": { "lib/net6.0/AsmResolver.dll": { @@ -73,7 +73,7 @@ } } }, - "BepInEx.Core/6.0.0-be.674": { + "BepInEx.Core/6.0.0-be.670": { "dependencies": { "HarmonyX": "2.10.1", "MonoMod.Utils": "22.5.1.1", @@ -87,7 +87,7 @@ } }, "BepInEx.IL2CPP.MSBuild/2.1.0-rc.1": {}, - "BepInEx.Unity.Common/6.0.0-be.674": { + "BepInEx.Unity.Common/6.0.0-be.670": { "dependencies": { "AssetRipper.VersionUtilities": "1.3.1", "MonoMod.Utils": "22.5.1.1" @@ -99,15 +99,15 @@ } } }, - "BepInEx.Unity.IL2CPP/6.0.0-be.674": { + "BepInEx.Unity.IL2CPP/6.0.0-be.670": { "dependencies": { - "BepInEx.Core": "6.0.0-be.674", - "BepInEx.Unity.Common": "6.0.0-be.674", + "BepInEx.Core": "6.0.0-be.670", + "BepInEx.Unity.Common": "6.0.0-be.670", "HarmonyX": "2.10.1", "Iced": "1.18.0", - "Il2CppInterop.Generator": "1.4.6-ci.389", - "Il2CppInterop.HarmonySupport": "1.4.6-ci.389", - "Il2CppInterop.Runtime": "1.4.6-ci.389", + "Il2CppInterop.Generator": "1.4.6-ci.354", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.354", + "Il2CppInterop.Runtime": "1.4.6-ci.354", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.1.0-development.886" }, @@ -146,7 +146,7 @@ } } }, - "Il2CppInterop.Common/1.4.6-ci.389": { + "Il2CppInterop.Common/1.4.6-ci.354": { "dependencies": { "Iced": "1.18.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", @@ -159,9 +159,9 @@ } } }, - "Il2CppInterop.Generator/1.4.6-ci.389": { + "Il2CppInterop.Generator/1.4.6-ci.354": { "dependencies": { - "Il2CppInterop.Common": "1.4.6-ci.389", + "Il2CppInterop.Common": "1.4.6-ci.354", "Mono.Cecil": "0.11.4" }, "runtime": { @@ -171,10 +171,10 @@ } } }, - "Il2CppInterop.HarmonySupport/1.4.6-ci.389": { + "Il2CppInterop.HarmonySupport/1.4.6-ci.354": { "dependencies": { "HarmonyX": "2.10.1", - "Il2CppInterop.Runtime": "1.4.6-ci.389" + "Il2CppInterop.Runtime": "1.4.6-ci.354" }, "runtime": { "lib/net6.0/Il2CppInterop.HarmonySupport.dll": { @@ -183,10 +183,10 @@ } } }, - "Il2CppInterop.Runtime/1.4.6-ci.389": { + "Il2CppInterop.Runtime/1.4.6-ci.354": { "dependencies": { "Iced": "1.18.0", - "Il2CppInterop.Common": "1.4.6-ci.389" + "Il2CppInterop.Common": "1.4.6-ci.354" }, "runtime": { "lib/net6.0/Il2CppInterop.Runtime.dll": { @@ -310,9 +310,9 @@ } } }, - "Reactor/2.2.0": { + "Reactor/2.2.0-ci.235": { "dependencies": { - "BepInEx.Unity.IL2CPP": "6.0.0-be.674" + "BepInEx.Unity.IL2CPP": "6.0.0-be.670" }, "runtime": { "lib/net6.0/Reactor.dll": { @@ -848,17 +848,17 @@ } }, "libraries": { - "TheOtherRoles/1.1.26": { + "TheOtherRoles/1.0.7": { "type": "project", "serviceable": false, "sha512": "" }, - "AmongUs.GameLibs.Steam/2023.10.24": { + "AmongUs.GameLibs.Steam/2023.7.11": { "type": "package", "serviceable": true, - "sha512": "sha512-8N064B27cGIZZk902aCLinazPp5T02KNdAUOLBVc1NIua8vYz4muwNdSI0RDGEY0CWbICK+FVsfGXdzAVTeH9A==", - "path": "amongus.gamelibs.steam/2023.10.24", - "hashPath": "amongus.gamelibs.steam.2023.10.24.nupkg.sha512" + "sha512": "sha512-e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g==", + "path": "amongus.gamelibs.steam/2023.7.11", + "hashPath": "amongus.gamelibs.steam.2023.7.11.nupkg.sha512" }, "AsmResolver/5.1.0": { "type": "package", @@ -895,12 +895,12 @@ "path": "assetripper.versionutilities/1.3.1", "hashPath": "assetripper.versionutilities.1.3.1.nupkg.sha512" }, - "BepInEx.Core/6.0.0-be.674": { + "BepInEx.Core/6.0.0-be.670": { "type": "package", "serviceable": true, - "sha512": "sha512-onhAmi1nB36fVyQ25TRkWfDcYHBmw9pKxx758ut2hWou2gJpRpY2Dxc+GZrXCidPGy65mCi393zIU+07ShHTZw==", - "path": "bepinex.core/6.0.0-be.674", - "hashPath": "bepinex.core.6.0.0-be.674.nupkg.sha512" + "sha512": "sha512-7CbbMNZfb+1VHjFKh/ErFBOOEYrVCIkng/B3/HPcbNioySC7qdT1ztfYqs6YjQia4krEic+LV3ew86B/hTg+hw==", + "path": "bepinex.core/6.0.0-be.670", + "hashPath": "bepinex.core.6.0.0-be.670.nupkg.sha512" }, "BepInEx.IL2CPP.MSBuild/2.1.0-rc.1": { "type": "package", @@ -909,19 +909,19 @@ "path": "bepinex.il2cpp.msbuild/2.1.0-rc.1", "hashPath": "bepinex.il2cpp.msbuild.2.1.0-rc.1.nupkg.sha512" }, - "BepInEx.Unity.Common/6.0.0-be.674": { + "BepInEx.Unity.Common/6.0.0-be.670": { "type": "package", "serviceable": true, - "sha512": "sha512-CApjIS89Pl7sKsnxOXANWBq3ALrdAQzn/neK6E6sydjYQiiVKwC6Wo65c1wHdcctSylGhh+e59WuxVSlGuJW9w==", - "path": "bepinex.unity.common/6.0.0-be.674", - "hashPath": "bepinex.unity.common.6.0.0-be.674.nupkg.sha512" + "sha512": "sha512-FSzWILgwepZ7CpA34ew1WyO75lNjxkfX86uwo2172lbhmLkgoAdQbNun8dxKJCDlIevmTDga76yr/WPrTXELvA==", + "path": "bepinex.unity.common/6.0.0-be.670", + "hashPath": "bepinex.unity.common.6.0.0-be.670.nupkg.sha512" }, - "BepInEx.Unity.IL2CPP/6.0.0-be.674": { + "BepInEx.Unity.IL2CPP/6.0.0-be.670": { "type": "package", "serviceable": true, - "sha512": "sha512-y6b5w0L5jDE8h67swHN3cDJ+FV+MzVcwrVqr9ssO37L9Laj87zYUtQVRTXwi5G/QFqeUQcUqi04gsYYR9yue3Q==", - "path": "bepinex.unity.il2cpp/6.0.0-be.674", - "hashPath": "bepinex.unity.il2cpp.6.0.0-be.674.nupkg.sha512" + "sha512": "sha512-dhzCrem44oFxhOICCJ9eoSUbaKSsGGyBUfUQW9WFljCwIK8o4Cx5BiuXAkYoRjr2DhpzLpPDyPZDRImUqH0bwA==", + "path": "bepinex.unity.il2cpp/6.0.0-be.670", + "hashPath": "bepinex.unity.il2cpp.6.0.0-be.670.nupkg.sha512" }, "Disarm/2022.1.0-master.26": { "type": "package", @@ -944,33 +944,33 @@ "path": "iced/1.18.0", "hashPath": "iced.1.18.0.nupkg.sha512" }, - "Il2CppInterop.Common/1.4.6-ci.389": { + "Il2CppInterop.Common/1.4.6-ci.354": { "type": "package", "serviceable": true, - "sha512": "sha512-KTyf2f66Q2mS9a6xhvoPWwD0VzRIoskPMVQehaVMo1dx4Di1FPFsKqukQ+ob6wgP5Rbnx53kiH0PY+IRSb35XA==", - "path": "il2cppinterop.common/1.4.6-ci.389", - "hashPath": "il2cppinterop.common.1.4.6-ci.389.nupkg.sha512" + "sha512": "sha512-aCP3kr39YQw5GVqE9Q8c5y7f9CEKdFxpUhIqYgQBtrEz5Z/KCbHhjuOf/lSuFrjl6Vub/BKk6k+UbMRdoSvC1w==", + "path": "il2cppinterop.common/1.4.6-ci.354", + "hashPath": "il2cppinterop.common.1.4.6-ci.354.nupkg.sha512" }, - "Il2CppInterop.Generator/1.4.6-ci.389": { + "Il2CppInterop.Generator/1.4.6-ci.354": { "type": "package", "serviceable": true, - "sha512": "sha512-XJX4sn/RzAEBNIZZXuyDcLZrFx5tCoahujDu5aKWjApiMj/nTRQAxZn17daIIvd9aHqLaAfiWWth5QDLIt2bKw==", - "path": "il2cppinterop.generator/1.4.6-ci.389", - "hashPath": "il2cppinterop.generator.1.4.6-ci.389.nupkg.sha512" + "sha512": "sha512-y30sxc9mMv0bUzCPDr73xiI6fiu7ksmnEm6XULTGU/5JEGv2aw++/71bLOEYCscNbZTa2JT4yYrLCXCj3GSekg==", + "path": "il2cppinterop.generator/1.4.6-ci.354", + "hashPath": "il2cppinterop.generator.1.4.6-ci.354.nupkg.sha512" }, - "Il2CppInterop.HarmonySupport/1.4.6-ci.389": { + "Il2CppInterop.HarmonySupport/1.4.6-ci.354": { "type": "package", "serviceable": true, - "sha512": "sha512-Xd2zK6sLqwA0ReyUy83SWKcALwY99fq6vVL5gFOMN5Ct8OOVhtNIws0ysCWsfx1GL0RJiRYfR4pza/MmWRz4PQ==", - "path": "il2cppinterop.harmonysupport/1.4.6-ci.389", - "hashPath": "il2cppinterop.harmonysupport.1.4.6-ci.389.nupkg.sha512" + "sha512": "sha512-mQV5A+B/qtI6kSXEGx/UswiqjFKw13/yyviawnStfRKbLMW+XFsdMgGSkOVZd/TiDtF9ZG4Xt7DbkbFu26WjyA==", + "path": "il2cppinterop.harmonysupport/1.4.6-ci.354", + "hashPath": "il2cppinterop.harmonysupport.1.4.6-ci.354.nupkg.sha512" }, - "Il2CppInterop.Runtime/1.4.6-ci.389": { + "Il2CppInterop.Runtime/1.4.6-ci.354": { "type": "package", "serviceable": true, - "sha512": "sha512-nzYjuVzDG/O8+AQ8ax3WVHf+ZVsQKrVtp/yvuW8XoEPLdkbgryIrMo75dvN+tPqxOU3o2MPt9MZ9j25P5aVJMw==", - "path": "il2cppinterop.runtime/1.4.6-ci.389", - "hashPath": "il2cppinterop.runtime.1.4.6-ci.389.nupkg.sha512" + "sha512": "sha512-Xe5md9z+KIthdEcjfUjmoOhvM3gTI3SPyocqvuzEHoov5jQ/HhIPv5hUZzTSm+2nzn3XplENNE8vlBPvQ1o6OA==", + "path": "il2cppinterop.runtime/1.4.6-ci.354", + "hashPath": "il2cppinterop.runtime.1.4.6-ci.354.nupkg.sha512" }, "js6pak.Gee.External.Capstone/2.1.0": { "type": "package", @@ -1021,12 +1021,12 @@ "path": "monomod.utils/22.5.1.1", "hashPath": "monomod.utils.22.5.1.1.nupkg.sha512" }, - "Reactor/2.2.0": { + "Reactor/2.2.0-ci.235": { "type": "package", "serviceable": true, - "sha512": "sha512-foMHya01tmr//3tw+kO7FmY1ojnR0m+ShMU6sxogbnWeO85lmX3QM8aSIsYeAhtJSThf6Ben6iTM4O0KgVcmqw==", - "path": "reactor/2.2.0", - "hashPath": "reactor.2.2.0.nupkg.sha512" + "sha512": "sha512-aa0VHgBs5QwuMHt7evQ/mldAHBqsWdLvnh7NS0RrVSwxi46KfTdALc1sebjzLrWs949USdwGXtFIePEMizGqrA==", + "path": "reactor/2.2.0-ci.235", + "hashPath": "reactor.2.2.0-ci.235.nupkg.sha512" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { "type": "package", diff --git a/TheOtherRoles/packages.lock.json b/TheOtherRoles/packages.lock.json index ace0f41b..9170f6fb 100644 --- a/TheOtherRoles/packages.lock.json +++ b/TheOtherRoles/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2024.6.4, )", - "resolved": "2024.6.4", - "contentHash": "WTu/h9xYZ3r4RZP4yJQq3YPF31HV6cg7NN9Cd2DbZHloYUhMsD//xdE0x3k6YDRy9zbfhlJoUFTFDRcLipZEDQ==" + "requested": "[2024.6.18, )", + "resolved": "2024.6.18", + "contentHash": "xb+HP1xXn4/ES8AgXpk9xeoW568LFYw5NTjY6bHwd6vQjHDf2kT1xHMmQ1me5Vfee/Gp69YIMZDXUAUToG7Elg==" }, "BepInEx.IL2CPP.MSBuild": { "type": "Direct", diff --git a/TheOtherUpdater/TheOtherUpdater.cpp b/TheOtherUpdater/TheOtherUpdater.cpp new file mode 100644 index 00000000..241f4b95 --- /dev/null +++ b/TheOtherUpdater/TheOtherUpdater.cpp @@ -0,0 +1,67 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "include/zip/zip.h" + +#pragma comment(lib, "Urlmon.lib") + + +using namespace std; + +string GetArgument(int argc, char* argv[], string match) +{ + for (int i = 0; i < argc; ++i) + { + if (argv[i] != match) continue; + if (i + 1 == argc) continue; + return argv[i + 1]; + } + + throw invalid_argument("Missing Argument: " + match); +} + +int on_extract_entry(const char *_, void *__) +{ + return 0; +} + +bool IsProcessRunning(const wchar_t *processName) +{ + bool exists = false; + PROCESSENTRY32 entry; + entry.dwSize = sizeof(PROCESSENTRY32); + + HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL); + + if (Process32First(snapshot, &entry)) + while (Process32Next(snapshot, &entry)) + if (!_wcsicmp(entry.szExeFile, processName)) + exists = true; + + CloseHandle(snapshot); + return exists; +} + + +int main(int argc, char* argv[]) +{ + auto gamePath = GetArgument(argc, argv, "--game-path"); + auto zipPath = GetArgument(argc, argv, "--zip"); + const wstring processName( L"Among Us.exe" ); + + while(IsProcessRunning(processName.c_str())) + { + this_thread::sleep_for(200ms); + } + + int argzip = 0; + zip_extract(zipPath.c_str(), gamePath.c_str(), on_extract_entry, &argzip); + + remove(zipPath.c_str()); + MessageBoxW(NULL, L"An update has been queued, please restart your game!", L"The Other Roles - Updater", MB_ICONINFORMATION | MB_OK); +} diff --git a/TheOtherUpdater/TheOtherUpdater.vcxproj b/TheOtherUpdater/TheOtherUpdater.vcxproj new file mode 100644 index 00000000..67609602 --- /dev/null +++ b/TheOtherUpdater/TheOtherUpdater.vcxproj @@ -0,0 +1,250 @@ + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {73A5662B-9C59-4C97-95C5-F5B2A8BBDDCA} + Win32Proj + TheOtherUpdater + 10.0 + + + + x64 + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + false + false + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + + + + MultiThreadedDll + EnableFastChecks + Disabled + true + NoListing + Debug\ + false + false + Debug\ + Default + true + Column + false + Prompt + false + Sync + false + false + false + NotSet + Precise + true + false + false + false + Default + false + false + Default + Default + false + Debug\ + Debug\ + false + Neither + false + Debug\ + Cdecl + Debug\vc143.pdb + NotUsing + pch.h + Debug\TheOtherUpdater.pch + false + false + false + true + false + false + Debug\ + true + true + false + false + Default + Debug\TheOtherUpdater.tlog\ + false + true + false + true + true + Level3 + Debug\ + ProgramDatabase + false + false + InheritWarningLevel + true + false + WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE; + false + false + true + true + + + + + + + + + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + \ No newline at end of file diff --git a/TheOtherUpdater/TheOtherUpdater.vcxproj.filters b/TheOtherUpdater/TheOtherUpdater.vcxproj.filters new file mode 100644 index 00000000..68fa1af2 --- /dev/null +++ b/TheOtherUpdater/TheOtherUpdater.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/TheOtherUpdater/include/zip/miniz.h b/TheOtherUpdater/include/zip/miniz.h new file mode 100644 index 00000000..1feb99d2 --- /dev/null +++ b/TheOtherUpdater/include/zip/miniz.h @@ -0,0 +1,10118 @@ +#define MINIZ_EXPORT +/* miniz.c 2.2.0 - public domain deflate/inflate, zlib-subset, ZIP + reading/writing/appending, PNG writing See "unlicense" statement at the end + of this file. Rich Geldreich , last updated Oct. 13, + 2013 Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: + http://www.ietf.org/rfc/rfc1951.txt + + Most API's defined in miniz.c are optional. For example, to disable the + archive related functions just define MINIZ_NO_ARCHIVE_APIS, or to get rid of + all stdio usage define MINIZ_NO_STDIO (see the list below for more macros). + + * Low-level Deflate/Inflate implementation notes: + + Compression: Use the "tdefl" API's. The compressor supports raw, static, + and dynamic blocks, lazy or greedy parsing, match length filtering, RLE-only, + and Huffman-only streams. It performs and compresses approximately as well as + zlib. + + Decompression: Use the "tinfl" API's. The entire decompressor is + implemented as a single function coroutine: see tinfl_decompress(). It + supports decompression into a 32KB (or larger power of 2) wrapping buffer, or + into a memory block large enough to hold the entire file. + + The low-level tdefl/tinfl API's do not make any use of dynamic memory + allocation. + + * zlib-style API notes: + + miniz.c implements a fairly large subset of zlib. There's enough + functionality present for it to be a drop-in zlib replacement in many apps: + The z_stream struct, optional memory allocation callbacks + deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound + inflateInit/inflateInit2/inflate/inflateReset/inflateEnd + compress, compress2, compressBound, uncompress + CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly + routines. Supports raw deflate streams or standard zlib streams with adler-32 + checking. + + Limitations: + The callback API's are not implemented yet. No support for gzip headers or + zlib static dictionaries. I've tried to closely emulate zlib's various + flavors of stream flushing and return status codes, but there are no + guarantees that miniz.c pulls this off perfectly. + + * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, + originally written by Alex Evans. Supports 1-4 bytes/pixel images. + + * ZIP archive API notes: + + The ZIP archive API's where designed with simplicity and efficiency in + mind, with just enough abstraction to get the job done with minimal fuss. + There are simple API's to retrieve file information, read files from existing + archives, create new archives, append new files to existing archives, or + clone archive data from one archive to another. It supports archives located + in memory or the heap, on disk (using stdio.h), or you can specify custom + file read/write callbacks. + + - Archive reading: Just call this function to read a single file from a + disk archive: + + void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const + char *pArchive_name, size_t *pSize, mz_uint zip_flags); + + For more complex cases, use the "mz_zip_reader" functions. Upon opening an + archive, the entire central directory is located and read as-is into memory, + and subsequent file access only occurs when reading individual files. + + - Archives file scanning: The simple way is to use this function to scan a + loaded archive for a specific file: + + int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, + const char *pComment, mz_uint flags); + + The locate operation can optionally check file comments too, which (as one + example) can be used to identify multiple versions of the same file in an + archive. This function uses a simple linear search through the central + directory, so it's not very fast. + + Alternately, you can iterate through all the files in an archive (using + mz_zip_reader_get_num_files()) and retrieve detailed info on each file by + calling mz_zip_reader_file_stat(). + + - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer + immediately writes compressed file data to disk and builds an exact image of + the central directory in memory. The central directory image is written all + at once at the end of the archive file when the archive is finalized. + + The archive writer can optionally align each file's local header and file + data to any power of 2 alignment, which can be useful when the archive will + be read from optical media. Also, the writer supports placing arbitrary data + blobs at the very beginning of ZIP archives. Archives written using either + feature are still readable by any ZIP tool. + + - Archive appending: The simple way to add a single file to an archive is + to call this function: + + mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, + const char *pArchive_name, const void *pBuf, size_t buf_size, const void + *pComment, mz_uint16 comment_size, mz_uint level_and_flags); + + The archive will be created if it doesn't already exist, otherwise it'll be + appended to. Note the appending is done in-place and is not an atomic + operation, so if something goes wrong during the operation it's possible the + archive could be left without a central directory (although the local file + headers and file data will be fine, so the archive will be recoverable). + + For more complex archive modification scenarios: + 1. The safest way is to use a mz_zip_reader to read the existing archive, + cloning only those bits you want to preserve into a new archive using using + the mz_zip_writer_add_from_zip_reader() function (which compiles the + compressed file data as-is). When you're done, delete the old archive and + rename the newly written archive, and you're done. This is safe but requires + a bunch of temporary disk space or heap memory. + + 2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using + mz_zip_writer_init_from_reader(), append new files as needed, then finalize + the archive which will write an updated central directory to the original + archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() + does.) There's a possibility that the archive's central directory could be + lost with this method if anything goes wrong, though. + + - ZIP archive support limitations: + No spanning support. Extraction functions can only handle unencrypted, + stored or deflated files. Requires streams capable of seeking. + + * This is a header file library, like stb_image.c. To get only a header file, + either cut and paste the below header, or create miniz.h, #define + MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it. + + * Important: For best perf. be sure to customize the below macros for your + target platform: #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 #define + MINIZ_LITTLE_ENDIAN 1 #define MINIZ_HAS_64BIT_REGISTERS 1 + + * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before + including miniz.c to ensure miniz uses the 64-bit variants: fopen64(), + stat64(), etc. Otherwise you won't be able to process large files (i.e. + 32-bit stat() fails for me on files > 0x7FFFFFFF bytes). +*/ +#pragma once + +/* Defines to completely disable specific portions of miniz.c: + If all macros here are defined the only functionality remaining will be + CRC-32, adler-32, tinfl, and tdefl. */ + +/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on + * stdio for file I/O. */ +/*#define MINIZ_NO_STDIO */ + +/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able + * to get the current time, or */ +/* get/set file times, and the C run-time funcs that get/set times won't be + * called. */ +/* The current downside is the times written to your archives will be from 1979. + */ +/*#define MINIZ_NO_TIME */ + +/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */ +/*#define MINIZ_NO_ARCHIVE_APIS */ + +/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP + * archive API's. */ +/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */ + +/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression + * API's. */ +/*#define MINIZ_NO_ZLIB_APIS */ + +/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent + * conflicts against stock zlib. */ +/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ + +/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. + Note if MINIZ_NO_MALLOC is defined then the user must always provide custom + user alloc/free/realloc callbacks to the zlib and archive API's, and a few + stand-alone helper API's which don't provide custom user functions (such as + tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. + */ +/*#define MINIZ_NO_MALLOC */ + +#if defined(__TINYC__) && (defined(__linux) || defined(__linux__)) +/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc + * on Linux */ +#define MINIZ_NO_TIME +#endif + +#include + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS) +#include +#endif + +#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \ + defined(__i386) || defined(__i486__) || defined(__i486) || \ + defined(i386) || defined(__ia64__) || defined(__x86_64__) +/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */ +#define MINIZ_X86_OR_X64_CPU 1 +#else +#define MINIZ_X86_OR_X64_CPU 0 +#endif + +#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU +/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */ +#define MINIZ_LITTLE_ENDIAN 1 +#else +#define MINIZ_LITTLE_ENDIAN 0 +#endif + +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ +#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) +#if MINIZ_X86_OR_X64_CPU +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient + * integer loads and stores from unaligned addresses. */ +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 +#define MINIZ_UNALIGNED_USE_MEMCPY +#else +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 +#endif +#endif + +#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || \ + defined(_LP64) || defined(__LP64__) || defined(__ia64__) || \ + defined(__x86_64__) +/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are + * reasonably fast (and don't involve compiler generated calls to helper + * functions). */ +#define MINIZ_HAS_64BIT_REGISTERS 1 +#else +#define MINIZ_HAS_64BIT_REGISTERS 0 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- zlib-style API Definitions. */ + +/* For more compatibility with zlib, miniz.c uses unsigned long for some + * parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */ +typedef unsigned long mz_ulong; + +/* mz_free() internally uses the MZ_FREE() macro (which by default calls free() + * unless you've modified the MZ_MALLOC macro) to release a block allocated from + * the heap. */ +MINIZ_EXPORT void mz_free(void *p); + +#define MZ_ADLER32_INIT (1) +/* mz_adler32() returns the initial adler-32 value to use when called with + * ptr==NULL. */ +MINIZ_EXPORT mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, + size_t buf_len); + +#define MZ_CRC32_INIT (0) +/* mz_crc32() returns the initial CRC-32 value to use when called with + * ptr==NULL. */ +MINIZ_EXPORT mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, + size_t buf_len); + +/* Compression strategies. */ +enum { + MZ_DEFAULT_STRATEGY = 0, + MZ_FILTERED = 1, + MZ_HUFFMAN_ONLY = 2, + MZ_RLE = 3, + MZ_FIXED = 4 +}; + +/* Method */ +#define MZ_DEFLATED 8 + +/* Heap allocation callbacks. +Note that mz_alloc_func parameter types purposely differ from zlib's: items/size +is size_t, not unsigned long. */ +typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size); +typedef void (*mz_free_func)(void *opaque, void *address); +typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, + size_t size); + +/* Compression levels: 0-9 are the standard zlib-style levels, 10 is best + * possible compression (not zlib compatible, and may be very slow), + * MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */ +enum { + MZ_NO_COMPRESSION = 0, + MZ_BEST_SPEED = 1, + MZ_BEST_COMPRESSION = 9, + MZ_UBER_COMPRESSION = 10, + MZ_DEFAULT_LEVEL = 6, + MZ_DEFAULT_COMPRESSION = -1 +}; + +#define MZ_VERSION "10.2.0" +#define MZ_VERNUM 0xA100 +#define MZ_VER_MAJOR 10 +#define MZ_VER_MINOR 2 +#define MZ_VER_REVISION 0 +#define MZ_VER_SUBREVISION 0 + +#ifndef MINIZ_NO_ZLIB_APIS + +/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The + * other values are for advanced use (refer to the zlib docs). */ +enum { + MZ_NO_FLUSH = 0, + MZ_PARTIAL_FLUSH = 1, + MZ_SYNC_FLUSH = 2, + MZ_FULL_FLUSH = 3, + MZ_FINISH = 4, + MZ_BLOCK = 5 +}; + +/* Return status codes. MZ_PARAM_ERROR is non-standard. */ +enum { + MZ_OK = 0, + MZ_STREAM_END = 1, + MZ_NEED_DICT = 2, + MZ_ERRNO = -1, + MZ_STREAM_ERROR = -2, + MZ_DATA_ERROR = -3, + MZ_MEM_ERROR = -4, + MZ_BUF_ERROR = -5, + MZ_VERSION_ERROR = -6, + MZ_PARAM_ERROR = -10000 +}; + +/* Window bits */ +#define MZ_DEFAULT_WINDOW_BITS 15 + +struct mz_internal_state; + +/* Compression/decompression stream struct. */ +typedef struct mz_stream_s { + const unsigned char *next_in; /* pointer to next byte to read */ + unsigned int avail_in; /* number of bytes available at next_in */ + mz_ulong total_in; /* total number of bytes consumed so far */ + + unsigned char *next_out; /* pointer to next byte to write */ + unsigned int avail_out; /* number of bytes that can be written to next_out */ + mz_ulong total_out; /* total number of bytes produced so far */ + + char *msg; /* error msg (unused) */ + struct mz_internal_state + *state; /* internal state, allocated by zalloc/zfree */ + + mz_alloc_func + zalloc; /* optional heap allocation function (defaults to malloc) */ + mz_free_func zfree; /* optional heap free function (defaults to free) */ + void *opaque; /* heap alloc function user pointer */ + + int data_type; /* data_type (unused) */ + mz_ulong adler; /* adler32 of the source or uncompressed data */ + mz_ulong reserved; /* not used */ +} mz_stream; + +typedef mz_stream *mz_streamp; + +/* Returns the version string of miniz.c. */ +MINIZ_EXPORT const char *mz_version(void); + +/* mz_deflateInit() initializes a compressor with default options: */ +/* Parameters: */ +/* pStream must point to an initialized mz_stream struct. */ +/* level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */ +/* level 1 enables a specially optimized compression function that's been + * optimized purely for performance, not ratio. */ +/* (This special func. is currently only enabled when + * MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */ +/* Return values: */ +/* MZ_OK on success. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_PARAM_ERROR if the input parameters are bogus. */ +/* MZ_MEM_ERROR on out of memory. */ +MINIZ_EXPORT int mz_deflateInit(mz_streamp pStream, int level); + +/* mz_deflateInit2() is like mz_deflate(), except with more control: */ +/* Additional parameters: */ +/* method must be MZ_DEFLATED */ +/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with + * zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no + * header or footer) */ +/* mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */ +MINIZ_EXPORT int mz_deflateInit2(mz_streamp pStream, int level, int method, + int window_bits, int mem_level, int strategy); + +/* Quickly resets a compressor without having to reallocate anything. Same as + * calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */ +MINIZ_EXPORT int mz_deflateReset(mz_streamp pStream); + +/* mz_deflate() compresses the input to output, consuming as much of the input + * and producing as much output as possible. */ +/* Parameters: */ +/* pStream is the stream to read from and write to. You must initialize/update + * the next_in, avail_in, next_out, and avail_out members. */ +/* flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or + * MZ_FINISH. */ +/* Return values: */ +/* MZ_OK on success (when flushing, or if more input is needed but not + * available, and/or there's more output to be written but the output buffer is + * full). */ +/* MZ_STREAM_END if all input has been consumed and all output bytes have been + * written. Don't call mz_deflate() on the stream anymore. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_PARAM_ERROR if one of the parameters is invalid. */ +/* MZ_BUF_ERROR if no forward progress is possible because the input and/or + * output buffers are empty. (Fill up the input buffer or free up some output + * space and try again.) */ +MINIZ_EXPORT int mz_deflate(mz_streamp pStream, int flush); + +/* mz_deflateEnd() deinitializes a compressor: */ +/* Return values: */ +/* MZ_OK on success. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +MINIZ_EXPORT int mz_deflateEnd(mz_streamp pStream); + +/* mz_deflateBound() returns a (very) conservative upper bound on the amount of + * data that could be generated by deflate(), assuming flush is set to only + * MZ_NO_FLUSH or MZ_FINISH. */ +MINIZ_EXPORT mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len); + +/* Single-call compression functions mz_compress() and mz_compress2(): */ +/* Returns MZ_OK on success, or one of the error codes from mz_deflate() on + * failure. */ +MINIZ_EXPORT int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong source_len); +MINIZ_EXPORT int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong source_len, + int level); + +/* mz_compressBound() returns a (very) conservative upper bound on the amount of + * data that could be generated by calling mz_compress(). */ +MINIZ_EXPORT mz_ulong mz_compressBound(mz_ulong source_len); + +/* Initializes a decompressor. */ +MINIZ_EXPORT int mz_inflateInit(mz_streamp pStream); + +/* mz_inflateInit2() is like mz_inflateInit() with an additional option that + * controls the window size and whether or not the stream has been wrapped with + * a zlib header/footer: */ +/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or + * -MZ_DEFAULT_WINDOW_BITS (raw deflate). */ +MINIZ_EXPORT int mz_inflateInit2(mz_streamp pStream, int window_bits); + +/* Quickly resets a compressor without having to reallocate anything. Same as + * calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */ +MINIZ_EXPORT int mz_inflateReset(mz_streamp pStream); + +/* Decompresses the input stream to the output, consuming only as much of the + * input as needed, and writing as much to the output as possible. */ +/* Parameters: */ +/* pStream is the stream to read from and write to. You must initialize/update + * the next_in, avail_in, next_out, and avail_out members. */ +/* flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */ +/* On the first call, if flush is MZ_FINISH it's assumed the input and output + * buffers are both sized large enough to decompress the entire stream in a + * single call (this is slightly faster). */ +/* MZ_FINISH implies that there are no more source bytes available beside + * what's already in the input buffer, and that the output buffer is large + * enough to hold the rest of the decompressed data. */ +/* Return values: */ +/* MZ_OK on success. Either more input is needed but not available, and/or + * there's more output to be written but the output buffer is full. */ +/* MZ_STREAM_END if all needed input has been consumed and all output bytes + * have been written. For zlib streams, the adler-32 of the decompressed data + * has also been verified. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_DATA_ERROR if the deflate stream is invalid. */ +/* MZ_PARAM_ERROR if one of the parameters is invalid. */ +/* MZ_BUF_ERROR if no forward progress is possible because the input buffer is + * empty but the inflater needs more input to continue, or if the output buffer + * is not large enough. Call mz_inflate() again */ +/* with more input data, or with more room in the output buffer (except when + * using single call decompression, described above). */ +MINIZ_EXPORT int mz_inflate(mz_streamp pStream, int flush); + +/* Deinitializes a decompressor. */ +MINIZ_EXPORT int mz_inflateEnd(mz_streamp pStream); + +/* Single-call decompression. */ +/* Returns MZ_OK on success, or one of the error codes from mz_inflate() on + * failure. */ +MINIZ_EXPORT int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, + mz_ulong source_len); +MINIZ_EXPORT int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, + mz_ulong *pSource_len); + +/* Returns a string description of the specified error code, or NULL if the + * error code is invalid. */ +MINIZ_EXPORT const char *mz_error(int err); + +/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used + * as a drop-in replacement for the subset of zlib that miniz.c supports. */ +/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you + * use zlib in the same project. */ +#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES +typedef unsigned char Byte; +typedef unsigned int uInt; +typedef mz_ulong uLong; +typedef Byte Bytef; +typedef uInt uIntf; +typedef char charf; +typedef int intf; +typedef void *voidpf; +typedef uLong uLongf; +typedef void *voidp; +typedef void *const voidpc; +#define Z_NULL 0 +#define Z_NO_FLUSH MZ_NO_FLUSH +#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH +#define Z_SYNC_FLUSH MZ_SYNC_FLUSH +#define Z_FULL_FLUSH MZ_FULL_FLUSH +#define Z_FINISH MZ_FINISH +#define Z_BLOCK MZ_BLOCK +#define Z_OK MZ_OK +#define Z_STREAM_END MZ_STREAM_END +#define Z_NEED_DICT MZ_NEED_DICT +#define Z_ERRNO MZ_ERRNO +#define Z_STREAM_ERROR MZ_STREAM_ERROR +#define Z_DATA_ERROR MZ_DATA_ERROR +#define Z_MEM_ERROR MZ_MEM_ERROR +#define Z_BUF_ERROR MZ_BUF_ERROR +#define Z_VERSION_ERROR MZ_VERSION_ERROR +#define Z_PARAM_ERROR MZ_PARAM_ERROR +#define Z_NO_COMPRESSION MZ_NO_COMPRESSION +#define Z_BEST_SPEED MZ_BEST_SPEED +#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION +#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION +#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY +#define Z_FILTERED MZ_FILTERED +#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY +#define Z_RLE MZ_RLE +#define Z_FIXED MZ_FIXED +#define Z_DEFLATED MZ_DEFLATED +#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS +#define alloc_func mz_alloc_func +#define free_func mz_free_func +#define internal_state mz_internal_state +#define z_stream mz_stream +#define deflateInit mz_deflateInit +#define deflateInit2 mz_deflateInit2 +#define deflateReset mz_deflateReset +#define deflate mz_deflate +#define deflateEnd mz_deflateEnd +#define deflateBound mz_deflateBound +#define compress mz_compress +#define compress2 mz_compress2 +#define compressBound mz_compressBound +#define inflateInit mz_inflateInit +#define inflateInit2 mz_inflateInit2 +#define inflateReset mz_inflateReset +#define inflate mz_inflate +#define inflateEnd mz_inflateEnd +#define uncompress mz_uncompress +#define uncompress2 mz_uncompress2 +#define crc32 mz_crc32 +#define adler32 mz_adler32 +#define MAX_WBITS 15 +#define MAX_MEM_LEVEL 9 +#define zError mz_error +#define ZLIB_VERSION MZ_VERSION +#define ZLIB_VERNUM MZ_VERNUM +#define ZLIB_VER_MAJOR MZ_VER_MAJOR +#define ZLIB_VER_MINOR MZ_VER_MINOR +#define ZLIB_VER_REVISION MZ_VER_REVISION +#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION +#define zlibVersion mz_version +#define zlib_version mz_version() +#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ + +#endif /* MINIZ_NO_ZLIB_APIS */ + +#ifdef __cplusplus +} +#endif + +#pragma once +#include +#include +#include +#include + +/* ------------------- Types and macros */ +typedef unsigned char mz_uint8; +typedef signed short mz_int16; +typedef unsigned short mz_uint16; +typedef unsigned int mz_uint32; +typedef unsigned int mz_uint; +typedef int64_t mz_int64; +typedef uint64_t mz_uint64; +typedef int mz_bool; + +#define MZ_FALSE (0) +#define MZ_TRUE (1) + +/* Works around MSVC's spammy "warning C4127: conditional expression is + * constant" message. */ +#ifdef _MSC_VER +#define MZ_MACRO_END while (0, 0) +#else +#define MZ_MACRO_END while (0) +#endif + +#ifdef MINIZ_NO_STDIO +#define MZ_FILE void * +#else +#include +#define MZ_FILE FILE +#endif /* #ifdef MINIZ_NO_STDIO */ + +#ifdef MINIZ_NO_TIME +typedef struct mz_dummy_time_t_tag { + int m_dummy; +} mz_dummy_time_t; +#define MZ_TIME_T mz_dummy_time_t +#else +#define MZ_TIME_T time_t +#endif + +#define MZ_ASSERT(x) assert(x) + +#ifdef MINIZ_NO_MALLOC +#define MZ_MALLOC(x) NULL +#define MZ_FREE(x) (void)x, ((void)0) +#define MZ_REALLOC(p, x) NULL +#else +#define MZ_MALLOC(x) malloc(x) +#define MZ_FREE(x) free(x) +#define MZ_REALLOC(p, x) realloc(p, x) +#endif + +#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj)) + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN +#define MZ_READ_LE16(p) *((const mz_uint16 *)(p)) +#define MZ_READ_LE32(p) *((const mz_uint32 *)(p)) +#else +#define MZ_READ_LE16(p) \ + ((mz_uint32)(((const mz_uint8 *)(p))[0]) | \ + ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U)) +#define MZ_READ_LE32(p) \ + ((mz_uint32)(((const mz_uint8 *)(p))[0]) | \ + ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | \ + ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | \ + ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) +#endif + +#define MZ_READ_LE64(p) \ + (((mz_uint64)MZ_READ_LE32(p)) | \ + (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) \ + << 32U)) + +#ifdef _MSC_VER +#define MZ_FORCEINLINE __forceinline +#elif defined(__GNUC__) +#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__)) +#else +#define MZ_FORCEINLINE inline +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +extern MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, + size_t size); +extern MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address); +extern MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, + size_t items, size_t size); + +#define MZ_UINT16_MAX (0xFFFFU) +#define MZ_UINT32_MAX (0xFFFFFFFFU) + +#ifdef __cplusplus +} +#endif +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif +/* ------------------- Low-level Compression API Definitions */ + +/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly + * slower, and raw/dynamic blocks will be output more frequently). */ +#define TDEFL_LESS_MEMORY 0 + +/* tdefl_init() compression flags logically OR'd together (low 12 bits contain + * the max. number of probes per dictionary search): */ +/* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes + * per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap + * compression), 4095=Huffman+LZ (slowest/best compression). */ +enum { + TDEFL_HUFFMAN_ONLY = 0, + TDEFL_DEFAULT_MAX_PROBES = 128, + TDEFL_MAX_PROBES_MASK = 0xFFF +}; + +/* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before + * the deflate data, and the Adler-32 of the source data at the end. Otherwise, + * you'll get raw deflate data. */ +/* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even + * when not writing zlib headers). */ +/* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more + * efficient lazy parsing. */ +/* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's + * initialization time to the minimum, but the output may vary from run to run + * given the same input (depending on the contents of memory). */ +/* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) + */ +/* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */ +/* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */ +/* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */ +/* The low 12 bits are reserved to control the max # of hash probes per + * dictionary lookup (see TDEFL_MAX_PROBES_MASK). */ +enum { + TDEFL_WRITE_ZLIB_HEADER = 0x01000, + TDEFL_COMPUTE_ADLER32 = 0x02000, + TDEFL_GREEDY_PARSING_FLAG = 0x04000, + TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000, + TDEFL_RLE_MATCHES = 0x10000, + TDEFL_FILTER_MATCHES = 0x20000, + TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000, + TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000 +}; + +/* High level compression functions: */ +/* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block + * allocated via malloc(). */ +/* On entry: */ +/* pSrc_buf, src_buf_len: Pointer and size of source block to compress. */ +/* flags: The max match finder probes (default is 128) logically OR'd against + * the above flags. Higher probes are slower but improve compression. */ +/* On return: */ +/* Function returns a pointer to the compressed data, or NULL on failure. */ +/* *pOut_len will be set to the compressed data's size, which could be larger + * than src_buf_len on uncompressible data. */ +/* The caller must free() the returned block when it's no longer needed. */ +MINIZ_EXPORT void *tdefl_compress_mem_to_heap(const void *pSrc_buf, + size_t src_buf_len, + size_t *pOut_len, int flags); + +/* tdefl_compress_mem_to_mem() compresses a block in memory to another block in + * memory. */ +/* Returns 0 on failure. */ +MINIZ_EXPORT size_t tdefl_compress_mem_to_mem(void *pOut_buf, + size_t out_buf_len, + const void *pSrc_buf, + size_t src_buf_len, int flags); + +/* Compresses an image to a compressed PNG file in memory. */ +/* On entry: */ +/* pImage, w, h, and num_chans describe the image to compress. num_chans may be + * 1, 2, 3, or 4. */ +/* The image pitch in bytes per scanline will be w*num_chans. The leftmost + * pixel on the top scanline is stored first in memory. */ +/* level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, + * MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */ +/* If flip is true, the image will be flipped on the Y axis (useful for OpenGL + * apps). */ +/* On return: */ +/* Function returns a pointer to the compressed data, or NULL on failure. */ +/* *pLen_out will be set to the size of the PNG image file. */ +/* The caller must mz_free() the returned heap block (which will typically be + * larger than *pLen_out) when it's no longer needed. */ +MINIZ_EXPORT void * +tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, + int num_chans, size_t *pLen_out, + mz_uint level, mz_bool flip); +MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory(const void *pImage, + int w, int h, + int num_chans, + size_t *pLen_out); + +/* Output stream interface. The compressor uses this interface to write + * compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */ +typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len, + void *pUser); + +/* tdefl_compress_mem_to_output() compresses a block to an output stream. The + * above helpers use this function internally. */ +MINIZ_EXPORT mz_bool tdefl_compress_mem_to_output( + const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags); + +enum { + TDEFL_MAX_HUFF_TABLES = 3, + TDEFL_MAX_HUFF_SYMBOLS_0 = 288, + TDEFL_MAX_HUFF_SYMBOLS_1 = 32, + TDEFL_MAX_HUFF_SYMBOLS_2 = 19, + TDEFL_LZ_DICT_SIZE = 32768, + TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1, + TDEFL_MIN_MATCH_LEN = 3, + TDEFL_MAX_MATCH_LEN = 258 +}; + +/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed + * output block (using static/fixed Huffman codes). */ +#if TDEFL_LESS_MEMORY +enum { + TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024, + TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10, + TDEFL_MAX_HUFF_SYMBOLS = 288, + TDEFL_LZ_HASH_BITS = 12, + TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, + TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, + TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS +}; +#else +enum { + TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024, + TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10, + TDEFL_MAX_HUFF_SYMBOLS = 288, + TDEFL_LZ_HASH_BITS = 15, + TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, + TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, + TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS +}; +#endif + +/* The low-level tdefl functions below may be used directly if the above helper + * functions aren't flexible enough. The low-level functions don't make any heap + * allocations, unlike the above helper functions. */ +typedef enum { + TDEFL_STATUS_BAD_PARAM = -2, + TDEFL_STATUS_PUT_BUF_FAILED = -1, + TDEFL_STATUS_OKAY = 0, + TDEFL_STATUS_DONE = 1 +} tdefl_status; + +/* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */ +typedef enum { + TDEFL_NO_FLUSH = 0, + TDEFL_SYNC_FLUSH = 2, + TDEFL_FULL_FLUSH = 3, + TDEFL_FINISH = 4 +} tdefl_flush; + +/* tdefl's compression state structure. */ +typedef struct { + tdefl_put_buf_func_ptr m_pPut_buf_func; + void *m_pPut_buf_user; + mz_uint m_flags, m_max_probes[2]; + int m_greedy_parsing; + mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size; + mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end; + mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, + m_bit_buffer; + mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, + m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, + m_wants_to_finish; + tdefl_status m_prev_return_status; + const void *m_pIn_buf; + void *m_pOut_buf; + size_t *m_pIn_buf_size, *m_pOut_buf_size; + tdefl_flush m_flush; + const mz_uint8 *m_pSrc; + size_t m_src_buf_left, m_out_buf_ofs; + mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1]; + mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE]; + mz_uint16 m_next[TDEFL_LZ_DICT_SIZE]; + mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE]; + mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE]; +} tdefl_compressor; + +/* Initializes the compressor. */ +/* There is no corresponding deinit() function because the tdefl API's do not + * dynamically allocate memory. */ +/* pBut_buf_func: If NULL, output data will be supplied to the specified + * callback. In this case, the user should call the tdefl_compress_buffer() API + * for compression. */ +/* If pBut_buf_func is NULL the user should always call the tdefl_compress() + * API. */ +/* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, + * etc.) */ +MINIZ_EXPORT tdefl_status tdefl_init(tdefl_compressor *d, + tdefl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags); + +/* Compresses a block of data, consuming as much of the specified input buffer + * as possible, and writing as much compressed data to the specified output + * buffer as possible. */ +MINIZ_EXPORT tdefl_status tdefl_compress(tdefl_compressor *d, + const void *pIn_buf, + size_t *pIn_buf_size, void *pOut_buf, + size_t *pOut_buf_size, + tdefl_flush flush); + +/* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a + * non-NULL tdefl_put_buf_func_ptr. */ +/* tdefl_compress_buffer() always consumes the entire input buffer. */ +MINIZ_EXPORT tdefl_status tdefl_compress_buffer(tdefl_compressor *d, + const void *pIn_buf, + size_t in_buf_size, + tdefl_flush flush); + +MINIZ_EXPORT tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d); +MINIZ_EXPORT mz_uint32 tdefl_get_adler32(tdefl_compressor *d); + +/* Create tdefl_compress() flags given zlib-style compression parameters. */ +/* level may range from [0,10] (where 10 is absolute max compression, but may be + * much slower on some files) */ +/* window_bits may be -15 (raw deflate) or 15 (zlib) */ +/* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, + * MZ_RLE, or MZ_FIXED */ +MINIZ_EXPORT mz_uint tdefl_create_comp_flags_from_zip_params(int level, + int window_bits, + int strategy); + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tdefl_compressor structure in C so that */ +/* non-C language bindings to tdefl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +MINIZ_EXPORT tdefl_compressor *tdefl_compressor_alloc(void); +MINIZ_EXPORT void tdefl_compressor_free(tdefl_compressor *pComp); +#endif + +#ifdef __cplusplus +} +#endif +#pragma once + +/* ------------------- Low-level Decompression API Definitions */ + +#ifdef __cplusplus +extern "C" { +#endif +/* Decompression flags used by tinfl_decompress(). */ +/* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and + * ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the + * input is a raw deflate stream. */ +/* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available + * beyond the end of the supplied input buffer. If clear, the input buffer + * contains all remaining input. */ +/* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large + * enough to hold the entire decompressed stream. If clear, the output buffer is + * at least the size of the dictionary (typically 32KB). */ +/* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the + * decompressed bytes. */ +enum { + TINFL_FLAG_PARSE_ZLIB_HEADER = 1, + TINFL_FLAG_HAS_MORE_INPUT = 2, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4, + TINFL_FLAG_COMPUTE_ADLER32 = 8 +}; + +/* High level decompression functions: */ +/* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block + * allocated via malloc(). */ +/* On entry: */ +/* pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data + * to decompress. */ +/* On return: */ +/* Function returns a pointer to the decompressed data, or NULL on failure. */ +/* *pOut_len will be set to the decompressed data's size, which could be larger + * than src_buf_len on uncompressible data. */ +/* The caller must call mz_free() on the returned block when it's no longer + * needed. */ +MINIZ_EXPORT void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, + size_t src_buf_len, + size_t *pOut_len, int flags); + +/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block + * in memory. */ +/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes + * written on success. */ +#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1)) +MINIZ_EXPORT size_t tinfl_decompress_mem_to_mem(void *pOut_buf, + size_t out_buf_len, + const void *pSrc_buf, + size_t src_buf_len, int flags); + +/* tinfl_decompress_mem_to_callback() decompresses a block in memory to an + * internal 32KB buffer, and a user provided callback function will be called to + * flush the buffer. */ +/* Returns 1 on success or 0 on failure. */ +typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser); +MINIZ_EXPORT int +tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, + tinfl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags); + +struct tinfl_decompressor_tag; +typedef struct tinfl_decompressor_tag tinfl_decompressor; + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tinfl_decompressor structure in C so that */ +/* non-C language bindings to tinfl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +MINIZ_EXPORT tinfl_decompressor *tinfl_decompressor_alloc(void); +MINIZ_EXPORT void tinfl_decompressor_free(tinfl_decompressor *pDecomp); +#endif + +/* Max size of LZ dictionary. */ +#define TINFL_LZ_DICT_SIZE 32768 + +/* Return status. */ +typedef enum { + /* This flags indicates the inflator needs 1 or more input bytes to make + forward progress, but the caller is indicating that no more are available. + The compressed data */ + /* is probably corrupted. If you call the inflator again with more bytes it'll + try to continue processing the input but this is a BAD sign (either the + data is corrupted or you called it incorrectly). */ + /* If you call it again with no input you'll just get + TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */ + TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4, + + /* This flag indicates that one or more of the input parameters was obviously + bogus. (You can try calling it again, but if you get this error the calling + code is wrong.) */ + TINFL_STATUS_BAD_PARAM = -3, + + /* This flags indicate the inflator is finished but the adler32 check of the + uncompressed data didn't match. If you call it again it'll return + TINFL_STATUS_DONE. */ + TINFL_STATUS_ADLER32_MISMATCH = -2, + + /* This flags indicate the inflator has somehow failed (bad code, corrupted + input, etc.). If you call it again without resetting via tinfl_init() it + it'll just keep on returning the same status failure code. */ + TINFL_STATUS_FAILED = -1, + + /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */ + + /* This flag indicates the inflator has returned every byte of uncompressed + data that it can, has consumed every byte that it needed, has successfully + reached the end of the deflate stream, and */ + /* if zlib headers and adler32 checking enabled that it has successfully + checked the uncompressed data's adler32. If you call it again you'll just + get TINFL_STATUS_DONE over and over again. */ + TINFL_STATUS_DONE = 0, + + /* This flag indicates the inflator MUST have more input data (even 1 byte) + before it can make any more forward progress, or you need to clear the + TINFL_FLAG_HAS_MORE_INPUT */ + /* flag on the next call if you don't have any more source data. If the source + data was somehow corrupted it's also possible (but unlikely) for the + inflator to keep on demanding input to */ + /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */ + TINFL_STATUS_NEEDS_MORE_INPUT = 1, + + /* This flag indicates the inflator definitely has 1 or more bytes of + uncompressed data available, but it cannot write this data into the output + buffer. */ + /* Note if the source compressed data was corrupted it's possible for the + inflator to return a lot of uncompressed data to the caller. I've been + assuming you know how much uncompressed data to expect */ + /* (either exact or worst case) and will stop calling the inflator and fail + after receiving too much. In pure streaming scenarios where you have no + idea how many bytes to expect this may not be possible */ + /* so I may need to add some code to address this. */ + TINFL_STATUS_HAS_MORE_OUTPUT = 2 +} tinfl_status; + +/* Initializes the decompressor to its initial state. */ +#define tinfl_init(r) \ + do { \ + (r)->m_state = 0; \ + } \ + MZ_MACRO_END +#define tinfl_get_adler32(r) (r)->m_check_adler32 + +/* Main low-level decompressor coroutine function. This is the only function + * actually needed for decompression. All the other functions are just + * high-level helpers for improved usability. */ +/* This is a universal API, i.e. it can be used as a building block to build any + * desired higher level decompression API. In the limit case, it can be called + * once per every byte input or output. */ +MINIZ_EXPORT tinfl_status tinfl_decompress( + tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, + mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, + const mz_uint32 decomp_flags); + +/* Internal/private bits follow. */ +enum { + TINFL_MAX_HUFF_TABLES = 3, + TINFL_MAX_HUFF_SYMBOLS_0 = 288, + TINFL_MAX_HUFF_SYMBOLS_1 = 32, + TINFL_MAX_HUFF_SYMBOLS_2 = 19, + TINFL_FAST_LOOKUP_BITS = 10, + TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS +}; + +typedef struct { + mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0]; + mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], + m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2]; +} tinfl_huff_table; + +#if MINIZ_HAS_64BIT_REGISTERS +#define TINFL_USE_64BIT_BITBUF 1 +#else +#define TINFL_USE_64BIT_BITBUF 0 +#endif + +#if TINFL_USE_64BIT_BITBUF +typedef mz_uint64 tinfl_bit_buf_t; +#define TINFL_BITBUF_SIZE (64) +#else +typedef mz_uint32 tinfl_bit_buf_t; +#define TINFL_BITBUF_SIZE (32) +#endif + +struct tinfl_decompressor_tag { + mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, + m_check_adler32, m_dist, m_counter, m_num_extra, + m_table_sizes[TINFL_MAX_HUFF_TABLES]; + tinfl_bit_buf_t m_bit_buf; + size_t m_dist_from_out_buf_start; + tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES]; + mz_uint8 m_raw_header[4], + m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137]; +}; + +#ifdef __cplusplus +} +#endif + +#pragma once + +/* ------------------- ZIP archive reading/writing */ + +#ifndef MINIZ_NO_ARCHIVE_APIS + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + /* Note: These enums can be reduced as needed to save memory or stack space - + they are pretty conservative. */ + MZ_ZIP_MAX_IO_BUF_SIZE = 8 * 1024, + MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512, + MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512 +}; + +typedef struct { + /* Central directory file index. */ + mz_uint32 m_file_index; + + /* Byte offset of this entry in the archive's central directory. Note we + * currently only support up to UINT_MAX or less bytes in the central dir. */ + mz_uint64 m_central_dir_ofs; + + /* These fields are copied directly from the zip's central dir. */ + mz_uint16 m_version_made_by; + mz_uint16 m_version_needed; + mz_uint16 m_bit_flag; + mz_uint16 m_method; + +#ifndef MINIZ_NO_TIME + MZ_TIME_T m_time; +#endif + + /* CRC-32 of uncompressed data. */ + mz_uint32 m_crc32; + + /* File's compressed size. */ + mz_uint64 m_comp_size; + + /* File's uncompressed size. Note, I've seen some old archives where directory + * entries had 512 bytes for their uncompressed sizes, but when you try to + * unpack them you actually get 0 bytes. */ + mz_uint64 m_uncomp_size; + + /* Zip internal and external file attributes. */ + mz_uint16 m_internal_attr; + mz_uint32 m_external_attr; + + /* Entry's local header file offset in bytes. */ + mz_uint64 m_local_header_ofs; + + /* Size of comment in bytes. */ + mz_uint32 m_comment_size; + + /* MZ_TRUE if the entry appears to be a directory. */ + mz_bool m_is_directory; + + /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip + * doesn't support) */ + mz_bool m_is_encrypted; + + /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a + * compression method we support. */ + mz_bool m_is_supported; + + /* Filename. If string ends in '/' it's a subdirectory entry. */ + /* Guaranteed to be zero terminated, may be truncated to fit. */ + char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE]; + + /* Comment field. */ + /* Guaranteed to be zero terminated, may be truncated to fit. */ + char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE]; + +} mz_zip_archive_file_stat; + +typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n); +typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n); +typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); + +struct mz_zip_internal_state_tag; +typedef struct mz_zip_internal_state_tag mz_zip_internal_state; + +typedef enum { + MZ_ZIP_MODE_INVALID = 0, + MZ_ZIP_MODE_READING = 1, + MZ_ZIP_MODE_WRITING = 2, + MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 +} mz_zip_mode; + +typedef enum { + MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100, + MZ_ZIP_FLAG_IGNORE_PATH = 0x0200, + MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400, + MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800, + MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = + 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each + file as its validated to ensure the func finds the file in the + central dir (intended for testing) */ + MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = + 0x2000, /* validate the local headers, but don't decompress the entire + file and check the crc32 */ + MZ_ZIP_FLAG_WRITE_ZIP64 = + 0x4000, /* always use the zip64 file format, instead of the original zip + file format with automatic switch to zip64. Use as flags + parameter with mz_zip_writer_init*_v2 */ + MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000, + MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000, + /*After adding a compressed file, seek back + to local file header and set the correct sizes*/ + MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE = 0x20000 +} mz_zip_flags; + +typedef enum { + MZ_ZIP_TYPE_INVALID = 0, + MZ_ZIP_TYPE_USER, + MZ_ZIP_TYPE_MEMORY, + MZ_ZIP_TYPE_HEAP, + MZ_ZIP_TYPE_FILE, + MZ_ZIP_TYPE_CFILE, + MZ_ZIP_TOTAL_TYPES +} mz_zip_type; + +/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or + * modify this enum. */ +typedef enum { + MZ_ZIP_NO_ERROR = 0, + MZ_ZIP_UNDEFINED_ERROR, + MZ_ZIP_TOO_MANY_FILES, + MZ_ZIP_FILE_TOO_LARGE, + MZ_ZIP_UNSUPPORTED_METHOD, + MZ_ZIP_UNSUPPORTED_ENCRYPTION, + MZ_ZIP_UNSUPPORTED_FEATURE, + MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, + MZ_ZIP_NOT_AN_ARCHIVE, + MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, + MZ_ZIP_UNSUPPORTED_MULTIDISK, + MZ_ZIP_DECOMPRESSION_FAILED, + MZ_ZIP_COMPRESSION_FAILED, + MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, + MZ_ZIP_CRC_CHECK_FAILED, + MZ_ZIP_UNSUPPORTED_CDIR_SIZE, + MZ_ZIP_ALLOC_FAILED, + MZ_ZIP_FILE_OPEN_FAILED, + MZ_ZIP_FILE_CREATE_FAILED, + MZ_ZIP_FILE_WRITE_FAILED, + MZ_ZIP_FILE_READ_FAILED, + MZ_ZIP_FILE_CLOSE_FAILED, + MZ_ZIP_FILE_SEEK_FAILED, + MZ_ZIP_FILE_STAT_FAILED, + MZ_ZIP_INVALID_PARAMETER, + MZ_ZIP_INVALID_FILENAME, + MZ_ZIP_BUF_TOO_SMALL, + MZ_ZIP_INTERNAL_ERROR, + MZ_ZIP_FILE_NOT_FOUND, + MZ_ZIP_ARCHIVE_TOO_LARGE, + MZ_ZIP_VALIDATION_FAILED, + MZ_ZIP_WRITE_CALLBACK_FAILED, + MZ_ZIP_TOTAL_ERRORS +} mz_zip_error; + +typedef struct { + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; + + /* We only support up to UINT32_MAX files in zip64 mode. */ + mz_uint32 m_total_files; + mz_zip_mode m_zip_mode; + mz_zip_type m_zip_type; + mz_zip_error m_last_error; + + mz_uint64 m_file_offset_alignment; + + mz_alloc_func m_pAlloc; + mz_free_func m_pFree; + mz_realloc_func m_pRealloc; + void *m_pAlloc_opaque; + + mz_file_read_func m_pRead; + mz_file_write_func m_pWrite; + mz_file_needs_keepalive m_pNeeds_keepalive; + void *m_pIO_opaque; + + mz_zip_internal_state *m_pState; + +} mz_zip_archive; + +typedef struct { + mz_zip_archive *pZip; + mz_uint flags; + + int status; +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + mz_uint file_crc32; +#endif + mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining, + out_buf_ofs, cur_file_ofs; + mz_zip_archive_file_stat file_stat; + void *pRead_buf; + void *pWrite_buf; + + size_t out_blk_remain; + + tinfl_decompressor inflator; + +} mz_zip_reader_extract_iter_state; + +/* -------- ZIP reading */ + +/* Inits a ZIP archive reader. */ +/* These functions read and validate the archive's central directory. */ +MINIZ_EXPORT mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, + mz_uint flags); + +MINIZ_EXPORT mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, + const void *pMem, size_t size, + mz_uint flags); + +#ifndef MINIZ_NO_STDIO +/* Read a archive from a disk file. */ +/* file_start_ofs is the file offset where the archive actually begins, or 0. */ +/* actual_archive_size is the true total size of the archive, which may be + * smaller than the file's actual size on disk. If zero the entire file is + * treated as the archive. */ +MINIZ_EXPORT mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, + const char *pFilename, + mz_uint32 flags); +MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, + const char *pFilename, + mz_uint flags, + mz_uint64 file_start_ofs, + mz_uint64 archive_size); +MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2_rpb(mz_zip_archive *pZip, + const char *pFilename, + mz_uint flags, + mz_uint64 file_start_ofs, + mz_uint64 archive_size); + +/* Read an archive from an already opened FILE, beginning at the current file + * position. */ +/* The archive is assumed to be archive_size bytes long. If archive_size is 0, + * then the entire rest of the file is assumed to contain the archive. */ +/* The FILE will NOT be closed when mz_zip_reader_end() is called. */ +MINIZ_EXPORT mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, + MZ_FILE *pFile, + mz_uint64 archive_size, + mz_uint flags); +#endif + +/* Ends archive reading, freeing all allocations, and closing the input archive + * file if mz_zip_reader_init_file() was used. */ +MINIZ_EXPORT mz_bool mz_zip_reader_end(mz_zip_archive *pZip); + +/* -------- ZIP reading or writing */ + +/* Clears a mz_zip_archive struct to all zeros. */ +/* Important: This must be done before passing the struct to any mz_zip + * functions. */ +MINIZ_EXPORT void mz_zip_zero_struct(mz_zip_archive *pZip); + +MINIZ_EXPORT mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip); +MINIZ_EXPORT mz_zip_type mz_zip_get_type(mz_zip_archive *pZip); + +/* Returns the total number of files in the archive. */ +MINIZ_EXPORT mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip); + +MINIZ_EXPORT mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip); +MINIZ_EXPORT mz_uint64 +mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip); +MINIZ_EXPORT MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip); + +/* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf. + */ +MINIZ_EXPORT size_t mz_zip_read_archive_data(mz_zip_archive *pZip, + mz_uint64 file_ofs, void *pBuf, + size_t n); + +/* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct. + * These functions retrieve/manipulate this field. */ +/* Note that the m_last_error functionality is not thread safe. */ +MINIZ_EXPORT mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, + mz_zip_error err_num); +MINIZ_EXPORT mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip); +MINIZ_EXPORT mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip); +MINIZ_EXPORT mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip); +MINIZ_EXPORT const char *mz_zip_get_error_string(mz_zip_error mz_err); + +/* MZ_TRUE if the archive file entry is a directory entry. */ +MINIZ_EXPORT mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, + mz_uint file_index); + +/* MZ_TRUE if the file is encrypted/strong encrypted. */ +MINIZ_EXPORT mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, + mz_uint file_index); + +/* MZ_TRUE if the compression method is supported, and the file is not + * encrypted, and the file is not a compressed patch file. */ +MINIZ_EXPORT mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, + mz_uint file_index); + +/* Retrieves the filename of an archive file entry. */ +/* Returns the number of bytes written to pFilename, or if filename_buf_size is + * 0 this function returns the number of bytes needed to fully store the + * filename. */ +MINIZ_EXPORT mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, + mz_uint file_index, + char *pFilename, + mz_uint filename_buf_size); + +/* Attempts to locates a file in the archive's central directory. */ +/* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */ +/* Returns -1 if the file cannot be found. */ +MINIZ_EXPORT int mz_zip_reader_locate_file(mz_zip_archive *pZip, + const char *pName, + const char *pComment, mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, + const char *pName, + const char *pComment, + mz_uint flags, + mz_uint32 *file_index); + +/* Returns detailed information about an archive file entry. */ +MINIZ_EXPORT mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, + mz_uint file_index, + mz_zip_archive_file_stat *pStat); + +/* MZ_TRUE if the file is in zip64 format. */ +/* A file is considered zip64 if it contained a zip64 end of central directory + * marker, or if it contained any zip64 extended file information fields in the + * central directory. */ +MINIZ_EXPORT mz_bool mz_zip_is_zip64(mz_zip_archive *pZip); + +/* Returns the total central directory size in bytes. */ +/* The current max supported size is <= MZ_UINT32_MAX. */ +MINIZ_EXPORT size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip); + +/* Extracts a archive file to a memory buffer using no memory allocation. */ +/* There must be at least enough room on the stack to store the inflator's state + * (~34KB or so). */ +MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem_no_alloc( + mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, + mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); +MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem_no_alloc( + mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, + mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); + +/* Extracts a archive file to a memory buffer. */ +MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, + mz_uint file_index, + void *pBuf, size_t buf_size, + mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, + const char *pFilename, + void *pBuf, + size_t buf_size, + mz_uint flags); + +/* Extracts a archive file to a dynamically allocated heap buffer. */ +/* The memory will be allocated via the mz_zip_archive's alloc/realloc + * functions. */ +/* Returns NULL and sets the last error on failure. */ +MINIZ_EXPORT void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, + mz_uint file_index, + size_t *pSize, mz_uint flags); +MINIZ_EXPORT void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, + const char *pFilename, + size_t *pSize, + mz_uint flags); + +/* Extracts a archive file using a callback function to output the file's data. + */ +MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_callback( + mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, + void *pOpaque, mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_callback( + mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, + void *pOpaque, mz_uint flags); + +/* Extract a file iteratively */ +MINIZ_EXPORT mz_zip_reader_extract_iter_state * +mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, + mz_uint flags); +MINIZ_EXPORT mz_zip_reader_extract_iter_state * +mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, + mz_uint flags); +MINIZ_EXPORT size_t mz_zip_reader_extract_iter_read( + mz_zip_reader_extract_iter_state *pState, void *pvBuf, size_t buf_size); +MINIZ_EXPORT mz_bool +mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState); + +#ifndef MINIZ_NO_STDIO +/* Extracts a archive file to a disk file and sets its last accessed and + * modified times. */ +/* This function only extracts files, not archive directory records. */ +MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, + mz_uint file_index, + const char *pDst_filename, + mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_file( + mz_zip_archive *pZip, const char *pArchive_filename, + const char *pDst_filename, mz_uint flags); + +/* Extracts a archive file starting at the current position in the destination + * FILE stream. */ +MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, + mz_uint file_index, + MZ_FILE *File, + mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_cfile( + mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, + mz_uint flags); +#endif + +#if 0 +/* TODO */ + typedef void *mz_zip_streaming_extract_state_ptr; + mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags); + uint64_t mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); + uint64_t mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); + mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, uint64_t new_ofs); + size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size); + mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); +#endif + +/* This function compares the archive's local headers, the optional local zip64 + * extended information block, and the optional descriptor following the + * compressed data vs. the data in the central directory. */ +/* It also validates that each file can be successfully uncompressed unless the + * MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */ +MINIZ_EXPORT mz_bool mz_zip_validate_file(mz_zip_archive *pZip, + mz_uint file_index, mz_uint flags); + +/* Validates an entire archive by calling mz_zip_validate_file() on each file. + */ +MINIZ_EXPORT mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, + mz_uint flags); + +/* Misc utils/helpers, valid for ZIP reading or writing */ +MINIZ_EXPORT mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, + mz_uint flags, + mz_zip_error *pErr); +MINIZ_EXPORT mz_bool mz_zip_validate_file_archive(const char *pFilename, + mz_uint flags, + mz_zip_error *pErr); + +/* Universal end function - calls either mz_zip_reader_end() or + * mz_zip_writer_end(). */ +MINIZ_EXPORT mz_bool mz_zip_end(mz_zip_archive *pZip); + +/* -------- ZIP writing */ + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +/* Inits a ZIP archive writer. */ +/*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init + * or mz_zip_writer_init_v2*/ +/*The output is streamable, i.e. file_ofs in mz_file_write_func always increases + * only by n*/ +MINIZ_EXPORT mz_bool mz_zip_writer_init(mz_zip_archive *pZip, + mz_uint64 existing_size); +MINIZ_EXPORT mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, + mz_uint64 existing_size, + mz_uint flags); + +MINIZ_EXPORT mz_bool mz_zip_writer_init_heap( + mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, + size_t initial_allocation_size); +MINIZ_EXPORT mz_bool mz_zip_writer_init_heap_v2( + mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, + size_t initial_allocation_size, mz_uint flags); + +#ifndef MINIZ_NO_STDIO +MINIZ_EXPORT mz_bool +mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, + mz_uint64 size_to_reserve_at_beginning); +MINIZ_EXPORT mz_bool mz_zip_writer_init_file_v2( + mz_zip_archive *pZip, const char *pFilename, + mz_uint64 size_to_reserve_at_beginning, mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, + MZ_FILE *pFile, mz_uint flags); +#endif + +/* Converts a ZIP archive reader object into a writer object, to allow efficient + * in-place file appends to occur on an existing archive. */ +/* For archives opened using mz_zip_reader_init_file, pFilename must be the + * archive's filename so it can be reopened for writing. If the file can't be + * reopened, mz_zip_reader_end() will be called. */ +/* For archives opened using mz_zip_reader_init_mem, the memory block must be + * growable using the realloc callback (which defaults to realloc unless you've + * overridden it). */ +/* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's + * user provided m_pWrite function cannot be NULL. */ +/* Note: In-place archive modification is not recommended unless you know what + * you're doing, because if execution stops or something goes wrong before */ +/* the archive is finalized the file's central directory will be hosed. */ +MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, + const char *pFilename); +MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, + const char *pFilename, + mz_uint flags); +MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2_noreopen( + mz_zip_archive *pZip, const char *pFilename, mz_uint flags); + +/* Adds the contents of a memory buffer to an archive. These functions record + * the current local time into the archive. */ +/* To add a directory entry, call this method with an archive name ending in a + * forwardslash with an empty buffer. */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, + * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or + * just set to MZ_DEFAULT_COMPRESSION. */ +MINIZ_EXPORT mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, + const char *pArchive_name, + const void *pBuf, size_t buf_size, + mz_uint level_and_flags); + +/* Like mz_zip_writer_add_mem(), except you can specify a file comment field, + * and optionally supply the function with already compressed data. */ +/* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA + * flag is specified. */ +MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex( + mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32); + +MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex_v2( + mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, + MZ_TIME_T *last_modified, const char *user_extra_data_local, + mz_uint user_extra_data_local_len, const char *user_extra_data_central, + mz_uint user_extra_data_central_len); + +/* Adds the contents of a file to an archive. This function also records the + * disk file's modified time into the archive. */ +/* File data is supplied via a read callback function. User + * mz_zip_writer_add_(c)file to add a file directly.*/ +MINIZ_EXPORT mz_bool mz_zip_writer_add_read_buf_callback( + mz_zip_archive *pZip, const char *pArchive_name, + mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size, + const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint32 ext_attributes, + const char *user_extra_data_local, mz_uint user_extra_data_local_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len); + +#ifndef MINIZ_NO_STDIO +/* Adds the contents of a disk file to an archive. This function also records + * the disk file's modified time into the archive. */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, + * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or + * just set to MZ_DEFAULT_COMPRESSION. */ +MINIZ_EXPORT mz_bool mz_zip_writer_add_file( + mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, + const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + mz_uint32 ext_attributes); + +/* Like mz_zip_writer_add_file(), except the file data is read from the + * specified FILE stream. */ +MINIZ_EXPORT mz_bool mz_zip_writer_add_cfile( + mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, + mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, + mz_uint16 comment_size, mz_uint level_and_flags, mz_uint32 ext_attributes, + const char *user_extra_data_local, mz_uint user_extra_data_local_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len); +#endif + +/* Adds a file to an archive by fully cloning the data from another archive. */ +/* This function fully clones the source file's compressed data (no + * recompression), along with its full filename, extra data (it may add or + * modify the zip64 local header extra data field), and the optional descriptor + * following the compressed data. */ +MINIZ_EXPORT mz_bool mz_zip_writer_add_from_zip_reader( + mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index); + +/* Finalizes the archive by writing the central directory records followed by + * the end of central directory record. */ +/* After an archive is finalized, the only valid call on the mz_zip_archive + * struct is mz_zip_writer_end(). */ +/* An archive must be manually finalized by calling this function for it to be + * valid. */ +MINIZ_EXPORT mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip); + +/* Finalizes a heap archive, returning a poiner to the heap block and its size. + */ +/* The heap block will be allocated using the mz_zip_archive's alloc/realloc + * callbacks. */ +MINIZ_EXPORT mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, + void **ppBuf, + size_t *pSize); + +/* Ends archive writing, freeing all allocations, and closing the output file if + * mz_zip_writer_init_file() was used. */ +/* Note for the archive to be valid, it *must* have been finalized before ending + * (this function will not do it for you). */ +MINIZ_EXPORT mz_bool mz_zip_writer_end(mz_zip_archive *pZip); + +/* -------- Misc. high-level helper functions: */ + +/* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) + * appends a memory blob to a ZIP archive. */ +/* Note this is NOT a fully safe operation. If it crashes or dies in some way + * your archive can be left in a screwed up state (without a central directory). + */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, + * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or + * just set to MZ_DEFAULT_COMPRESSION. */ +/* TODO: Perhaps add an option to leave the existing central dir in place in + * case the add dies? We could then truncate the file (so the old central dir + * would be at the end) if something goes wrong. */ +MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place( + const char *pZip_filename, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags); +MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place_v2( + const char *pZip_filename, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_zip_error *pErr); + +/* Reads a single file from an archive into a heap block. */ +/* If pComment is not NULL, only the file with the specified comment will be + * extracted. */ +/* Returns NULL on failure. */ +MINIZ_EXPORT void * +mz_zip_extract_archive_file_to_heap(const char *pZip_filename, + const char *pArchive_name, size_t *pSize, + mz_uint flags); +MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap_v2( + const char *pZip_filename, const char *pArchive_name, const char *pComment, + size_t *pSize, mz_uint flags, mz_zip_error *pErr); + +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */ + +#ifdef __cplusplus +} +#endif + +#endif /* MINIZ_NO_ARCHIVE_APIS */ +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * 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. + * + **************************************************************************/ + +typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1]; +typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1]; +typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- zlib-style API's */ + +mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) { + mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16); + size_t block_len = buf_len % 5552; + if (!ptr) + return MZ_ADLER32_INIT; + while (buf_len) { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) { + s1 += ptr[0], s2 += s1; + s1 += ptr[1], s2 += s1; + s1 += ptr[2], s2 += s1; + s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; + s1 += ptr[5], s2 += s1; + s1 += ptr[6], s2 += s1; + s1 += ptr[7], s2 += s1; + } + for (; i < block_len; ++i) + s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; + buf_len -= block_len; + block_len = 5552; + } + return (s2 << 16) + s1; +} + +/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C + * implementation that balances processor cache usage against speed": + * http://www.geocities.com/malbrain/ */ +#if 0 + mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) + { + static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, + 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c }; + mz_uint32 crcu32 = (mz_uint32)crc; + if (!ptr) + return MZ_CRC32_INIT; + crcu32 = ~crcu32; + while (buf_len--) + { + mz_uint8 b = *ptr++; + crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)]; + crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)]; + } + return ~crcu32; + } +#elif defined(USE_EXTERNAL_MZCRC) +/* If USE_EXTERNAL_CRC is defined, an external module will export the + * mz_crc32() symbol for us to use, e.g. an SSE-accelerated version. + * Depending on the impl, it may be necessary to ~ the input/output crc values. + */ +mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len); +#else +/* Faster, but larger CPU cache footprint. + */ +mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) { + static const mz_uint32 s_crc_table[256] = { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, + 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, + 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, + 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, + 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, + 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, + 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, + 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, + 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, + 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, + 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, + 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, + 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, + 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, + 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, + 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, + 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, + 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, + 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, + 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, + 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, + 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, + 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, + 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, + 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, + 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, + 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, + 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, + 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D}; + + mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF; + const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr; + + while (buf_len >= 4) { + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF]; + pByte_buf += 4; + buf_len -= 4; + } + + while (buf_len) { + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF]; + ++pByte_buf; + --buf_len; + } + + return ~crc32; +} +#endif + +void mz_free(void *p) { MZ_FREE(p); } + +MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, + size_t size) { + (void)opaque, (void)items, (void)size; + return MZ_MALLOC(items * size); +} +MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address) { + (void)opaque, (void)address; + MZ_FREE(address); +} +MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, + size_t items, size_t size) { + (void)opaque, (void)address, (void)items, (void)size; + return MZ_REALLOC(address, items * size); +} + +const char *mz_version(void) { return MZ_VERSION; } + +#ifndef MINIZ_NO_ZLIB_APIS + +int mz_deflateInit(mz_streamp pStream, int level) { + return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, + MZ_DEFAULT_STRATEGY); +} + +int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, + int mem_level, int strategy) { + tdefl_compressor *pComp; + mz_uint comp_flags = + TDEFL_COMPUTE_ADLER32 | + tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy); + + if (!pStream) + return MZ_STREAM_ERROR; + if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || + ((window_bits != MZ_DEFAULT_WINDOW_BITS) && + (-window_bits != MZ_DEFAULT_WINDOW_BITS))) + return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = MZ_ADLER32_INIT; + pStream->msg = NULL; + pStream->reserved = 0; + pStream->total_in = 0; + pStream->total_out = 0; + if (!pStream->zalloc) + pStream->zalloc = miniz_def_alloc_func; + if (!pStream->zfree) + pStream->zfree = miniz_def_free_func; + + pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, + sizeof(tdefl_compressor)); + if (!pComp) + return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pComp; + + if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY) { + mz_deflateEnd(pStream); + return MZ_PARAM_ERROR; + } + + return MZ_OK; +} + +int mz_deflateReset(mz_streamp pStream) { + if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || + (!pStream->zfree)) + return MZ_STREAM_ERROR; + pStream->total_in = pStream->total_out = 0; + tdefl_init((tdefl_compressor *)pStream->state, NULL, NULL, + ((tdefl_compressor *)pStream->state)->m_flags); + return MZ_OK; +} + +int mz_deflate(mz_streamp pStream, int flush) { + size_t in_bytes, out_bytes; + mz_ulong orig_total_in, orig_total_out; + int mz_status = MZ_OK; + + if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || + (!pStream->next_out)) + return MZ_STREAM_ERROR; + if (!pStream->avail_out) + return MZ_BUF_ERROR; + + if (flush == MZ_PARTIAL_FLUSH) + flush = MZ_SYNC_FLUSH; + + if (((tdefl_compressor *)pStream->state)->m_prev_return_status == + TDEFL_STATUS_DONE) + return (flush == MZ_FINISH) ? MZ_STREAM_END : MZ_BUF_ERROR; + + orig_total_in = pStream->total_in; + orig_total_out = pStream->total_out; + for (;;) { + tdefl_status defl_status; + in_bytes = pStream->avail_in; + out_bytes = pStream->avail_out; + + defl_status = tdefl_compress((tdefl_compressor *)pStream->state, + pStream->next_in, &in_bytes, pStream->next_out, + &out_bytes, (tdefl_flush)flush); + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tdefl_get_adler32((tdefl_compressor *)pStream->state); + + pStream->next_out += (mz_uint)out_bytes; + pStream->avail_out -= (mz_uint)out_bytes; + pStream->total_out += (mz_uint)out_bytes; + + if (defl_status < 0) { + mz_status = MZ_STREAM_ERROR; + break; + } else if (defl_status == TDEFL_STATUS_DONE) { + mz_status = MZ_STREAM_END; + break; + } else if (!pStream->avail_out) + break; + else if ((!pStream->avail_in) && (flush != MZ_FINISH)) { + if ((flush) || (pStream->total_in != orig_total_in) || + (pStream->total_out != orig_total_out)) + break; + return MZ_BUF_ERROR; /* Can't make forward progress without some input. + */ + } + } + return mz_status; +} + +int mz_deflateEnd(mz_streamp pStream) { + if (!pStream) + return MZ_STREAM_ERROR; + if (pStream->state) { + pStream->zfree(pStream->opaque, pStream->state); + pStream->state = NULL; + } + return MZ_OK; +} + +mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len) { + (void)pStream; + /* This is really over conservative. (And lame, but it's actually pretty + * tricky to compute a true upper bound given the way tdefl's blocking works.) + */ + return MZ_MAX(128 + (source_len * 110) / 100, + 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5); +} + +int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong source_len, int level) { + int status; + mz_stream stream; + memset(&stream, 0, sizeof(stream)); + + /* In case mz_ulong is 64-bits (argh I hate longs). */ + if ((source_len | *pDest_len) > 0xFFFFFFFFU) + return MZ_PARAM_ERROR; + + stream.next_in = pSource; + stream.avail_in = (mz_uint32)source_len; + stream.next_out = pDest; + stream.avail_out = (mz_uint32)*pDest_len; + + status = mz_deflateInit(&stream, level); + if (status != MZ_OK) + return status; + + status = mz_deflate(&stream, MZ_FINISH); + if (status != MZ_STREAM_END) { + mz_deflateEnd(&stream); + return (status == MZ_OK) ? MZ_BUF_ERROR : status; + } + + *pDest_len = stream.total_out; + return mz_deflateEnd(&stream); +} + +int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong source_len) { + return mz_compress2(pDest, pDest_len, pSource, source_len, + MZ_DEFAULT_COMPRESSION); +} + +mz_ulong mz_compressBound(mz_ulong source_len) { + return mz_deflateBound(NULL, source_len); +} + +typedef struct { + tinfl_decompressor m_decomp; + mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; + int m_window_bits; + mz_uint8 m_dict[TINFL_LZ_DICT_SIZE]; + tinfl_status m_last_status; +} inflate_state; + +int mz_inflateInit2(mz_streamp pStream, int window_bits) { + inflate_state *pDecomp; + if (!pStream) + return MZ_STREAM_ERROR; + if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && + (-window_bits != MZ_DEFAULT_WINDOW_BITS)) + return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = 0; + pStream->msg = NULL; + pStream->total_in = 0; + pStream->total_out = 0; + pStream->reserved = 0; + if (!pStream->zalloc) + pStream->zalloc = miniz_def_alloc_func; + if (!pStream->zfree) + pStream->zfree = miniz_def_free_func; + + pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1, + sizeof(inflate_state)); + if (!pDecomp) + return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pDecomp; + + tinfl_init(&pDecomp->m_decomp); + pDecomp->m_dict_ofs = 0; + pDecomp->m_dict_avail = 0; + pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT; + pDecomp->m_first_call = 1; + pDecomp->m_has_flushed = 0; + pDecomp->m_window_bits = window_bits; + + return MZ_OK; +} + +int mz_inflateInit(mz_streamp pStream) { + return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS); +} + +int mz_inflateReset(mz_streamp pStream) { + inflate_state *pDecomp; + if (!pStream) + return MZ_STREAM_ERROR; + + pStream->data_type = 0; + pStream->adler = 0; + pStream->msg = NULL; + pStream->total_in = 0; + pStream->total_out = 0; + pStream->reserved = 0; + + pDecomp = (inflate_state *)pStream->state; + + tinfl_init(&pDecomp->m_decomp); + pDecomp->m_dict_ofs = 0; + pDecomp->m_dict_avail = 0; + pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT; + pDecomp->m_first_call = 1; + pDecomp->m_has_flushed = 0; + /* pDecomp->m_window_bits = window_bits */; + + return MZ_OK; +} + +int mz_inflate(mz_streamp pStream, int flush) { + inflate_state *pState; + mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32; + size_t in_bytes, out_bytes, orig_avail_in; + tinfl_status status; + + if ((!pStream) || (!pStream->state)) + return MZ_STREAM_ERROR; + if (flush == MZ_PARTIAL_FLUSH) + flush = MZ_SYNC_FLUSH; + if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH)) + return MZ_STREAM_ERROR; + + pState = (inflate_state *)pStream->state; + if (pState->m_window_bits > 0) + decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER; + orig_avail_in = pStream->avail_in; + + first_call = pState->m_first_call; + pState->m_first_call = 0; + if (pState->m_last_status < 0) + return MZ_DATA_ERROR; + + if (pState->m_has_flushed && (flush != MZ_FINISH)) + return MZ_STREAM_ERROR; + pState->m_has_flushed |= (flush == MZ_FINISH); + + if ((flush == MZ_FINISH) && (first_call)) { + /* MZ_FINISH on the first call implies that the input and output buffers are + * large enough to hold the entire compressed/decompressed file. */ + decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF; + in_bytes = pStream->avail_in; + out_bytes = pStream->avail_out; + status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, + pStream->next_out, pStream->next_out, &out_bytes, + decomp_flags); + pState->m_last_status = status; + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tinfl_get_adler32(&pState->m_decomp); + pStream->next_out += (mz_uint)out_bytes; + pStream->avail_out -= (mz_uint)out_bytes; + pStream->total_out += (mz_uint)out_bytes; + + if (status < 0) + return MZ_DATA_ERROR; + else if (status != TINFL_STATUS_DONE) { + pState->m_last_status = TINFL_STATUS_FAILED; + return MZ_BUF_ERROR; + } + return MZ_STREAM_END; + } + /* flush != MZ_FINISH then we must assume there's more input. */ + if (flush != MZ_FINISH) + decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT; + + if (pState->m_dict_avail) { + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; + pStream->avail_out -= n; + pStream->total_out += n; + pState->m_dict_avail -= n; + pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + return ((pState->m_last_status == TINFL_STATUS_DONE) && + (!pState->m_dict_avail)) + ? MZ_STREAM_END + : MZ_OK; + } + + for (;;) { + in_bytes = pStream->avail_in; + out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs; + + status = tinfl_decompress( + &pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, + pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags); + pState->m_last_status = status; + + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tinfl_get_adler32(&pState->m_decomp); + + pState->m_dict_avail = (mz_uint)out_bytes; + + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; + pStream->avail_out -= n; + pStream->total_out += n; + pState->m_dict_avail -= n; + pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + + if (status < 0) + return MZ_DATA_ERROR; /* Stream is corrupted (there could be some + uncompressed data left in the output dictionary - + oh well). */ + else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in)) + return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress + without supplying more input or by setting flush + to MZ_FINISH. */ + else if (flush == MZ_FINISH) { + /* The output buffer MUST be large to hold the remaining uncompressed data + * when flush==MZ_FINISH. */ + if (status == TINFL_STATUS_DONE) + return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END; + /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's + * at least 1 more byte on the way. If there's no more room left in the + * output buffer then something is wrong. */ + else if (!pStream->avail_out) + return MZ_BUF_ERROR; + } else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || + (!pStream->avail_out) || (pState->m_dict_avail)) + break; + } + + return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) + ? MZ_STREAM_END + : MZ_OK; +} + +int mz_inflateEnd(mz_streamp pStream) { + if (!pStream) + return MZ_STREAM_ERROR; + if (pStream->state) { + pStream->zfree(pStream->opaque, pStream->state); + pStream->state = NULL; + } + return MZ_OK; +} +int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong *pSource_len) { + mz_stream stream; + int status; + memset(&stream, 0, sizeof(stream)); + + /* In case mz_ulong is 64-bits (argh I hate longs). */ + if ((*pSource_len | *pDest_len) > 0xFFFFFFFFU) + return MZ_PARAM_ERROR; + + stream.next_in = pSource; + stream.avail_in = (mz_uint32)*pSource_len; + stream.next_out = pDest; + stream.avail_out = (mz_uint32)*pDest_len; + + status = mz_inflateInit(&stream); + if (status != MZ_OK) + return status; + + status = mz_inflate(&stream, MZ_FINISH); + *pSource_len = *pSource_len - stream.avail_in; + if (status != MZ_STREAM_END) { + mz_inflateEnd(&stream); + return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR + : status; + } + *pDest_len = stream.total_out; + + return mz_inflateEnd(&stream); +} + +int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, + const unsigned char *pSource, mz_ulong source_len) { + return mz_uncompress2(pDest, pDest_len, pSource, &source_len); +} + +const char *mz_error(int err) { + static struct { + int m_err; + const char *m_pDesc; + } s_error_descs[] = {{MZ_OK, ""}, + {MZ_STREAM_END, "stream end"}, + {MZ_NEED_DICT, "need dictionary"}, + {MZ_ERRNO, "file error"}, + {MZ_STREAM_ERROR, "stream error"}, + {MZ_DATA_ERROR, "data error"}, + {MZ_MEM_ERROR, "out of memory"}, + {MZ_BUF_ERROR, "buf error"}, + {MZ_VERSION_ERROR, "version error"}, + {MZ_PARAM_ERROR, "parameter error"}}; + mz_uint i; + for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i) + if (s_error_descs[i].m_err == err) + return s_error_descs[i].m_pDesc; + return NULL; +} + +#endif /*MINIZ_NO_ZLIB_APIS */ + +#ifdef __cplusplus +} +#endif + +/* + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + 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 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. + + For more information, please refer to +*/ +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * 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. + * + **************************************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- Low-level Compression (independent from all decompression + * API's) */ + +/* Purposely making these tables static for faster init and thread safety. */ +static const mz_uint16 s_tdefl_len_sym[256] = { + 257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, + 268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, + 272, 272, 273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, + 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, + 276, 276, 276, 276, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, + 277, 277, 277, 277, 277, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 278, 278, 278, 278, 278, 278, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 280, 280, 280, 280, 280, 280, 280, 280, + 280, 280, 280, 280, 280, 280, 280, 280, 281, 281, 281, 281, 281, 281, 281, + 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 282, 282, 282, 282, 282, + 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, + 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 284, + 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, + 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, + 285}; + +static const mz_uint8 s_tdefl_len_extra[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0}; + +static const mz_uint8 s_tdefl_small_dist_sym[512] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, + 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17}; + +static const mz_uint8 s_tdefl_small_dist_extra[512] = { + 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}; + +static const mz_uint8 s_tdefl_large_dist_sym[128] = { + 0, 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, + 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29}; + +static const mz_uint8 s_tdefl_large_dist_extra[128] = { + 0, 0, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13}; + +/* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted + * values. */ +typedef struct { + mz_uint16 m_key, m_sym_index; +} tdefl_sym_freq; +static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms, + tdefl_sym_freq *pSyms0, + tdefl_sym_freq *pSyms1) { + mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2]; + tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1; + MZ_CLEAR_OBJ(hist); + for (i = 0; i < num_syms; i++) { + mz_uint freq = pSyms0[i].m_key; + hist[freq & 0xFF]++; + hist[256 + ((freq >> 8) & 0xFF)]++; + } + while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256])) + total_passes--; + for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8) { + const mz_uint32 *pHist = &hist[pass << 8]; + mz_uint offsets[256], cur_ofs = 0; + for (i = 0; i < 256; i++) { + offsets[i] = cur_ofs; + cur_ofs += pHist[i]; + } + for (i = 0; i < num_syms; i++) + pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = + pCur_syms[i]; + { + tdefl_sym_freq *t = pCur_syms; + pCur_syms = pNew_syms; + pNew_syms = t; + } + } + return pCur_syms; +} + +/* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat, + * alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */ +static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n) { + int root, leaf, next, avbl, used, dpth; + if (n == 0) + return; + else if (n == 1) { + A[0].m_key = 1; + return; + } + A[0].m_key += A[1].m_key; + root = 0; + leaf = 2; + for (next = 1; next < n - 1; next++) { + if (leaf >= n || A[root].m_key < A[leaf].m_key) { + A[next].m_key = A[root].m_key; + A[root++].m_key = (mz_uint16)next; + } else + A[next].m_key = A[leaf++].m_key; + if (leaf >= n || (root < next && A[root].m_key < A[leaf].m_key)) { + A[next].m_key = (mz_uint16)(A[next].m_key + A[root].m_key); + A[root++].m_key = (mz_uint16)next; + } else + A[next].m_key = (mz_uint16)(A[next].m_key + A[leaf++].m_key); + } + A[n - 2].m_key = 0; + for (next = n - 3; next >= 0; next--) + A[next].m_key = A[A[next].m_key].m_key + 1; + avbl = 1; + used = dpth = 0; + root = n - 2; + next = n - 1; + while (avbl > 0) { + while (root >= 0 && (int)A[root].m_key == dpth) { + used++; + root--; + } + while (avbl > used) { + A[next--].m_key = (mz_uint16)(dpth); + avbl--; + } + avbl = 2 * used; + dpth++; + used = 0; + } +} + +/* Limits canonical Huffman code table's max code size. */ +enum { TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32 }; +static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, + int code_list_len, + int max_code_size) { + int i; + mz_uint32 total = 0; + if (code_list_len <= 1) + return; + for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++) + pNum_codes[max_code_size] += pNum_codes[i]; + for (i = max_code_size; i > 0; i--) + total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i)); + while (total != (1UL << max_code_size)) { + pNum_codes[max_code_size]--; + for (i = max_code_size - 1; i > 0; i--) + if (pNum_codes[i]) { + pNum_codes[i]--; + pNum_codes[i + 1] += 2; + break; + } + total--; + } +} + +static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, + int table_len, int code_size_limit, + int static_table) { + int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE]; + mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1]; + MZ_CLEAR_OBJ(num_codes); + if (static_table) { + for (i = 0; i < table_len; i++) + num_codes[d->m_huff_code_sizes[table_num][i]]++; + } else { + tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], + *pSyms; + int num_used_syms = 0; + const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0]; + for (i = 0; i < table_len; i++) + if (pSym_count[i]) { + syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i]; + syms0[num_used_syms++].m_sym_index = (mz_uint16)i; + } + + pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1); + tdefl_calculate_minimum_redundancy(pSyms, num_used_syms); + + for (i = 0; i < num_used_syms; i++) + num_codes[pSyms[i].m_key]++; + + tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms, + code_size_limit); + + MZ_CLEAR_OBJ(d->m_huff_code_sizes[table_num]); + MZ_CLEAR_OBJ(d->m_huff_codes[table_num]); + for (i = 1, j = num_used_syms; i <= code_size_limit; i++) + for (l = num_codes[i]; l > 0; l--) + d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i); + } + + next_code[1] = 0; + for (j = 0, i = 2; i <= code_size_limit; i++) + next_code[i] = j = ((j + num_codes[i - 1]) << 1); + + for (i = 0; i < table_len; i++) { + mz_uint rev_code = 0, code, code_size; + if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0) + continue; + code = next_code[code_size]++; + for (l = code_size; l > 0; l--, code >>= 1) + rev_code = (rev_code << 1) | (code & 1); + d->m_huff_codes[table_num][i] = (mz_uint16)rev_code; + } +} + +#define TDEFL_PUT_BITS(b, l) \ + do { \ + mz_uint bits = b; \ + mz_uint len = l; \ + MZ_ASSERT(bits <= ((1U << len) - 1U)); \ + d->m_bit_buffer |= (bits << d->m_bits_in); \ + d->m_bits_in += len; \ + while (d->m_bits_in >= 8) { \ + if (d->m_pOutput_buf < d->m_pOutput_buf_end) \ + *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \ + d->m_bit_buffer >>= 8; \ + d->m_bits_in -= 8; \ + } \ + } \ + MZ_MACRO_END + +#define TDEFL_RLE_PREV_CODE_SIZE() \ + { \ + if (rle_repeat_count) { \ + if (rle_repeat_count < 3) { \ + d->m_huff_count[2][prev_code_size] = \ + (mz_uint16)(d->m_huff_count[2][prev_code_size] + \ + rle_repeat_count); \ + while (rle_repeat_count--) \ + packed_code_sizes[num_packed_code_sizes++] = prev_code_size; \ + } else { \ + d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 16; \ + packed_code_sizes[num_packed_code_sizes++] = \ + (mz_uint8)(rle_repeat_count - 3); \ + } \ + rle_repeat_count = 0; \ + } \ + } + +#define TDEFL_RLE_ZERO_CODE_SIZE() \ + { \ + if (rle_z_count) { \ + if (rle_z_count < 3) { \ + d->m_huff_count[2][0] = \ + (mz_uint16)(d->m_huff_count[2][0] + rle_z_count); \ + while (rle_z_count--) \ + packed_code_sizes[num_packed_code_sizes++] = 0; \ + } else if (rle_z_count <= 10) { \ + d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 17; \ + packed_code_sizes[num_packed_code_sizes++] = \ + (mz_uint8)(rle_z_count - 3); \ + } else { \ + d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 18; \ + packed_code_sizes[num_packed_code_sizes++] = \ + (mz_uint8)(rle_z_count - 11); \ + } \ + rle_z_count = 0; \ + } \ + } + +static mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + +static void tdefl_start_dynamic_block(tdefl_compressor *d) { + int num_lit_codes, num_dist_codes, num_bit_lengths; + mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, + rle_repeat_count, packed_code_sizes_index; + mz_uint8 + code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], + packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], + prev_code_size = 0xFF; + + d->m_huff_count[0][256] = 1; + + tdefl_optimize_huffman_table(d, 0, TDEFL_MAX_HUFF_SYMBOLS_0, 15, MZ_FALSE); + tdefl_optimize_huffman_table(d, 1, TDEFL_MAX_HUFF_SYMBOLS_1, 15, MZ_FALSE); + + for (num_lit_codes = 286; num_lit_codes > 257; num_lit_codes--) + if (d->m_huff_code_sizes[0][num_lit_codes - 1]) + break; + for (num_dist_codes = 30; num_dist_codes > 1; num_dist_codes--) + if (d->m_huff_code_sizes[1][num_dist_codes - 1]) + break; + + memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes); + memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0], + num_dist_codes); + total_code_sizes_to_pack = num_lit_codes + num_dist_codes; + num_packed_code_sizes = 0; + rle_z_count = 0; + rle_repeat_count = 0; + + memset(&d->m_huff_count[2][0], 0, + sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2); + for (i = 0; i < total_code_sizes_to_pack; i++) { + mz_uint8 code_size = code_sizes_to_pack[i]; + if (!code_size) { + TDEFL_RLE_PREV_CODE_SIZE(); + if (++rle_z_count == 138) { + TDEFL_RLE_ZERO_CODE_SIZE(); + } + } else { + TDEFL_RLE_ZERO_CODE_SIZE(); + if (code_size != prev_code_size) { + TDEFL_RLE_PREV_CODE_SIZE(); + d->m_huff_count[2][code_size] = + (mz_uint16)(d->m_huff_count[2][code_size] + 1); + packed_code_sizes[num_packed_code_sizes++] = code_size; + } else if (++rle_repeat_count == 6) { + TDEFL_RLE_PREV_CODE_SIZE(); + } + } + prev_code_size = code_size; + } + if (rle_repeat_count) { + TDEFL_RLE_PREV_CODE_SIZE(); + } else { + TDEFL_RLE_ZERO_CODE_SIZE(); + } + + tdefl_optimize_huffman_table(d, 2, TDEFL_MAX_HUFF_SYMBOLS_2, 7, MZ_FALSE); + + TDEFL_PUT_BITS(2, 2); + + TDEFL_PUT_BITS(num_lit_codes - 257, 5); + TDEFL_PUT_BITS(num_dist_codes - 1, 5); + + for (num_bit_lengths = 18; num_bit_lengths >= 0; num_bit_lengths--) + if (d->m_huff_code_sizes + [2][s_tdefl_packed_code_size_syms_swizzle[num_bit_lengths]]) + break; + num_bit_lengths = MZ_MAX(4, (num_bit_lengths + 1)); + TDEFL_PUT_BITS(num_bit_lengths - 4, 4); + for (i = 0; (int)i < num_bit_lengths; i++) + TDEFL_PUT_BITS( + d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[i]], 3); + + for (packed_code_sizes_index = 0; + packed_code_sizes_index < num_packed_code_sizes;) { + mz_uint code = packed_code_sizes[packed_code_sizes_index++]; + MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2); + TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]); + if (code >= 16) + TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], + "\02\03\07"[code - 16]); + } +} + +static void tdefl_start_static_block(tdefl_compressor *d) { + mz_uint i; + mz_uint8 *p = &d->m_huff_code_sizes[0][0]; + + for (i = 0; i <= 143; ++i) + *p++ = 8; + for (; i <= 255; ++i) + *p++ = 9; + for (; i <= 279; ++i) + *p++ = 7; + for (; i <= 287; ++i) + *p++ = 8; + + memset(d->m_huff_code_sizes[1], 5, 32); + + tdefl_optimize_huffman_table(d, 0, 288, 15, MZ_TRUE); + tdefl_optimize_huffman_table(d, 1, 32, 15, MZ_TRUE); + + TDEFL_PUT_BITS(1, 2); +} + +static const mz_uint mz_bitmasks[17] = { + 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, + 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF}; + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && \ + MINIZ_HAS_64BIT_REGISTERS +static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) { + mz_uint flags; + mz_uint8 *pLZ_codes; + mz_uint8 *pOutput_buf = d->m_pOutput_buf; + mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf; + mz_uint64 bit_buffer = d->m_bit_buffer; + mz_uint bits_in = d->m_bits_in; + +#define TDEFL_PUT_BITS_FAST(b, l) \ + { \ + bit_buffer |= (((mz_uint64)(b)) << bits_in); \ + bits_in += (l); \ + } + + flags = 1; + for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; + flags >>= 1) { + if (flags == 1) + flags = *pLZ_codes++ | 0x100; + + if (flags & 1) { + mz_uint s0, s1, n0, n1, sym, num_extra_bits; + mz_uint match_len = pLZ_codes[0], + match_dist = *(const mz_uint16 *)(pLZ_codes + 1); + pLZ_codes += 3; + + MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], + d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], + s_tdefl_len_extra[match_len]); + + /* This sequence coaxes MSVC into using cmov's vs. jmp's. */ + s0 = s_tdefl_small_dist_sym[match_dist & 511]; + n0 = s_tdefl_small_dist_extra[match_dist & 511]; + s1 = s_tdefl_large_dist_sym[match_dist >> 8]; + n1 = s_tdefl_large_dist_extra[match_dist >> 8]; + sym = (match_dist < 512) ? s0 : s1; + num_extra_bits = (match_dist < 512) ? n0 : n1; + + MZ_ASSERT(d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], + d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], + num_extra_bits); + } else { + mz_uint lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], + d->m_huff_code_sizes[0][lit]); + + if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end)) { + flags >>= 1; + lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], + d->m_huff_code_sizes[0][lit]); + + if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end)) { + flags >>= 1; + lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], + d->m_huff_code_sizes[0][lit]); + } + } + } + + if (pOutput_buf >= d->m_pOutput_buf_end) + return MZ_FALSE; + + *(mz_uint64 *)pOutput_buf = bit_buffer; + pOutput_buf += (bits_in >> 3); + bit_buffer >>= (bits_in & ~7); + bits_in &= 7; + } + +#undef TDEFL_PUT_BITS_FAST + + d->m_pOutput_buf = pOutput_buf; + d->m_bits_in = 0; + d->m_bit_buffer = 0; + + while (bits_in) { + mz_uint32 n = MZ_MIN(bits_in, 16); + TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n); + bit_buffer >>= n; + bits_in -= n; + } + + TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]); + + return (d->m_pOutput_buf < d->m_pOutput_buf_end); +} +#else +static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) { + mz_uint flags; + mz_uint8 *pLZ_codes; + + flags = 1; + for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; + flags >>= 1) { + if (flags == 1) + flags = *pLZ_codes++ | 0x100; + if (flags & 1) { + mz_uint sym, num_extra_bits; + mz_uint match_len = pLZ_codes[0], + match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8)); + pLZ_codes += 3; + + MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], + d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], + s_tdefl_len_extra[match_len]); + + if (match_dist < 512) { + sym = s_tdefl_small_dist_sym[match_dist]; + num_extra_bits = s_tdefl_small_dist_extra[match_dist]; + } else { + sym = s_tdefl_large_dist_sym[match_dist >> 8]; + num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8]; + } + MZ_ASSERT(d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits); + } else { + mz_uint lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]); + } + } + + TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]); + + return (d->m_pOutput_buf < d->m_pOutput_buf_end); +} +#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && \ + MINIZ_HAS_64BIT_REGISTERS */ + +static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block) { + if (static_block) + tdefl_start_static_block(d); + else + tdefl_start_dynamic_block(d); + return tdefl_compress_lz_codes(d); +} + +static int tdefl_flush_block(tdefl_compressor *d, int flush) { + mz_uint saved_bit_buf, saved_bits_in; + mz_uint8 *pSaved_output_buf; + mz_bool comp_block_succeeded = MZ_FALSE; + int n, use_raw_block = + ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && + (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size; + mz_uint8 *pOutput_buf_start = + ((d->m_pPut_buf_func == NULL) && + ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) + ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) + : d->m_output_buf; + + d->m_pOutput_buf = pOutput_buf_start; + d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16; + + MZ_ASSERT(!d->m_output_flush_remaining); + d->m_output_flush_ofs = 0; + d->m_output_flush_remaining = 0; + + *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left); + d->m_pLZ_code_buf -= (d->m_num_flags_left == 8); + + if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index)) { + TDEFL_PUT_BITS(0x78, 8); + TDEFL_PUT_BITS(0x01, 8); + } + + TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1); + + pSaved_output_buf = d->m_pOutput_buf; + saved_bit_buf = d->m_bit_buffer; + saved_bits_in = d->m_bits_in; + + if (!use_raw_block) + comp_block_succeeded = + tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) || + (d->m_total_lz_bytes < 48)); + + /* If the block gets expanded, forget the current contents of the output + * buffer and send a raw block instead. */ + if (((use_raw_block) || + ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= + d->m_total_lz_bytes))) && + ((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size)) { + mz_uint i; + d->m_pOutput_buf = pSaved_output_buf; + d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in; + TDEFL_PUT_BITS(0, 2); + if (d->m_bits_in) { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF) { + TDEFL_PUT_BITS(d->m_total_lz_bytes & 0xFFFF, 16); + } + for (i = 0; i < d->m_total_lz_bytes; ++i) { + TDEFL_PUT_BITS( + d->m_dict[(d->m_lz_code_buf_dict_pos + i) & TDEFL_LZ_DICT_SIZE_MASK], + 8); + } + } + /* Check for the extremely unlikely (if not impossible) case of the compressed + block not fitting into the output buffer when using dynamic codes. */ + else if (!comp_block_succeeded) { + d->m_pOutput_buf = pSaved_output_buf; + d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in; + tdefl_compress_block(d, MZ_TRUE); + } + + if (flush) { + if (flush == TDEFL_FINISH) { + if (d->m_bits_in) { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER) { + mz_uint i, a = d->m_adler32; + for (i = 0; i < 4; i++) { + TDEFL_PUT_BITS((a >> 24) & 0xFF, 8); + a <<= 8; + } + } + } else { + mz_uint i, z = 0; + TDEFL_PUT_BITS(0, 3); + if (d->m_bits_in) { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + for (i = 2; i; --i, z ^= 0xFFFF) { + TDEFL_PUT_BITS(z & 0xFFFF, 16); + } + } + } + + MZ_ASSERT(d->m_pOutput_buf < d->m_pOutput_buf_end); + + memset(&d->m_huff_count[0][0], 0, + sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0); + memset(&d->m_huff_count[1][0], 0, + sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1); + + d->m_pLZ_code_buf = d->m_lz_code_buf + 1; + d->m_pLZ_flags = d->m_lz_code_buf; + d->m_num_flags_left = 8; + d->m_lz_code_buf_dict_pos += d->m_total_lz_bytes; + d->m_total_lz_bytes = 0; + d->m_block_index++; + + if ((n = (int)(d->m_pOutput_buf - pOutput_buf_start)) != 0) { + if (d->m_pPut_buf_func) { + *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf; + if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user)) + return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED); + } else if (pOutput_buf_start == d->m_output_buf) { + int bytes_to_copy = (int)MZ_MIN( + (size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs)); + memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, + bytes_to_copy); + d->m_out_buf_ofs += bytes_to_copy; + if ((n -= bytes_to_copy) != 0) { + d->m_output_flush_ofs = bytes_to_copy; + d->m_output_flush_remaining = n; + } + } else { + d->m_out_buf_ofs += n; + } + } + + return d->m_output_flush_remaining; +} + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES +#ifdef MINIZ_UNALIGNED_USE_MEMCPY +static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8 *p) { + mz_uint16 ret; + memcpy(&ret, p, sizeof(mz_uint16)); + return ret; +} +static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16 *p) { + mz_uint16 ret; + memcpy(&ret, p, sizeof(mz_uint16)); + return ret; +} +#else +#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p) +#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p) +#endif +static MZ_FORCEINLINE void +tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, + mz_uint max_match_len, mz_uint *pMatch_dist, + mz_uint *pMatch_len) { + mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, + match_len = *pMatch_len, probe_pos = pos, next_probe_pos, + probe_len; + mz_uint num_probes_left = d->m_max_probes[match_len >= 32]; + const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q; + mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), + s01 = TDEFL_READ_UNALIGNED_WORD2(s); + MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); + if (max_match_len <= match_len) + return; + for (;;) { + for (;;) { + if (--num_probes_left == 0) + return; +#define TDEFL_PROBE \ + next_probe_pos = d->m_next[probe_pos]; \ + if ((!next_probe_pos) || \ + ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \ + return; \ + probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \ + if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) \ + break; + TDEFL_PROBE; + TDEFL_PROBE; + TDEFL_PROBE; + } + if (!dist) + break; + q = (const mz_uint16 *)(d->m_dict + probe_pos); + if (TDEFL_READ_UNALIGNED_WORD2(q) != s01) + continue; + p = s; + probe_len = 32; + do { + } while ( + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (--probe_len > 0)); + if (!probe_len) { + *pMatch_dist = dist; + *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN); + break; + } else if ((probe_len = ((mz_uint)(p - s) * 2) + + (mz_uint)(*(const mz_uint8 *)p == + *(const mz_uint8 *)q)) > match_len) { + *pMatch_dist = dist; + if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == + max_match_len) + break; + c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]); + } + } +} +#else +static MZ_FORCEINLINE void +tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, + mz_uint max_match_len, mz_uint *pMatch_dist, + mz_uint *pMatch_len) { + mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, + match_len = *pMatch_len, probe_pos = pos, next_probe_pos, + probe_len; + mz_uint num_probes_left = d->m_max_probes[match_len >= 32]; + const mz_uint8 *s = d->m_dict + pos, *p, *q; + mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1]; + MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); + if (max_match_len <= match_len) + return; + for (;;) { + for (;;) { + if (--num_probes_left == 0) + return; +#define TDEFL_PROBE \ + next_probe_pos = d->m_next[probe_pos]; \ + if ((!next_probe_pos) || \ + ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \ + return; \ + probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \ + if ((d->m_dict[probe_pos + match_len] == c0) && \ + (d->m_dict[probe_pos + match_len - 1] == c1)) \ + break; + TDEFL_PROBE; + TDEFL_PROBE; + TDEFL_PROBE; + } + if (!dist) + break; + p = s; + q = d->m_dict + probe_pos; + for (probe_len = 0; probe_len < max_match_len; probe_len++) + if (*p++ != *q++) + break; + if (probe_len > match_len) { + *pMatch_dist = dist; + if ((*pMatch_len = match_len = probe_len) == max_match_len) + return; + c0 = d->m_dict[pos + match_len]; + c1 = d->m_dict[pos + match_len - 1]; + } + } +} +#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */ + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN +#ifdef MINIZ_UNALIGNED_USE_MEMCPY +static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8 *p) { + mz_uint32 ret; + memcpy(&ret, p, sizeof(mz_uint32)); + return ret; +} +#else +#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p) +#endif +static mz_bool tdefl_compress_fast(tdefl_compressor *d) { + /* Faster, minimally featured LZRW1-style match+parse loop with better + * register utilization. Intended for applications where raw throughput is + * valued more highly than ratio. */ + mz_uint lookahead_pos = d->m_lookahead_pos, + lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, + total_lz_bytes = d->m_total_lz_bytes, + num_flags_left = d->m_num_flags_left; + mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags; + mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK; + + while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size))) { + const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096; + mz_uint dst_pos = + (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK; + mz_uint num_bytes_to_process = (mz_uint)MZ_MIN( + d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size); + d->m_src_buf_left -= num_bytes_to_process; + lookahead_size += num_bytes_to_process; + + while (num_bytes_to_process) { + mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process); + memcpy(d->m_dict + dst_pos, d->m_pSrc, n); + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, + MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos)); + d->m_pSrc += n; + dst_pos = (dst_pos + n) & TDEFL_LZ_DICT_SIZE_MASK; + num_bytes_to_process -= n; + } + + dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - lookahead_size, dict_size); + if ((!d->m_flush) && (lookahead_size < TDEFL_COMP_FAST_LOOKAHEAD_SIZE)) + break; + + while (lookahead_size >= 4) { + mz_uint cur_match_dist, cur_match_len = 1; + mz_uint8 *pCur_dict = d->m_dict + cur_pos; + mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF; + mz_uint hash = + (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & + TDEFL_LEVEL1_HASH_SIZE_MASK; + mz_uint probe_pos = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)lookahead_pos; + + if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= + dict_size) && + ((TDEFL_READ_UNALIGNED_WORD32( + d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & + 0xFFFFFF) == first_trigram)) { + const mz_uint16 *p = (const mz_uint16 *)pCur_dict; + const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos); + mz_uint32 probe_len = 32; + do { + } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == + TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == + TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == + TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == + TDEFL_READ_UNALIGNED_WORD2(++q)) && + (--probe_len > 0)); + cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q); + if (!probe_len) + cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0; + + if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || + ((cur_match_len == TDEFL_MIN_MATCH_LEN) && + (cur_match_dist >= 8U * 1024U))) { + cur_match_len = 1; + *pLZ_code_buf++ = (mz_uint8)first_trigram; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + d->m_huff_count[0][(mz_uint8)first_trigram]++; + } else { + mz_uint32 s0, s1; + cur_match_len = MZ_MIN(cur_match_len, lookahead_size); + + MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && + (cur_match_dist >= 1) && + (cur_match_dist <= TDEFL_LZ_DICT_SIZE)); + + cur_match_dist--; + + pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN); +#ifdef MINIZ_UNALIGNED_USE_MEMCPY + memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist)); +#else + *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist; +#endif + pLZ_code_buf += 3; + *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80); + + s0 = s_tdefl_small_dist_sym[cur_match_dist & 511]; + s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8]; + d->m_huff_count[1][(cur_match_dist < 512) ? s0 : s1]++; + + d->m_huff_count[0][s_tdefl_len_sym[cur_match_len - + TDEFL_MIN_MATCH_LEN]]++; + } + } else { + *pLZ_code_buf++ = (mz_uint8)first_trigram; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + d->m_huff_count[0][(mz_uint8)first_trigram]++; + } + + if (--num_flags_left == 0) { + num_flags_left = 8; + pLZ_flags = pLZ_code_buf++; + } + + total_lz_bytes += cur_match_len; + lookahead_pos += cur_match_len; + dict_size = + MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE); + cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK; + MZ_ASSERT(lookahead_size >= cur_match_len); + lookahead_size -= cur_match_len; + + if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) { + int n; + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + total_lz_bytes = d->m_total_lz_bytes; + pLZ_code_buf = d->m_pLZ_code_buf; + pLZ_flags = d->m_pLZ_flags; + num_flags_left = d->m_num_flags_left; + } + } + + while (lookahead_size) { + mz_uint8 lit = d->m_dict[cur_pos]; + + total_lz_bytes++; + *pLZ_code_buf++ = lit; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + if (--num_flags_left == 0) { + num_flags_left = 8; + pLZ_flags = pLZ_code_buf++; + } + + d->m_huff_count[0][lit]++; + + lookahead_pos++; + dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE); + cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK; + lookahead_size--; + + if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) { + int n; + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + total_lz_bytes = d->m_total_lz_bytes; + pLZ_code_buf = d->m_pLZ_code_buf; + pLZ_flags = d->m_pLZ_flags; + num_flags_left = d->m_num_flags_left; + } + } + } + + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + return MZ_TRUE; +} +#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */ + +static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, + mz_uint8 lit) { + d->m_total_lz_bytes++; + *d->m_pLZ_code_buf++ = lit; + *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1); + if (--d->m_num_flags_left == 0) { + d->m_num_flags_left = 8; + d->m_pLZ_flags = d->m_pLZ_code_buf++; + } + d->m_huff_count[0][lit]++; +} + +static MZ_FORCEINLINE void +tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist) { + mz_uint32 s0, s1; + + MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && + (match_dist <= TDEFL_LZ_DICT_SIZE)); + + d->m_total_lz_bytes += match_len; + + d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN); + + match_dist -= 1; + d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF); + d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8); + d->m_pLZ_code_buf += 3; + + *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80); + if (--d->m_num_flags_left == 0) { + d->m_num_flags_left = 8; + d->m_pLZ_flags = d->m_pLZ_code_buf++; + } + + s0 = s_tdefl_small_dist_sym[match_dist & 511]; + s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127]; + d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++; + d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++; +} + +static mz_bool tdefl_compress_normal(tdefl_compressor *d) { + const mz_uint8 *pSrc = d->m_pSrc; + size_t src_buf_left = d->m_src_buf_left; + tdefl_flush flush = d->m_flush; + + while ((src_buf_left) || ((flush) && (d->m_lookahead_size))) { + mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos; + /* Update dictionary and hash chains. Keeps the lookahead size equal to + * TDEFL_MAX_MATCH_LEN. */ + if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1)) { + mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & + TDEFL_LZ_DICT_SIZE_MASK, + ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2; + mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] + << TDEFL_LZ_HASH_SHIFT) ^ + d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK]; + mz_uint num_bytes_to_process = (mz_uint)MZ_MIN( + src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size); + const mz_uint8 *pSrc_end = pSrc + num_bytes_to_process; + src_buf_left -= num_bytes_to_process; + d->m_lookahead_size += num_bytes_to_process; + while (pSrc != pSrc_end) { + mz_uint8 c = *pSrc++; + d->m_dict[dst_pos] = c; + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c; + hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1); + d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)(ins_pos); + dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK; + ins_pos++; + } + } else { + while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN)) { + mz_uint8 c = *pSrc++; + mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & + TDEFL_LZ_DICT_SIZE_MASK; + src_buf_left--; + d->m_dict[dst_pos] = c; + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c; + if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN) { + mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2; + mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] + << (TDEFL_LZ_HASH_SHIFT * 2)) ^ + (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] + << TDEFL_LZ_HASH_SHIFT) ^ + c) & + (TDEFL_LZ_HASH_SIZE - 1); + d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)(ins_pos); + } + } + } + d->m_dict_size = + MZ_MIN(TDEFL_LZ_DICT_SIZE - d->m_lookahead_size, d->m_dict_size); + if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN)) + break; + + /* Simple lazy/greedy parsing state machine. */ + len_to_move = 1; + cur_match_dist = 0; + cur_match_len = + d->m_saved_match_len ? d->m_saved_match_len : (TDEFL_MIN_MATCH_LEN - 1); + cur_pos = d->m_lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK; + if (d->m_flags & (TDEFL_RLE_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS)) { + if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))) { + mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK]; + cur_match_len = 0; + while (cur_match_len < d->m_lookahead_size) { + if (d->m_dict[cur_pos + cur_match_len] != c) + break; + cur_match_len++; + } + if (cur_match_len < TDEFL_MIN_MATCH_LEN) + cur_match_len = 0; + else + cur_match_dist = 1; + } + } else { + tdefl_find_match(d, d->m_lookahead_pos, d->m_dict_size, + d->m_lookahead_size, &cur_match_dist, &cur_match_len); + } + if (((cur_match_len == TDEFL_MIN_MATCH_LEN) && + (cur_match_dist >= 8U * 1024U)) || + (cur_pos == cur_match_dist) || + ((d->m_flags & TDEFL_FILTER_MATCHES) && (cur_match_len <= 5))) { + cur_match_dist = cur_match_len = 0; + } + if (d->m_saved_match_len) { + if (cur_match_len > d->m_saved_match_len) { + tdefl_record_literal(d, (mz_uint8)d->m_saved_lit); + if (cur_match_len >= 128) { + tdefl_record_match(d, cur_match_len, cur_match_dist); + d->m_saved_match_len = 0; + len_to_move = cur_match_len; + } else { + d->m_saved_lit = d->m_dict[cur_pos]; + d->m_saved_match_dist = cur_match_dist; + d->m_saved_match_len = cur_match_len; + } + } else { + tdefl_record_match(d, d->m_saved_match_len, d->m_saved_match_dist); + len_to_move = d->m_saved_match_len - 1; + d->m_saved_match_len = 0; + } + } else if (!cur_match_dist) + tdefl_record_literal(d, + d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]); + else if ((d->m_greedy_parsing) || (d->m_flags & TDEFL_RLE_MATCHES) || + (cur_match_len >= 128)) { + tdefl_record_match(d, cur_match_len, cur_match_dist); + len_to_move = cur_match_len; + } else { + d->m_saved_lit = d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]; + d->m_saved_match_dist = cur_match_dist; + d->m_saved_match_len = cur_match_len; + } + /* Move the lookahead forward by len_to_move bytes. */ + d->m_lookahead_pos += len_to_move; + MZ_ASSERT(d->m_lookahead_size >= len_to_move); + d->m_lookahead_size -= len_to_move; + d->m_dict_size = + MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE); + /* Check if it's time to flush the current LZ codes to the internal output + * buffer. */ + if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) || + ((d->m_total_lz_bytes > 31 * 1024) && + (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= + d->m_total_lz_bytes) || + (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))) { + int n; + d->m_pSrc = pSrc; + d->m_src_buf_left = src_buf_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + } + } + + d->m_pSrc = pSrc; + d->m_src_buf_left = src_buf_left; + return MZ_TRUE; +} + +static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d) { + if (d->m_pIn_buf_size) { + *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf; + } + + if (d->m_pOut_buf_size) { + size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, + d->m_output_flush_remaining); + memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, + d->m_output_buf + d->m_output_flush_ofs, n); + d->m_output_flush_ofs += (mz_uint)n; + d->m_output_flush_remaining -= (mz_uint)n; + d->m_out_buf_ofs += n; + + *d->m_pOut_buf_size = d->m_out_buf_ofs; + } + + return (d->m_finished && !d->m_output_flush_remaining) ? TDEFL_STATUS_DONE + : TDEFL_STATUS_OKAY; +} + +tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, + size_t *pIn_buf_size, void *pOut_buf, + size_t *pOut_buf_size, tdefl_flush flush) { + if (!d) { + if (pIn_buf_size) + *pIn_buf_size = 0; + if (pOut_buf_size) + *pOut_buf_size = 0; + return TDEFL_STATUS_BAD_PARAM; + } + + d->m_pIn_buf = pIn_buf; + d->m_pIn_buf_size = pIn_buf_size; + d->m_pOut_buf = pOut_buf; + d->m_pOut_buf_size = pOut_buf_size; + d->m_pSrc = (const mz_uint8 *)(pIn_buf); + d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0; + d->m_out_buf_ofs = 0; + d->m_flush = flush; + + if (((d->m_pPut_buf_func != NULL) == + ((pOut_buf != NULL) || (pOut_buf_size != NULL))) || + (d->m_prev_return_status != TDEFL_STATUS_OKAY) || + (d->m_wants_to_finish && (flush != TDEFL_FINISH)) || + (pIn_buf_size && *pIn_buf_size && !pIn_buf) || + (pOut_buf_size && *pOut_buf_size && !pOut_buf)) { + if (pIn_buf_size) + *pIn_buf_size = 0; + if (pOut_buf_size) + *pOut_buf_size = 0; + return (d->m_prev_return_status = TDEFL_STATUS_BAD_PARAM); + } + d->m_wants_to_finish |= (flush == TDEFL_FINISH); + + if ((d->m_output_flush_remaining) || (d->m_finished)) + return (d->m_prev_return_status = tdefl_flush_output_buffer(d)); + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN + if (((d->m_flags & TDEFL_MAX_PROBES_MASK) == 1) && + ((d->m_flags & TDEFL_GREEDY_PARSING_FLAG) != 0) && + ((d->m_flags & (TDEFL_FILTER_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS | + TDEFL_RLE_MATCHES)) == 0)) { + if (!tdefl_compress_fast(d)) + return d->m_prev_return_status; + } else +#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */ + { + if (!tdefl_compress_normal(d)) + return d->m_prev_return_status; + } + + if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && + (pIn_buf)) + d->m_adler32 = + (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, + d->m_pSrc - (const mz_uint8 *)pIn_buf); + + if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && + (!d->m_output_flush_remaining)) { + if (tdefl_flush_block(d, flush) < 0) + return d->m_prev_return_status; + d->m_finished = (flush == TDEFL_FINISH); + if (flush == TDEFL_FULL_FLUSH) { + MZ_CLEAR_OBJ(d->m_hash); + MZ_CLEAR_OBJ(d->m_next); + d->m_dict_size = 0; + } + } + + return (d->m_prev_return_status = tdefl_flush_output_buffer(d)); +} + +tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, + size_t in_buf_size, tdefl_flush flush) { + MZ_ASSERT(d->m_pPut_buf_func); + return tdefl_compress(d, pIn_buf, &in_buf_size, NULL, NULL, flush); +} + +tdefl_status tdefl_init(tdefl_compressor *d, + tdefl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags) { + d->m_pPut_buf_func = pPut_buf_func; + d->m_pPut_buf_user = pPut_buf_user; + d->m_flags = (mz_uint)(flags); + d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3; + d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0; + d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3; + if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG)) + MZ_CLEAR_OBJ(d->m_hash); + d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = + d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0; + d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished = + d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0; + d->m_pLZ_code_buf = d->m_lz_code_buf + 1; + d->m_pLZ_flags = d->m_lz_code_buf; + *d->m_pLZ_flags = 0; + d->m_num_flags_left = 8; + d->m_pOutput_buf = d->m_output_buf; + d->m_pOutput_buf_end = d->m_output_buf; + d->m_prev_return_status = TDEFL_STATUS_OKAY; + d->m_saved_match_dist = d->m_saved_match_len = d->m_saved_lit = 0; + d->m_adler32 = 1; + d->m_pIn_buf = NULL; + d->m_pOut_buf = NULL; + d->m_pIn_buf_size = NULL; + d->m_pOut_buf_size = NULL; + d->m_flush = TDEFL_NO_FLUSH; + d->m_pSrc = NULL; + d->m_src_buf_left = 0; + d->m_out_buf_ofs = 0; + if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG)) + MZ_CLEAR_OBJ(d->m_dict); + memset(&d->m_huff_count[0][0], 0, + sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0); + memset(&d->m_huff_count[1][0], 0, + sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1); + return TDEFL_STATUS_OKAY; +} + +tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d) { + return d->m_prev_return_status; +} + +mz_uint32 tdefl_get_adler32(tdefl_compressor *d) { return d->m_adler32; } + +mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, + tdefl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags) { + tdefl_compressor *pComp; + mz_bool succeeded; + if (((buf_len) && (!pBuf)) || (!pPut_buf_func)) + return MZ_FALSE; + pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); + if (!pComp) + return MZ_FALSE; + succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == + TDEFL_STATUS_OKAY); + succeeded = + succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == + TDEFL_STATUS_DONE); + MZ_FREE(pComp); + return succeeded; +} + +typedef struct { + size_t m_size, m_capacity; + mz_uint8 *m_pBuf; + mz_bool m_expandable; +} tdefl_output_buffer; + +static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, + void *pUser) { + tdefl_output_buffer *p = (tdefl_output_buffer *)pUser; + size_t new_size = p->m_size + len; + if (new_size > p->m_capacity) { + size_t new_capacity = p->m_capacity; + mz_uint8 *pNew_buf; + if (!p->m_expandable) + return MZ_FALSE; + do { + new_capacity = MZ_MAX(128U, new_capacity << 1U); + } while (new_size > new_capacity); + pNew_buf = (mz_uint8 *)MZ_REALLOC(p->m_pBuf, new_capacity); + if (!pNew_buf) + return MZ_FALSE; + p->m_pBuf = pNew_buf; + p->m_capacity = new_capacity; + } + memcpy((mz_uint8 *)p->m_pBuf + p->m_size, pBuf, len); + p->m_size = new_size; + return MZ_TRUE; +} + +void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, + size_t *pOut_len, int flags) { + tdefl_output_buffer out_buf; + MZ_CLEAR_OBJ(out_buf); + if (!pOut_len) + return MZ_FALSE; + else + *pOut_len = 0; + out_buf.m_expandable = MZ_TRUE; + if (!tdefl_compress_mem_to_output( + pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags)) + return NULL; + *pOut_len = out_buf.m_size; + return out_buf.m_pBuf; +} + +size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, + const void *pSrc_buf, size_t src_buf_len, + int flags) { + tdefl_output_buffer out_buf; + MZ_CLEAR_OBJ(out_buf); + if (!pOut_buf) + return 0; + out_buf.m_pBuf = (mz_uint8 *)pOut_buf; + out_buf.m_capacity = out_buf_len; + if (!tdefl_compress_mem_to_output( + pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags)) + return 0; + return out_buf.m_size; +} + +static const mz_uint s_tdefl_num_probes[11] = {0, 1, 6, 32, 16, 32, + 128, 256, 512, 768, 1500}; + +/* level may actually range from [0,10] (10 is a "hidden" max level, where we + * want a bit more compression and it's fine if throughput to fall off a cliff + * on some files). */ +mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, + int strategy) { + mz_uint comp_flags = + s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | + ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0); + if (window_bits > 0) + comp_flags |= TDEFL_WRITE_ZLIB_HEADER; + + if (!level) + comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS; + else if (strategy == MZ_FILTERED) + comp_flags |= TDEFL_FILTER_MATCHES; + else if (strategy == MZ_HUFFMAN_ONLY) + comp_flags &= ~TDEFL_MAX_PROBES_MASK; + else if (strategy == MZ_FIXED) + comp_flags |= TDEFL_FORCE_ALL_STATIC_BLOCKS; + else if (strategy == MZ_RLE) + comp_flags |= TDEFL_RLE_MATCHES; + + return comp_flags; +} + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4204) /* nonstandard extension used : non-constant \ + aggregate initializer (also supported by \ + GNU C and C99, so no big deal) */ +#endif + +/* Simple PNG writer function by Alex Evans, 2011. Released into the public + domain: https://gist.github.com/908299, more context at + http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/. + This is actually a modification of Alex's original code so PNG files generated + by this function pass pngcheck. */ +void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, + int h, int num_chans, + size_t *pLen_out, + mz_uint level, mz_bool flip) { + /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was + * defined. */ + static const mz_uint s_tdefl_png_num_probes[11] = { + 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500}; + tdefl_compressor *pComp = + (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); + tdefl_output_buffer out_buf; + int i, bpl = w * num_chans, y, z; + mz_uint32 c; + *pLen_out = 0; + if (!pComp) + return NULL; + MZ_CLEAR_OBJ(out_buf); + out_buf.m_expandable = MZ_TRUE; + out_buf.m_capacity = 57 + MZ_MAX(64, (1 + bpl) * h); + if (NULL == (out_buf.m_pBuf = (mz_uint8 *)MZ_MALLOC(out_buf.m_capacity))) { + MZ_FREE(pComp); + return NULL; + } + /* write dummy header */ + for (z = 41; z; --z) + tdefl_output_buffer_putter(&z, 1, &out_buf); + /* compress image data */ + tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf, + s_tdefl_png_num_probes[MZ_MIN(10, level)] | + TDEFL_WRITE_ZLIB_HEADER); + for (y = 0; y < h; ++y) { + tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH); + tdefl_compress_buffer(pComp, + (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, + bpl, TDEFL_NO_FLUSH); + } + if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != + TDEFL_STATUS_DONE) { + MZ_FREE(pComp); + MZ_FREE(out_buf.m_pBuf); + return NULL; + } + /* write real header */ + *pLen_out = out_buf.m_size - 41; + { + static const mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06}; + mz_uint8 pnghdr[41] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, + 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x49, 0x44, 0x41, 0x54}; + pnghdr[18] = (mz_uint8)(w >> 8); + pnghdr[19] = (mz_uint8)w; + pnghdr[22] = (mz_uint8)(h >> 8); + pnghdr[23] = (mz_uint8)h; + pnghdr[25] = chans[num_chans]; + pnghdr[33] = (mz_uint8)(*pLen_out >> 24); + pnghdr[34] = (mz_uint8)(*pLen_out >> 16); + pnghdr[35] = (mz_uint8)(*pLen_out >> 8); + pnghdr[36] = (mz_uint8)*pLen_out; + c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17); + for (i = 0; i < 4; ++i, c <<= 8) + ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24); + memcpy(out_buf.m_pBuf, pnghdr, 41); + } + /* write footer (IDAT CRC-32, followed by IEND chunk) */ + if (!tdefl_output_buffer_putter( + "\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf)) { + *pLen_out = 0; + MZ_FREE(pComp); + MZ_FREE(out_buf.m_pBuf); + return NULL; + } + c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, out_buf.m_pBuf + 41 - 4, + *pLen_out + 4); + for (i = 0; i < 4; ++i, c <<= 8) + (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24); + /* compute final size of file, grab compressed data buffer and return */ + *pLen_out += 57; + MZ_FREE(pComp); + return out_buf.m_pBuf; +} +void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, + int num_chans, size_t *pLen_out) { + /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we + * can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's + * where #defined out) */ + return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans, + pLen_out, 6, MZ_FALSE); +} + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that + */ +/* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +tdefl_compressor *tdefl_compressor_alloc() { + return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); +} + +void tdefl_compressor_free(tdefl_compressor *pComp) { MZ_FREE(pComp); } +#endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + +#ifdef __cplusplus +} +#endif +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * 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. + * + **************************************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- Low-level Decompression (completely independent from all + * compression API's) */ + +#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l) +#define TINFL_MEMSET(p, c, l) memset(p, c, l) + +#define TINFL_CR_BEGIN \ + switch (r->m_state) { \ + case 0: +#define TINFL_CR_RETURN(state_index, result) \ + do { \ + status = result; \ + r->m_state = state_index; \ + goto common_exit; \ + case state_index:; \ + } \ + MZ_MACRO_END +#define TINFL_CR_RETURN_FOREVER(state_index, result) \ + do { \ + for (;;) { \ + TINFL_CR_RETURN(state_index, result); \ + } \ + } \ + MZ_MACRO_END +#define TINFL_CR_FINISH } + +#define TINFL_GET_BYTE(state_index, c) \ + do { \ + while (pIn_buf_cur >= pIn_buf_end) { \ + TINFL_CR_RETURN(state_index, \ + (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) \ + ? TINFL_STATUS_NEEDS_MORE_INPUT \ + : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); \ + } \ + c = *pIn_buf_cur++; \ + } \ + MZ_MACRO_END + +#define TINFL_NEED_BITS(state_index, n) \ + do { \ + mz_uint c; \ + TINFL_GET_BYTE(state_index, c); \ + bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \ + num_bits += 8; \ + } while (num_bits < (mz_uint)(n)) +#define TINFL_SKIP_BITS(state_index, n) \ + do { \ + if (num_bits < (mz_uint)(n)) { \ + TINFL_NEED_BITS(state_index, n); \ + } \ + bit_buf >>= (n); \ + num_bits -= (n); \ + } \ + MZ_MACRO_END +#define TINFL_GET_BITS(state_index, b, n) \ + do { \ + if (num_bits < (mz_uint)(n)) { \ + TINFL_NEED_BITS(state_index, n); \ + } \ + b = bit_buf & ((1 << (n)) - 1); \ + bit_buf >>= (n); \ + num_bits -= (n); \ + } \ + MZ_MACRO_END + +/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes + * remaining in the input buffer falls below 2. */ +/* It reads just enough bytes from the input stream that are needed to decode + * the next Huffman code (and absolutely no more). It works by trying to fully + * decode a */ +/* Huffman code by using whatever bits are currently present in the bit buffer. + * If this fails, it reads another byte, and tries again until it succeeds or + * until the */ +/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */ +#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff) \ + do { \ + temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]; \ + if (temp >= 0) { \ + code_len = temp >> 9; \ + if ((code_len) && (num_bits >= code_len)) \ + break; \ + } else if (num_bits > TINFL_FAST_LOOKUP_BITS) { \ + code_len = TINFL_FAST_LOOKUP_BITS; \ + do { \ + temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \ + } while ((temp < 0) && (num_bits >= (code_len + 1))); \ + if (temp >= 0) \ + break; \ + } \ + TINFL_GET_BYTE(state_index, c); \ + bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \ + num_bits += 8; \ + } while (num_bits < 15); + +/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex + * than you would initially expect because the zlib API expects the decompressor + * to never read */ +/* beyond the final byte of the deflate stream. (In other words, when this macro + * wants to read another byte from the input, it REALLY needs another byte in + * order to fully */ +/* decode the next Huffman code.) Handling this properly is particularly + * important on raw deflate (non-zlib) streams, which aren't followed by a byte + * aligned adler-32. */ +/* The slow path is only executed at the very end of the input buffer. */ +/* v1.16: The original macro handled the case at the very end of the passed-in + * input buffer, but we also need to handle the case where the user passes in + * 1+zillion bytes */ +/* following the deflate data and our non-conservative read-ahead path won't + * kick in here on this code. This is much trickier. */ +#define TINFL_HUFF_DECODE(state_index, sym, pHuff) \ + do { \ + int temp; \ + mz_uint code_len, c; \ + if (num_bits < 15) { \ + if ((pIn_buf_end - pIn_buf_cur) < 2) { \ + TINFL_HUFF_BITBUF_FILL(state_index, pHuff); \ + } else { \ + bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | \ + (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); \ + pIn_buf_cur += 2; \ + num_bits += 16; \ + } \ + } \ + if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= \ + 0) \ + code_len = temp >> 9, temp &= 511; \ + else { \ + code_len = TINFL_FAST_LOOKUP_BITS; \ + do { \ + temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \ + } while (temp < 0); \ + } \ + sym = temp; \ + bit_buf >>= code_len; \ + num_bits -= code_len; \ + } \ + MZ_MACRO_END + +tinfl_status tinfl_decompress(tinfl_decompressor *r, + const mz_uint8 *pIn_buf_next, + size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, + mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, + const mz_uint32 decomp_flags) { + static const int s_length_base[31] = { + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const int s_length_extra[31] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, + 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, + 4, 4, 5, 5, 5, 5, 0, 0, 0}; + static const int s_dist_base[32] = { + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, + 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, + 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0}; + static const int s_dist_extra[32] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, + 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; + static const mz_uint8 s_length_dezigzag[19] = { + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + static const int s_min_table_sizes[3] = {257, 1, 4}; + + tinfl_status status = TINFL_STATUS_FAILED; + mz_uint32 num_bits, dist, counter, num_extra; + tinfl_bit_buf_t bit_buf; + const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = + pIn_buf_next + *pIn_buf_size; + mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = + pOut_buf_next + *pOut_buf_size; + size_t out_buf_size_mask = + (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) + ? (size_t)-1 + : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, + dist_from_out_buf_start; + + /* Ensure the output buffer's size is a power of 2, unless the output buffer + * is large enough to hold the entire output file (in which case it doesn't + * matter). */ + if (((out_buf_size_mask + 1) & out_buf_size_mask) || + (pOut_buf_next < pOut_buf_start)) { + *pIn_buf_size = *pOut_buf_size = 0; + return TINFL_STATUS_BAD_PARAM; + } + + num_bits = r->m_num_bits; + bit_buf = r->m_bit_buf; + dist = r->m_dist; + counter = r->m_counter; + num_extra = r->m_num_extra; + dist_from_out_buf_start = r->m_dist_from_out_buf_start; + TINFL_CR_BEGIN + + bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0; + r->m_z_adler32 = r->m_check_adler32 = 1; + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) { + TINFL_GET_BYTE(1, r->m_zhdr0); + TINFL_GET_BYTE(2, r->m_zhdr1); + counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || + (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8)); + if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) + counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || + ((out_buf_size_mask + 1) < + (size_t)(1U << (8U + (r->m_zhdr0 >> 4))))); + if (counter) { + TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED); + } + } + + do { + TINFL_GET_BITS(3, r->m_final, 3); + r->m_type = r->m_final >> 1; + if (r->m_type == 0) { + TINFL_SKIP_BITS(5, num_bits & 7); + for (counter = 0; counter < 4; ++counter) { + if (num_bits) + TINFL_GET_BITS(6, r->m_raw_header[counter], 8); + else + TINFL_GET_BYTE(7, r->m_raw_header[counter]); + } + if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != + (mz_uint)(0xFFFF ^ + (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) { + TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); + } + while ((counter) && (num_bits)) { + TINFL_GET_BITS(51, dist, 8); + while (pOut_buf_cur >= pOut_buf_end) { + TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = (mz_uint8)dist; + counter--; + } + while (counter) { + size_t n; + while (pOut_buf_cur >= pOut_buf_end) { + TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT); + } + while (pIn_buf_cur >= pIn_buf_end) { + TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) + ? TINFL_STATUS_NEEDS_MORE_INPUT + : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); + } + n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), + (size_t)(pIn_buf_end - pIn_buf_cur)), + counter); + TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); + pIn_buf_cur += n; + pOut_buf_cur += n; + counter -= (mz_uint)n; + } + } else if (r->m_type == 3) { + TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED); + } else { + if (r->m_type == 1) { + mz_uint8 *p = r->m_tables[0].m_code_size; + mz_uint i; + r->m_table_sizes[0] = 288; + r->m_table_sizes[1] = 32; + TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32); + for (i = 0; i <= 143; ++i) + *p++ = 8; + for (; i <= 255; ++i) + *p++ = 9; + for (; i <= 279; ++i) + *p++ = 7; + for (; i <= 287; ++i) + *p++ = 8; + } else { + for (counter = 0; counter < 3; counter++) { + TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); + r->m_table_sizes[counter] += s_min_table_sizes[counter]; + } + MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); + for (counter = 0; counter < r->m_table_sizes[2]; counter++) { + mz_uint s; + TINFL_GET_BITS(14, s, 3); + r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; + } + r->m_table_sizes[2] = 19; + } + for (; (int)r->m_type >= 0; r->m_type--) { + int tree_next, tree_cur; + tinfl_huff_table *pTable; + mz_uint i, j, used_syms, total, sym_index, next_code[17], + total_syms[16]; + pTable = &r->m_tables[r->m_type]; + MZ_CLEAR_OBJ(total_syms); + MZ_CLEAR_OBJ(pTable->m_look_up); + MZ_CLEAR_OBJ(pTable->m_tree); + for (i = 0; i < r->m_table_sizes[r->m_type]; ++i) + total_syms[pTable->m_code_size[i]]++; + used_syms = 0, total = 0; + next_code[0] = next_code[1] = 0; + for (i = 1; i <= 15; ++i) { + used_syms += total_syms[i]; + next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); + } + if ((65536 != total) && (used_syms > 1)) { + TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED); + } + for (tree_next = -1, sym_index = 0; + sym_index < r->m_table_sizes[r->m_type]; ++sym_index) { + mz_uint rev_code = 0, l, cur_code, + code_size = pTable->m_code_size[sym_index]; + + if (!code_size) + continue; + cur_code = next_code[code_size]++; + for (l = code_size; l > 0; l--, cur_code >>= 1) + rev_code = (rev_code << 1) | (cur_code & 1); + if (code_size <= TINFL_FAST_LOOKUP_BITS) { + mz_int16 k = (mz_int16)((code_size << 9) | sym_index); + while (rev_code < TINFL_FAST_LOOKUP_SIZE) { + pTable->m_look_up[rev_code] = k; + rev_code += (1 << code_size); + } + continue; + } + if (0 == + (tree_cur = pTable->m_look_up[rev_code & + (TINFL_FAST_LOOKUP_SIZE - 1)])) { + pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = + (mz_int16)tree_next; + tree_cur = tree_next; + tree_next -= 2; + } + rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1); + for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--) { + tree_cur -= ((rev_code >>= 1) & 1); + if (!pTable->m_tree[-tree_cur - 1]) { + pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next; + tree_cur = tree_next; + tree_next -= 2; + } else + tree_cur = pTable->m_tree[-tree_cur - 1]; + } + tree_cur -= ((rev_code >>= 1) & 1); + (void)rev_code; // unused + pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index; + } + if (r->m_type == 2) { + for (counter = 0; + counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);) { + mz_uint s; + TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); + if (dist < 16) { + r->m_len_codes[counter++] = (mz_uint8)dist; + continue; + } + if ((dist == 16) && (!counter)) { + TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED); + } + num_extra = "\02\03\07"[dist - 16]; + TINFL_GET_BITS(18, s, num_extra); + s += "\03\03\013"[dist - 16]; + TINFL_MEMSET(r->m_len_codes + counter, + (dist == 16) ? r->m_len_codes[counter - 1] : 0, s); + counter += s; + } + if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter) { + TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED); + } + TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes, + r->m_table_sizes[0]); + TINFL_MEMCPY(r->m_tables[1].m_code_size, + r->m_len_codes + r->m_table_sizes[0], + r->m_table_sizes[1]); + } + } + for (;;) { + mz_uint8 *pSrc; + for (;;) { + if (((pIn_buf_end - pIn_buf_cur) < 4) || + ((pOut_buf_end - pOut_buf_cur) < 2)) { + TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]); + if (counter >= 256) + break; + while (pOut_buf_cur >= pOut_buf_end) { + TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = (mz_uint8)counter; + } else { + int sym2; + mz_uint code_len; +#if TINFL_USE_64BIT_BITBUF + if (num_bits < 30) { + bit_buf |= + (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 4; + num_bits += 32; + } +#else + if (num_bits < 15) { + bit_buf |= + (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 2; + num_bits += 16; + } +#endif + if ((sym2 = + r->m_tables[0] + .m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= + 0) + code_len = sym2 >> 9; + else { + code_len = TINFL_FAST_LOOKUP_BITS; + do { + sym2 = r->m_tables[0] + .m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; + } while (sym2 < 0); + } + counter = sym2; + bit_buf >>= code_len; + num_bits -= code_len; + if (counter & 256) + break; + +#if !TINFL_USE_64BIT_BITBUF + if (num_bits < 15) { + bit_buf |= + (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 2; + num_bits += 16; + } +#endif + if ((sym2 = + r->m_tables[0] + .m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= + 0) + code_len = sym2 >> 9; + else { + code_len = TINFL_FAST_LOOKUP_BITS; + do { + sym2 = r->m_tables[0] + .m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; + } while (sym2 < 0); + } + bit_buf >>= code_len; + num_bits -= code_len; + + pOut_buf_cur[0] = (mz_uint8)counter; + if (sym2 & 256) { + pOut_buf_cur++; + counter = sym2; + break; + } + pOut_buf_cur[1] = (mz_uint8)sym2; + pOut_buf_cur += 2; + } + } + if ((counter &= 511) == 256) + break; + + num_extra = s_length_extra[counter - 257]; + counter = s_length_base[counter - 257]; + if (num_extra) { + mz_uint extra_bits; + TINFL_GET_BITS(25, extra_bits, num_extra); + counter += extra_bits; + } + + TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]); + num_extra = s_dist_extra[dist]; + dist = s_dist_base[dist]; + if (num_extra) { + mz_uint extra_bits; + TINFL_GET_BITS(27, extra_bits, num_extra); + dist += extra_bits; + } + + dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start; + if ((dist == 0 || dist > dist_from_out_buf_start || + dist_from_out_buf_start == 0) && + (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) { + TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED); + } + + pSrc = pOut_buf_start + + ((dist_from_out_buf_start - dist) & out_buf_size_mask); + + if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end) { + while (counter--) { + while (pOut_buf_cur >= pOut_buf_end) { + TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = + pOut_buf_start[(dist_from_out_buf_start++ - dist) & + out_buf_size_mask]; + } + continue; + } +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES + else if ((counter >= 9) && (counter <= dist)) { + const mz_uint8 *pSrc_end = pSrc + (counter & ~7); + do { +#ifdef MINIZ_UNALIGNED_USE_MEMCPY + memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32) * 2); +#else + ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0]; + ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1]; +#endif + pOut_buf_cur += 8; + } while ((pSrc += 8) < pSrc_end); + if ((counter &= 7) < 3) { + if (counter) { + pOut_buf_cur[0] = pSrc[0]; + if (counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + continue; + } + } +#endif + while (counter > 2) { + pOut_buf_cur[0] = pSrc[0]; + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur[2] = pSrc[2]; + pOut_buf_cur += 3; + pSrc += 3; + counter -= 3; + } + if (counter > 0) { + pOut_buf_cur[0] = pSrc[0]; + if (counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + } + } + } while (!(r->m_final & 1)); + + /* Ensure byte alignment and put back any bytes from the bitbuf if we've + * looked ahead too far on gzip, or other Deflate streams followed by + * arbitrary data. */ + /* I'm being super conservative here. A number of simplifications can be made + * to the byte alignment part, and the Adler32 check shouldn't ever need to + * worry about reading from the bitbuf now. */ + TINFL_SKIP_BITS(32, num_bits & 7); + while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) { + --pIn_buf_cur; + num_bits -= 8; + } + bit_buf &= (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1); + MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end + of non-deflate/zlib streams with following data (such + as gzip streams). */ + + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) { + for (counter = 0; counter < 4; ++counter) { + mz_uint s; + if (num_bits) + TINFL_GET_BITS(41, s, 8); + else + TINFL_GET_BYTE(42, s); + r->m_z_adler32 = (r->m_z_adler32 << 8) | s; + } + } + TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE); + + TINFL_CR_FINISH + +common_exit: + /* As long as we aren't telling the caller that we NEED more input to make + * forward progress: */ + /* Put back any bytes from the bitbuf in case we've looked ahead too far on + * gzip, or other Deflate streams followed by arbitrary data. */ + /* We need to be very careful here to NOT push back any bytes we definitely + * know we need to make forward progress, though, or we'll lock the caller up + * into an inf loop. */ + if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) && + (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS)) { + while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) { + --pIn_buf_cur; + num_bits -= 8; + } + } + r->m_num_bits = num_bits; + r->m_bit_buf = + bit_buf & (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1); + r->m_dist = dist; + r->m_counter = counter; + r->m_num_extra = num_extra; + r->m_dist_from_out_buf_start = dist_from_out_buf_start; + *pIn_buf_size = pIn_buf_cur - pIn_buf_next; + *pOut_buf_size = pOut_buf_cur - pOut_buf_next; + if ((decomp_flags & + (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && + (status >= 0)) { + const mz_uint8 *ptr = pOut_buf_next; + size_t buf_len = *pOut_buf_size; + mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, + s2 = r->m_check_adler32 >> 16; + size_t block_len = buf_len % 5552; + while (buf_len) { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) { + s1 += ptr[0], s2 += s1; + s1 += ptr[1], s2 += s1; + s1 += ptr[2], s2 += s1; + s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; + s1 += ptr[5], s2 += s1; + s1 += ptr[6], s2 += s1; + s1 += ptr[7], s2 += s1; + } + for (; i < block_len; ++i) + s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; + buf_len -= block_len; + block_len = 5552; + } + r->m_check_adler32 = (s2 << 16) + s1; + if ((status == TINFL_STATUS_DONE) && + (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && + (r->m_check_adler32 != r->m_z_adler32)) + status = TINFL_STATUS_ADLER32_MISMATCH; + } + return status; +} + +/* Higher level helper functions. */ +void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, + size_t *pOut_len, int flags) { + tinfl_decompressor decomp; + void *pBuf = NULL, *pNew_buf; + size_t src_buf_ofs = 0, out_buf_capacity = 0; + *pOut_len = 0; + tinfl_init(&decomp); + for (;;) { + size_t src_buf_size = src_buf_len - src_buf_ofs, + dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity; + tinfl_status status = tinfl_decompress( + &decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size, + (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL, + &dst_buf_size, + (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF); + if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT)) { + MZ_FREE(pBuf); + *pOut_len = 0; + return NULL; + } + src_buf_ofs += src_buf_size; + *pOut_len += dst_buf_size; + if (status == TINFL_STATUS_DONE) + break; + new_out_buf_capacity = out_buf_capacity * 2; + if (new_out_buf_capacity < 128) + new_out_buf_capacity = 128; + pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity); + if (!pNew_buf) { + MZ_FREE(pBuf); + *pOut_len = 0; + return NULL; + } + pBuf = pNew_buf; + out_buf_capacity = new_out_buf_capacity; + } + return pBuf; +} + +size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, + const void *pSrc_buf, size_t src_buf_len, + int flags) { + tinfl_decompressor decomp; + tinfl_status status; + tinfl_init(&decomp); + status = + tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len, + (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len, + (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF); + return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED + : out_buf_len; +} + +int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, + tinfl_put_buf_func_ptr pPut_buf_func, + void *pPut_buf_user, int flags) { + int result = 0; + tinfl_decompressor decomp; + mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE); + size_t in_buf_ofs = 0, dict_ofs = 0; + if (!pDict) + return TINFL_STATUS_FAILED; + tinfl_init(&decomp); + for (;;) { + size_t in_buf_size = *pIn_buf_size - in_buf_ofs, + dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs; + tinfl_status status = + tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs, + &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size, + (flags & ~(TINFL_FLAG_HAS_MORE_INPUT | + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))); + in_buf_ofs += in_buf_size; + if ((dst_buf_size) && + (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user))) + break; + if (status != TINFL_STATUS_HAS_MORE_OUTPUT) { + result = (status == TINFL_STATUS_DONE); + break; + } + dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1); + } + MZ_FREE(pDict); + *pIn_buf_size = in_buf_ofs; + return result; +} + +#ifndef MINIZ_NO_MALLOC +tinfl_decompressor *tinfl_decompressor_alloc() { + tinfl_decompressor *pDecomp = + (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor)); + if (pDecomp) + tinfl_init(pDecomp); + return pDecomp; +} + +void tinfl_decompressor_free(tinfl_decompressor *pDecomp) { MZ_FREE(pDecomp); } +#endif + +#ifdef __cplusplus +} +#endif +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * Copyright 2016 Martin Raiber + * All Rights Reserved. + * + * 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. + * + **************************************************************************/ + +#ifndef MINIZ_NO_ARCHIVE_APIS + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- .ZIP archive reading */ + +#ifdef MINIZ_NO_STDIO +#define MZ_FILE void * +#else +#include + +#if defined(_MSC_VER) +#include +#ifndef MINIZ_NO_TIME +#include +#endif +static wchar_t *str2wstr(const char *str) { + size_t len = strlen(str) + 1; + wchar_t *wstr = (wchar_t *)malloc(len * sizeof(wchar_t)); + MultiByteToWideChar(CP_UTF8, 0, str, (int)(len * sizeof(char)), wstr, + (int)len); + return wstr; +} + +static FILE *mz_fopen(const char *pFilename, const char *pMode) { + FILE *pFile = NULL; + wchar_t *wFilename = str2wstr(pFilename); + wchar_t *wMode = str2wstr(pMode); + +#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN + pFile = _wfopen(wFilename, wMode); +#else + _wfopen_s(&pFile, wFilename, wMode); +#endif + free(wFilename); + free(wMode); + + return pFile; +} + +static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) { + FILE *pFile = NULL; + int res = 0; + + wchar_t *wPath = str2wstr(pPath); + wchar_t *wMode = str2wstr(pMode); + +#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN + pFile = _wfreopen(wPath, wMode, pStream); +#else + res = _wfreopen_s(&pFile, wPath, wMode, pStream); +#endif + + free(wPath); + free(wMode); + +#ifndef ZIP_ENABLE_SHARABLE_FILE_OPEN + if (res) { + return NULL; + } +#endif + + return pFile; +} + +static int mz_stat(const char *pPath, struct _stat64 *buffer) { + wchar_t *wPath = str2wstr(pPath); + int res = _wstat64(wPath, buffer); + + free(wPath); + + return res; +} + +static int mz_mkdir(const char *pDirname) { + wchar_t *wDirname = str2wstr(pDirname); + int res = _wmkdir(wDirname); + + free(wDirname); + + return res; +} + +#define MZ_FOPEN mz_fopen +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 _ftelli64 +#define MZ_FSEEK64 _fseeki64 +#define MZ_FILE_STAT_STRUCT _stat64 +#define MZ_FILE_STAT mz_stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN mz_freopen +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) mz_mkdir(d) + +#elif defined(__MINGW32__) || defined(__MINGW64__) +#include +#ifndef MINIZ_NO_TIME +#include +#endif + +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftell +#define MZ_FSEEK64 fseek +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) _mkdir(d) + +#elif defined(__TINYC__) +#ifndef MINIZ_NO_TIME +#include +#endif + +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftell +#define MZ_FSEEK64 fseek +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) mkdir(d, 0755) + +#elif defined(__USE_LARGEFILE64) /* gcc, clang */ +#ifndef MINIZ_NO_TIME +#include +#endif + +#define MZ_FOPEN(f, m) fopen64(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftello64 +#define MZ_FSEEK64 fseeko64 +#define MZ_FILE_STAT_STRUCT stat64 +#define MZ_FILE_STAT stat64 +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(p, m, s) freopen64(p, m, s) +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) mkdir(d, 0755) + +#elif defined(__APPLE__) +#ifndef MINIZ_NO_TIME +#include +#endif + +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftello +#define MZ_FSEEK64 fseeko +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(p, m, s) freopen(p, m, s) +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) mkdir(d, 0755) + +#else +#pragma message( \ + "Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.") +#ifndef MINIZ_NO_TIME +#include +#endif + +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#ifdef __STRICT_ANSI__ +#define MZ_FTELL64 ftell +#define MZ_FSEEK64 fseek +#else +#define MZ_FTELL64 ftello +#define MZ_FSEEK64 fseeko +#endif +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#define MZ_MKDIR(d) mkdir(d, 0755) + +#endif /* #ifdef _MSC_VER */ +#endif /* #ifdef MINIZ_NO_STDIO */ + +#ifndef CHMOD +// Upon successful completion, a value of 0 is returned. +// Otherwise, a value of -1 is returned and errno is set to indicate the error. +// int chmod(const char *path, mode_t mode); +#define CHMOD(f, m) chmod(f, m) +#endif + +#define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c)) + +/* Various ZIP archive enums. To completely avoid cross platform compiler + * alignment and platform endian issues, miniz.c doesn't use structs for any of + * this stuff. */ +enum { + /* ZIP archive identifiers and record sizes */ + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50, + MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50, + MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, + + /* ZIP64 archive identifier and record sizes */ + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, + MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, + MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, + MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, + MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, + + /* Central directory header record offsets */ + MZ_ZIP_CDH_SIG_OFS = 0, + MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, + MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6, + MZ_ZIP_CDH_BIT_FLAG_OFS = 8, + MZ_ZIP_CDH_METHOD_OFS = 10, + MZ_ZIP_CDH_FILE_TIME_OFS = 12, + MZ_ZIP_CDH_FILE_DATE_OFS = 14, + MZ_ZIP_CDH_CRC32_OFS = 16, + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS = 20, + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS = 24, + MZ_ZIP_CDH_FILENAME_LEN_OFS = 28, + MZ_ZIP_CDH_EXTRA_LEN_OFS = 30, + MZ_ZIP_CDH_COMMENT_LEN_OFS = 32, + MZ_ZIP_CDH_DISK_START_OFS = 34, + MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36, + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38, + MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42, + + /* Local directory header offsets */ + MZ_ZIP_LDH_SIG_OFS = 0, + MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4, + MZ_ZIP_LDH_BIT_FLAG_OFS = 6, + MZ_ZIP_LDH_METHOD_OFS = 8, + MZ_ZIP_LDH_FILE_TIME_OFS = 10, + MZ_ZIP_LDH_FILE_DATE_OFS = 12, + MZ_ZIP_LDH_CRC32_OFS = 14, + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS = 18, + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22, + MZ_ZIP_LDH_FILENAME_LEN_OFS = 26, + MZ_ZIP_LDH_EXTRA_LEN_OFS = 28, + MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3, + + /* End of central directory offsets */ + MZ_ZIP_ECDH_SIG_OFS = 0, + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4, + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6, + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 8, + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS = 10, + MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, + MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, + MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, + + /* ZIP64 End of central directory locator offsets */ + MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ + MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ + + /* ZIP64 End of central directory header offsets */ + MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ + MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, + MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 +}; + +typedef struct { + void *m_p; + size_t m_size, m_capacity; + mz_uint m_element_size; +} mz_zip_array; + +struct mz_zip_internal_state_tag { + mz_zip_array m_central_dir; + mz_zip_array m_central_dir_offsets; + mz_zip_array m_sorted_central_dir_offsets; + + /* The flags passed in when the archive is initially opened. */ + uint32_t m_init_flags; + + /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. + */ + mz_bool m_zip64; + + /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 + * will also be slammed to true too, even if we didn't find a zip64 end of + * central dir header, etc.) */ + mz_bool m_zip64_has_extended_info_fields; + + /* These fields are used by the file, FILE, memory, and memory/heap read/write + * helpers. */ + MZ_FILE *m_pFile; + mz_uint64 m_file_archive_start_ofs; + + void *m_pMem; + size_t m_mem_size; + size_t m_mem_capacity; +}; + +#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) \ + (array_ptr)->m_element_size = element_size + +#if defined(DEBUG) || defined(_DEBUG) +static MZ_FORCEINLINE mz_uint +mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index) { + MZ_ASSERT(index < pArray->m_size); + return index; +} +#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) \ + ((element_type *)((array_ptr) \ + ->m_p))[mz_zip_array_range_check(array_ptr, index)] +#else +#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) \ + ((element_type *)((array_ptr)->m_p))[index] +#endif + +static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray, + mz_uint32 element_size) { + memset(pArray, 0, sizeof(mz_zip_array)); + pArray->m_element_size = element_size; +} + +static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, + mz_zip_array *pArray) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p); + memset(pArray, 0, sizeof(mz_zip_array)); +} + +static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, + mz_zip_array *pArray, + size_t min_new_capacity, + mz_uint growing) { + void *pNew_p; + size_t new_capacity = min_new_capacity; + MZ_ASSERT(pArray->m_element_size); + if (pArray->m_capacity >= min_new_capacity) + return MZ_TRUE; + if (growing) { + new_capacity = MZ_MAX(1, pArray->m_capacity); + while (new_capacity < min_new_capacity) + new_capacity *= 2; + } + if (NULL == (pNew_p = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pArray->m_p, + pArray->m_element_size, new_capacity))) + return MZ_FALSE; + pArray->m_p = pNew_p; + pArray->m_capacity = new_capacity; + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, + mz_zip_array *pArray, + size_t new_capacity, + mz_uint growing) { + if (new_capacity > pArray->m_capacity) { + if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing)) + return MZ_FALSE; + } + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, + mz_zip_array *pArray, + size_t new_size, + mz_uint growing) { + if (new_size > pArray->m_capacity) { + if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing)) + return MZ_FALSE; + } + pArray->m_size = new_size; + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, + mz_zip_array *pArray, + size_t n) { + return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE); +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, + mz_zip_array *pArray, + const void *pElements, + size_t n) { + size_t orig_size = pArray->m_size; + if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE)) + return MZ_FALSE; + if (n > 0) + memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size, + pElements, n * pArray->m_element_size); + return MZ_TRUE; +} + +#ifndef MINIZ_NO_TIME +static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date) { + struct tm tm; + memset(&tm, 0, sizeof(tm)); + tm.tm_isdst = -1; + tm.tm_year = ((dos_date >> 9) & 127) + 1980 - 1900; + tm.tm_mon = ((dos_date >> 5) & 15) - 1; + tm.tm_mday = dos_date & 31; + tm.tm_hour = (dos_time >> 11) & 31; + tm.tm_min = (dos_time >> 5) & 63; + tm.tm_sec = (dos_time << 1) & 62; + return mktime(&tm); +} + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS +static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time, + mz_uint16 *pDOS_date) { +#ifdef _MSC_VER + struct tm tm_struct; + struct tm *tm = &tm_struct; + errno_t err = localtime_s(tm, &time); + if (err) { + *pDOS_date = 0; + *pDOS_time = 0; + return; + } +#else + struct tm *tm = localtime(&time); +#endif /* #ifdef _MSC_VER */ + + *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + + ((tm->tm_sec) >> 1)); + *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + + ((tm->tm_mon + 1) << 5) + tm->tm_mday); +} +#endif /* MINIZ_NO_ARCHIVE_WRITING_APIS */ + +#ifndef MINIZ_NO_STDIO +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS +static mz_bool mz_zip_get_file_modified_time(const char *pFilename, + MZ_TIME_T *pTime) { + struct MZ_FILE_STAT_STRUCT file_stat; + + /* On Linux with x86 glibc, this call will fail on large files (I think >= + * 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh. */ + if (MZ_FILE_STAT(pFilename, &file_stat) != 0) + return MZ_FALSE; + + *pTime = file_stat.st_mtime; + + return MZ_TRUE; +} +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/ + +static mz_bool mz_zip_set_file_times(const char *pFilename, + MZ_TIME_T access_time, + MZ_TIME_T modified_time) { + struct utimbuf t; + + memset(&t, 0, sizeof(t)); + t.actime = access_time; + t.modtime = modified_time; + + return !utime(pFilename, &t); +} +#endif /* #ifndef MINIZ_NO_STDIO */ +#endif /* #ifndef MINIZ_NO_TIME */ + +static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, + mz_zip_error err_num) { + if (pZip) + pZip->m_last_error = err_num; + return MZ_FALSE; +} + +static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, + mz_uint flags) { + (void)flags; + if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!pZip->m_pAlloc) + pZip->m_pAlloc = miniz_def_alloc_func; + if (!pZip->m_pFree) + pZip->m_pFree = miniz_def_free_func; + if (!pZip->m_pRealloc) + pZip->m_pRealloc = miniz_def_realloc_func; + + pZip->m_archive_size = 0; + pZip->m_central_directory_file_ofs = 0; + pZip->m_total_files = 0; + pZip->m_last_error = MZ_ZIP_NO_ERROR; + + if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, + sizeof(mz_uint8)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, + sizeof(mz_uint32)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, + sizeof(mz_uint32)); + pZip->m_pState->m_init_flags = flags; + pZip->m_pState->m_zip64 = MZ_FALSE; + pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE; + + pZip->m_zip_mode = MZ_ZIP_MODE_READING; + + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool +mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, + const mz_zip_array *pCentral_dir_offsets, + mz_uint l_index, mz_uint r_index) { + const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT( + pCentral_dir_array, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, + l_index)), + *pE; + const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT( + pCentral_dir_array, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index)); + mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), + r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS); + mz_uint8 l = 0, r = 0; + pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pE = pL + MZ_MIN(l_len, r_len); + while (pL < pE) { + if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR))) + break; + pL++; + pR++; + } + return (pL == pE) ? (l_len < r_len) : (l < r); +} + +#define MZ_SWAP_UINT32(a, b) \ + do { \ + mz_uint32 t = a; \ + a = b; \ + b = t; \ + } \ + MZ_MACRO_END + +/* Heap sort of lowercased filenames, used to help accelerate plain central + * directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), + * but it could allocate memory.) */ +static void +mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) { + mz_zip_internal_state *pState = pZip->m_pState; + const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets; + const mz_zip_array *pCentral_dir = &pState->m_central_dir; + mz_uint32 *pIndices; + mz_uint32 start, end; + const mz_uint32 size = pZip->m_total_files; + + if (size <= 1U) + return; + + pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, + mz_uint32, 0); + + start = (size - 2U) >> 1U; + for (;;) { + mz_uint64 child, root = start; + for (;;) { + if ((child = (root << 1U) + 1U) >= size) + break; + child += (((child + 1U) < size) && + (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, + pIndices[child], + pIndices[child + 1U]))); + if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, + pIndices[root], pIndices[child])) + break; + MZ_SWAP_UINT32(pIndices[root], pIndices[child]); + root = child; + } + if (!start) + break; + start--; + } + + end = size - 1; + while (end > 0) { + mz_uint64 child, root = 0; + MZ_SWAP_UINT32(pIndices[end], pIndices[0]); + for (;;) { + if ((child = (root << 1U) + 1U) >= end) + break; + child += + (((child + 1U) < end) && + mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, + pIndices[child], pIndices[child + 1U])); + if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, + pIndices[root], pIndices[child])) + break; + MZ_SWAP_UINT32(pIndices[root], pIndices[child]); + root = child; + } + end--; + } +} + +static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, + mz_uint32 record_sig, + mz_uint32 record_size, + mz_int64 *pOfs) { + mz_int64 cur_file_ofs; + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; + + /* Basic sanity checks - reject files which are too small */ + if (pZip->m_archive_size < record_size) + return MZ_FALSE; + + /* Find the record by scanning the file from the end towards the beginning. */ + cur_file_ofs = + MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); + for (;;) { + int i, + n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); + + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) + return MZ_FALSE; + + for (i = n - 4; i >= 0; --i) { + mz_uint s = MZ_READ_LE32(pBuf + i); + if (s == record_sig) { + if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) + break; + } + } + + if (i >= 0) { + cur_file_ofs += i; + break; + } + + /* Give up if we've searched the entire file, or we've gone back "too far" + * (~64kb) */ + if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= + (MZ_UINT16_MAX + record_size))) + return MZ_FALSE; + + cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); + } + + *pOfs = cur_file_ofs; + return MZ_TRUE; +} + +static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, + mz_uint flags) { + mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, + cdir_disk_index = 0; + mz_uint64 cdir_ofs = 0; + mz_int64 cur_file_ofs = 0; + const mz_uint8 *p; + + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; + mz_bool sort_central_dir = + ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); + mz_uint32 zip64_end_of_central_dir_locator_u32 + [(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; + + mz_uint32 zip64_end_of_central_dir_header_u32 + [(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pZip64_end_of_central_dir = + (mz_uint8 *)zip64_end_of_central_dir_header_u32; + + mz_uint64 zip64_end_of_central_dir_ofs = 0; + + /* Basic sanity checks - reject files which are too small, and check the first + * 4 bytes of the file to make sure a local header is there. */ + if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (!mz_zip_reader_locate_header_sig( + pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) + return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); + + /* Read and verify the end of central directory record. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) { + if (pZip->m_pRead(pZip->m_pIO_opaque, + cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, + pZip64_locator, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) { + if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) { + zip64_end_of_central_dir_ofs = MZ_READ_LE64( + pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); + if (zip64_end_of_central_dir_ofs > + (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, + pZip64_end_of_central_dir, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) { + if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) { + pZip->m_pState->m_zip64 = MZ_TRUE; + } + } + } + } + } + + pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); + cdir_entries_on_this_disk = + MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); + cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); + cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); + cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); + + if (pZip->m_pState->m_zip64) { + mz_uint32 zip64_total_num_of_disks = + MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); + mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64( + pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); + mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64( + pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64( + pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); + mz_uint64 zip64_size_of_central_directory = + MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); + + if (zip64_size_of_end_of_central_dir_record < + (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (zip64_total_num_of_disks != 1U) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + /* Check for miniz's practical limits */ + if (zip64_cdir_total_entries > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; + + if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + cdir_entries_on_this_disk = + (mz_uint32)zip64_cdir_total_entries_on_this_disk; + + /* Check for miniz's current practical limits (sorry, this should be enough + * for millions of files) */ + if (zip64_size_of_central_directory > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + cdir_size = (mz_uint32)zip64_size_of_central_directory; + + num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); + + cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); + + cdir_ofs = + MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); + } + + if (pZip->m_total_files != cdir_entries_on_this_disk) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (((num_this_disk | cdir_disk_index) != 0) && + ((num_this_disk != 1) || (cdir_disk_index != 1))) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pZip->m_central_directory_file_ofs = cdir_ofs; + + if (pZip->m_total_files) { + mz_uint i, n; + /* Read the entire central directory into a heap block, and allocate another + * heap block to hold the unsorted central dir file record offsets, and + * possibly another to hold the sorted indices. */ + if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, + MZ_FALSE)) || + (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, + pZip->m_total_files, MZ_FALSE))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (sort_central_dir) { + if (!mz_zip_array_resize(pZip, + &pZip->m_pState->m_sorted_central_dir_offsets, + pZip->m_total_files, MZ_FALSE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, + pZip->m_pState->m_central_dir.m_p, + cdir_size) != cdir_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + /* Now create an index into the central directory file records, do some + * basic sanity checking on each record */ + p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; + for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) { + mz_uint total_header_size, disk_index, bit_flags, filename_size, + ext_data_size; + mz_uint64 comp_size, decomp_size, local_header_ofs; + + if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || + (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, + i) = + (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); + + if (sort_central_dir) + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, + mz_uint32, i) = i; + + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); + filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); + + if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && + (ext_data_size) && + (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == + MZ_UINT32_MAX)) { + /* Attempt to find zip64 extended information field in the entry's extra + * data */ + mz_uint32 extra_size_remaining = ext_data_size; + + if (extra_size_remaining) { + const mz_uint8 *pExtra_data; + void *buf = NULL; + + if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > + n) { + buf = MZ_MALLOC(ext_data_size); + if (buf == NULL) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (pZip->m_pRead(pZip->m_pIO_opaque, + cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + filename_size, + buf, ext_data_size) != ext_data_size) { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + pExtra_data = (mz_uint8 *)buf; + } else { + pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; + } + + do { + mz_uint32 field_id; + mz_uint32 field_data_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + + if ((field_data_size + sizeof(mz_uint16) * 2) > + extra_size_remaining) { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { + /* Ok, the archive didn't have any zip64 headers but it uses a + * zip64 extended information field so mark it as zip64 anyway + * (this can occur with infozip's zip util when it reads + * compresses files from stdin). */ + pZip->m_pState->m_zip64 = MZ_TRUE; + pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; + break; + } + + pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; + extra_size_remaining = + extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; + } while (extra_size_remaining); + + MZ_FREE(buf); + } + } + + /* I've seen archives that aren't marked as zip64 that uses zip64 ext + * data, argh */ + if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX)) { + if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && + (decomp_size != comp_size)) || + (decomp_size && !comp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS); + if ((disk_index == MZ_UINT16_MAX) || + ((disk_index != num_this_disk) && (disk_index != 1))) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (comp_size != MZ_UINT32_MAX) { + if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > + n) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + n -= total_header_size; + p += total_header_size; + } + } + + if (sort_central_dir) + mz_zip_reader_sort_central_dir_offsets_by_filename(pZip); + + return MZ_TRUE; +} + +void mz_zip_zero_struct(mz_zip_archive *pZip) { + if (pZip) + MZ_CLEAR_OBJ(*pZip); +} + +static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip, + mz_bool set_last_error) { + mz_bool status = MZ_TRUE; + + if (!pZip) + return MZ_FALSE; + + if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || + (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) { + if (set_last_error) + pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER; + + return MZ_FALSE; + } + + if (pZip->m_pState) { + mz_zip_internal_state *pState = pZip->m_pState; + pZip->m_pState = NULL; + + mz_zip_array_clear(pZip, &pState->m_central_dir); + mz_zip_array_clear(pZip, &pState->m_central_dir_offsets); + mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets); + +#ifndef MINIZ_NO_STDIO + if (pState->m_pFile) { + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) { + if (MZ_FCLOSE(pState->m_pFile) == EOF) { + if (set_last_error) + pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED; + status = MZ_FALSE; + } + } + pState->m_pFile = NULL; + } +#endif /* #ifndef MINIZ_NO_STDIO */ + + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + } + pZip->m_zip_mode = MZ_ZIP_MODE_INVALID; + + return status; +} + +mz_bool mz_zip_reader_end(mz_zip_archive *pZip) { + return mz_zip_reader_end_internal(pZip, MZ_TRUE); +} +mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, + mz_uint flags) { + if ((!pZip) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_USER; + pZip->m_archive_size = size; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n) { + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + size_t s = (file_ofs >= pZip->m_archive_size) + ? 0 + : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n); + memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s); + return s; +} + +mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, + size_t size, mz_uint flags) { + if (!pMem) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY; + pZip->m_archive_size = size; + pZip->m_pRead = mz_zip_mem_read_func; + pZip->m_pIO_opaque = pZip; + pZip->m_pNeeds_keepalive = NULL; + +#ifdef __cplusplus + pZip->m_pState->m_pMem = const_cast(pMem); +#else + pZip->m_pState->m_pMem = (void *)pMem; +#endif + + pZip->m_pState->m_mem_size = size; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n) { + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile); + + file_ofs += pZip->m_pState->m_file_archive_start_ofs; + + if (((mz_int64)file_ofs < 0) || + (((cur_ofs != (mz_int64)file_ofs)) && + (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET)))) + return 0; + + return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile); +} + +mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, + mz_uint32 flags) { + return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0); +} + +mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, + mz_uint flags, mz_uint64 file_start_ofs, + mz_uint64 archive_size) { + mz_uint64 file_size; + MZ_FILE *pFile; + + if ((!pZip) || (!pFilename) || + ((archive_size) && + (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pFile = MZ_FOPEN(pFilename, "rb"); + if (!pFile) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + file_size = archive_size; + if (!file_size) { + if (MZ_FSEEK64(pFile, 0, SEEK_END)) { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + } + + file_size = MZ_FTELL64(pFile); + } + + /* TODO: Better sanity check archive_size and the # of actual remaining bytes + */ + + if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + } + + if (!mz_zip_reader_init_internal(pZip, flags)) { + MZ_FCLOSE(pFile); + return MZ_FALSE; + } + + pZip->m_zip_type = MZ_ZIP_TYPE_FILE; + pZip->m_pRead = mz_zip_file_read_func; + pZip->m_pIO_opaque = pZip; + pZip->m_pState->m_pFile = pFile; + pZip->m_archive_size = file_size; + pZip->m_pState->m_file_archive_start_ofs = file_start_ofs; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_reader_init_file_v2_rpb(mz_zip_archive *pZip, + const char *pFilename, mz_uint flags, + mz_uint64 file_start_ofs, + mz_uint64 archive_size) { + mz_uint64 file_size; + MZ_FILE *pFile; + + if ((!pZip) || (!pFilename) || + ((archive_size) && + (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pFile = MZ_FOPEN(pFilename, "r+b"); + if (!pFile) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + file_size = archive_size; + if (!file_size) { + if (MZ_FSEEK64(pFile, 0, SEEK_END)) { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + } + + file_size = MZ_FTELL64(pFile); + } + + /* TODO: Better sanity check archive_size and the # of actual remaining bytes + */ + + if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + } + + if (!mz_zip_reader_init_internal(pZip, flags)) { + MZ_FCLOSE(pFile); + return MZ_FALSE; + } + + pZip->m_zip_type = MZ_ZIP_TYPE_FILE; + pZip->m_pRead = mz_zip_file_read_func; + pZip->m_pIO_opaque = pZip; + pZip->m_pState->m_pFile = pFile; + pZip->m_archive_size = file_size; + pZip->m_pState->m_file_archive_start_ofs = file_start_ofs; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, + mz_uint64 archive_size, mz_uint flags) { + mz_uint64 cur_file_ofs; + + if ((!pZip) || (!pFile)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + cur_file_ofs = MZ_FTELL64(pFile); + + if (!archive_size) { + if (MZ_FSEEK64(pFile, 0, SEEK_END)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + + archive_size = MZ_FTELL64(pFile) - cur_file_ofs; + + if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + } + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_CFILE; + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + pZip->m_pState->m_pFile = pFile; + pZip->m_archive_size = archive_size; + pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +#endif /* #ifndef MINIZ_NO_STDIO */ + +static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip, + mz_uint file_index) { + if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files)) + return NULL; + return &MZ_ZIP_ARRAY_ELEMENT( + &pZip->m_pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, + file_index)); +} + +mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, + mz_uint file_index) { + mz_uint m_bit_flag; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + return (m_bit_flag & + (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0; +} + +mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, + mz_uint file_index) { + mz_uint bit_flag; + mz_uint method; + + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS); + bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + + if ((method != 0) && (method != MZ_DEFLATED)) { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + return MZ_FALSE; + } + + if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + return MZ_FALSE; + } + + if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG) { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, + mz_uint file_index) { + mz_uint filename_len, attribute_mapping_id, external_attr; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + if (filename_len) { + if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/') + return MZ_TRUE; + } + + /* Bugfix: This code was also checking if the internal attribute was non-zero, + * which wasn't correct. */ + /* Most/all zip writers (hopefully) set DOS file/directory attributes in the + * low 16-bits, so check for the DOS directory flag and ignore the source OS + * ID in the created by field. */ + /* FIXME: Remove this check? Is it necessary - we already check the filename. + */ + attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8; + (void)attribute_mapping_id; + + external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS); + if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0) { + return MZ_TRUE; + } + + return MZ_FALSE; +} + +static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, + mz_uint file_index, + const mz_uint8 *pCentral_dir_header, + mz_zip_archive_file_stat *pStat, + mz_bool *pFound_zip64_extra_data) { + mz_uint n; + const mz_uint8 *p = pCentral_dir_header; + + if (pFound_zip64_extra_data) + *pFound_zip64_extra_data = MZ_FALSE; + + if ((!p) || (!pStat)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Extract fields from the central directory record. */ + pStat->m_file_index = file_index; + pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT( + &pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index); + pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS); + pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS); + pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS); +#ifndef MINIZ_NO_TIME + pStat->m_time = + mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), + MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS)); +#endif + pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS); + pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + pStat->m_uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + pStat->m_internal_attr = MZ_READ_LE16(p + MZ_ZIP_CDH_INTERNAL_ATTR_OFS); + pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS); + pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); + + /* Copy as much of the filename and comment as possible. */ + n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1); + memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n); + pStat->m_filename[n] = '\0'; + + n = MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS); + n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE - 1); + pStat->m_comment_size = n; + memcpy(pStat->m_comment, + p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS), + n); + pStat->m_comment[n] = '\0'; + + /* Set some flags for convienance */ + pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index); + pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index); + pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index); + + /* See if we need to read any zip64 extended information fields. */ + /* Confusingly, these zip64 fields can be present even on non-zip64 archives + * (Debian zip on a huge files from stdin piped to stdout creates them). */ + if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size), + pStat->m_local_header_ofs) == MZ_UINT32_MAX) { + /* Attempt to find zip64 extended information field in the entry's extra + * data */ + mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); + + if (extra_size_remaining) { + const mz_uint8 *pExtra_data = + p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + + do { + mz_uint32 field_id; + mz_uint32 field_data_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + + if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { + const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2; + mz_uint32 field_data_remaining = field_data_size; + + if (pFound_zip64_extra_data) + *pFound_zip64_extra_data = MZ_TRUE; + + if (pStat->m_uncomp_size == MZ_UINT32_MAX) { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_uncomp_size = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + field_data_remaining -= sizeof(mz_uint64); + } + + if (pStat->m_comp_size == MZ_UINT32_MAX) { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_comp_size = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + field_data_remaining -= sizeof(mz_uint64); + } + + if (pStat->m_local_header_ofs == MZ_UINT32_MAX) { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_local_header_ofs = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + (void)pField_data; // unused + + field_data_remaining -= sizeof(mz_uint64); + (void)field_data_remaining; // unused + } + + break; + } + + pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; + extra_size_remaining = + extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; + } while (extra_size_remaining); + } + } + + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA, + const char *pB, mz_uint len, + mz_uint flags) { + mz_uint i; + if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE) + return 0 == memcmp(pA, pB, len); + for (i = 0; i < len; ++i) + if (MZ_TOLOWER(pA[i]) != MZ_TOLOWER(pB[i])) + return MZ_FALSE; + return MZ_TRUE; +} + +static MZ_FORCEINLINE int +mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array, + const mz_zip_array *pCentral_dir_offsets, + mz_uint l_index, const char *pR, mz_uint r_len) { + const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT( + pCentral_dir_array, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, + l_index)), + *pE; + mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS); + mz_uint8 l = 0, r = 0; + pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pE = pL + MZ_MIN(l_len, r_len); + while (pL < pE) { + if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR))) + break; + pL++; + pR++; + } + return (pL == pE) ? (int)(l_len - r_len) : (l - r); +} + +static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip, + const char *pFilename, + mz_uint32 *pIndex) { + mz_zip_internal_state *pState = pZip->m_pState; + const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets; + const mz_zip_array *pCentral_dir = &pState->m_central_dir; + mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT( + &pState->m_sorted_central_dir_offsets, mz_uint32, 0); + const uint32_t size = pZip->m_total_files; + const mz_uint filename_len = (mz_uint)strlen(pFilename); + + if (pIndex) + *pIndex = 0; + + if (size) { + /* yes I could use uint32_t's, but then we would have to add some special + * case checks in the loop, argh, and */ + /* honestly the major expense here on 32-bit CPU's will still be the + * filename compare */ + mz_int64 l = 0, h = (mz_int64)size - 1; + + while (l <= h) { + mz_int64 m = l + ((h - l) >> 1); + uint32_t file_index = pIndices[(uint32_t)m]; + + int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets, + file_index, pFilename, filename_len); + if (!comp) { + if (pIndex) + *pIndex = file_index; + return MZ_TRUE; + } else if (comp < 0) + l = m + 1; + else + h = m - 1; + } + } + + return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND); +} + +int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, + const char *pComment, mz_uint flags) { + mz_uint32 index; + if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index)) + return -1; + else + return (int)index; +} + +mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, + const char *pComment, mz_uint flags, + mz_uint32 *pIndex) { + mz_uint file_index; + size_t name_len, comment_len; + + if (pIndex) + *pIndex = 0; + + if ((!pZip) || (!pZip->m_pState) || (!pName)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* See if we can use a binary search */ + if (((pZip->m_pState->m_init_flags & + MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) && + (pZip->m_zip_mode == MZ_ZIP_MODE_READING) && + ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && + (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size)) { + return mz_zip_locate_file_binary_search(pZip, pName, pIndex); + } + + /* Locate the entry by scanning the entire central directory */ + name_len = strlen(pName); + if (name_len > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + comment_len = pComment ? strlen(pComment) : 0; + if (comment_len > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + for (file_index = 0; file_index < pZip->m_total_files; file_index++) { + const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT( + &pZip->m_pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, + file_index)); + mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS); + const char *pFilename = + (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + if (filename_len < name_len) + continue; + if (comment_len) { + mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), + file_comment_len = + MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS); + const char *pFile_comment = pFilename + filename_len + file_extra_len; + if ((file_comment_len != comment_len) || + (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len, + flags))) + continue; + } + if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len)) { + int ofs = filename_len - 1; + do { + if ((pFilename[ofs] == '/') || (pFilename[ofs] == '\\') || + (pFilename[ofs] == ':')) + break; + } while (--ofs >= 0); + ofs++; + pFilename += ofs; + filename_len -= ofs; + } + if ((filename_len == name_len) && + (mz_zip_string_equal(pName, pFilename, filename_len, flags))) { + if (pIndex) + *pIndex = file_index; + return MZ_TRUE; + } + } + + return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND); +} + +mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, + mz_uint file_index, void *pBuf, + size_t buf_size, mz_uint flags, + void *pUser_read_buf, + size_t user_read_buf_size) { + int status = TINFL_STATUS_DONE; + mz_uint64 needed_size, cur_file_ofs, comp_remaining, + out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail; + mz_zip_archive_file_stat file_stat; + void *pRead_buf; + mz_uint32 + local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + tinfl_decompressor inflator; + + if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) || + ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + /* A directory or zero length file */ + if (file_stat.m_is_directory || (!file_stat.m_comp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_bit_flag & + (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && + (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + /* Ensure supplied output buffer is large enough. */ + needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size + : file_stat.m_uncomp_size; + if (buf_size < needed_size) + return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL); + + /* Read and parse the local directory entry. */ + cur_file_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) { + /* The file is stored or the caller has requested the compressed data. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, + (size_t)needed_size) != needed_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0) { + if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, + (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32) + return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED); + } +#endif + + return MZ_TRUE; + } + + /* Decompress the file either directly from memory or from a file input + * buffer. */ + tinfl_init(&inflator); + + if (pZip->m_pState->m_pMem) { + /* Read directly from the archive in memory. */ + pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs; + read_buf_size = read_buf_avail = file_stat.m_comp_size; + comp_remaining = 0; + } else if (pUser_read_buf) { + /* Use a user provided read buffer. */ + if (!user_read_buf_size) + return MZ_FALSE; + pRead_buf = (mz_uint8 *)pUser_read_buf; + read_buf_size = user_read_buf_size; + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } else { + /* Temporarily allocate a read buffer. */ + read_buf_size = + MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, + (size_t)read_buf_size))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } + + do { + /* The size_t cast here should be OK because we've verified that the output + * buffer is >= file_stat.m_uncomp_size above */ + size_t in_buf_size, + out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs); + if ((!read_buf_avail) && (!pZip->m_pState->m_pMem)) { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, + (size_t)read_buf_avail) != read_buf_avail) { + status = TINFL_STATUS_FAILED; + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + break; + } + cur_file_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + read_buf_ofs = 0; + } + in_buf_size = (size_t)read_buf_avail; + status = tinfl_decompress( + &inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, + (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | + (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0)); + read_buf_avail -= in_buf_size; + read_buf_ofs += in_buf_size; + out_buf_ofs += out_buf_size; + } while (status == TINFL_STATUS_NEEDS_MORE_INPUT); + + if (status == TINFL_STATUS_DONE) { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (out_buf_ofs != file_stat.m_uncomp_size) { + mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, + (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32) { + mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED); + status = TINFL_STATUS_FAILED; + } +#endif + } + + if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf)) + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + + return status == TINFL_STATUS_DONE; +} + +mz_bool mz_zip_reader_extract_file_to_mem_no_alloc( + mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, + mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size) { + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return MZ_FALSE; + return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, + flags, pUser_read_buf, + user_read_buf_size); +} + +mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, + void *pBuf, size_t buf_size, + mz_uint flags) { + return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, + flags, NULL, 0); +} + +mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, + const char *pFilename, void *pBuf, + size_t buf_size, mz_uint flags) { + return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, + buf_size, flags, NULL, 0); +} + +void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, + size_t *pSize, mz_uint flags) { + mz_uint64 comp_size, uncomp_size, alloc_size; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + void *pBuf; + + if (pSize) + *pSize = 0; + + if (!p) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return NULL; + } + + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + + alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size; + if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF)) { + mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + return NULL; + } + + if (NULL == + (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size))) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return NULL; + } + + if (!mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size, + flags)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return NULL; + } + + if (pSize) + *pSize = (size_t)alloc_size; + return pBuf; +} + +void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, + const char *pFilename, size_t *pSize, + mz_uint flags) { + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, + &file_index)) { + if (pSize) + *pSize = 0; + return MZ_FALSE; + } + return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags); +} + +mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, + mz_uint file_index, + mz_file_write_func pCallback, + void *pOpaque, mz_uint flags) { + int status = TINFL_STATUS_DONE; +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + mz_uint file_crc32 = MZ_CRC32_INIT; +#endif + mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, + out_buf_ofs = 0, cur_file_ofs; + mz_zip_archive_file_stat file_stat; + void *pRead_buf = NULL; + void *pWrite_buf = NULL; + mz_uint32 + local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + + if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + /* A directory or zero length file */ + if (file_stat.m_is_directory || (!file_stat.m_comp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_bit_flag & + (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && + (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + /* Read and do some minimal validation of the local directory entry (this + * doesn't crack the zip64 stuff, which we already have from the central dir) + */ + cur_file_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + /* Decompress the file either directly from memory or from a file input + * buffer. */ + if (pZip->m_pState->m_pMem) { + pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs; + read_buf_size = read_buf_avail = file_stat.m_comp_size; + comp_remaining = 0; + } else { + read_buf_size = + MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, + (size_t)read_buf_size))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } + + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) { + /* The file is stored or the caller has requested the compressed data. */ + if (pZip->m_pState->m_pMem) { + if (((sizeof(size_t) == sizeof(mz_uint32))) && + (file_stat.m_comp_size > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pCallback(pOpaque, out_buf_ofs, pRead_buf, + (size_t)file_stat.m_comp_size) != file_stat.m_comp_size) { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + } else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) { +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + file_crc32 = + (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, + (size_t)file_stat.m_comp_size); +#endif + } + + cur_file_ofs += file_stat.m_comp_size; + out_buf_ofs += file_stat.m_comp_size; + comp_remaining = 0; + } else { + while (comp_remaining) { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, + (size_t)read_buf_avail) != read_buf_avail) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) { + file_crc32 = (mz_uint32)mz_crc32( + file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail); + } +#endif + + if (pCallback(pOpaque, out_buf_ofs, pRead_buf, + (size_t)read_buf_avail) != read_buf_avail) { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + + cur_file_ofs += read_buf_avail; + out_buf_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + } + } + } else { + tinfl_decompressor inflator; + tinfl_init(&inflator); + + if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, + TINFL_LZ_DICT_SIZE))) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + status = TINFL_STATUS_FAILED; + } else { + do { + mz_uint8 *pWrite_buf_cur = + (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + size_t in_buf_size, + out_buf_size = + TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + if ((!read_buf_avail) && (!pZip->m_pState->m_pMem)) { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, + (size_t)read_buf_avail) != read_buf_avail) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + cur_file_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + read_buf_ofs = 0; + } + + in_buf_size = (size_t)read_buf_avail; + status = tinfl_decompress( + &inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, + (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, + comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0); + read_buf_avail -= in_buf_size; + read_buf_ofs += in_buf_size; + + if (out_buf_size) { + if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) != + out_buf_size) { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + file_crc32 = + (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size); +#endif + if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size) { + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + } + } while ((status == TINFL_STATUS_NEEDS_MORE_INPUT) || + (status == TINFL_STATUS_HAS_MORE_OUTPUT)); + } + } + + if ((status == TINFL_STATUS_DONE) && + (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (out_buf_ofs != file_stat.m_uncomp_size) { + mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (file_crc32 != file_stat.m_crc32) { + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + status = TINFL_STATUS_FAILED; + } +#endif + } + + if (!pZip->m_pState->m_pMem) + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + + if (pWrite_buf) + pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf); + + return status == TINFL_STATUS_DONE; +} + +mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, + const char *pFilename, + mz_file_write_func pCallback, + void *pOpaque, mz_uint flags) { + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, + flags); +} + +mz_zip_reader_extract_iter_state * +mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, + mz_uint flags) { + mz_zip_reader_extract_iter_state *pState; + mz_uint32 + local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + + /* Argument sanity check */ + if ((!pZip) || (!pZip->m_pState)) + return NULL; + + /* Allocate an iterator status structure */ + pState = (mz_zip_reader_extract_iter_state *)pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state)); + if (!pState) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return NULL; + } + + /* Fetch file details */ + if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Encryption and patch files are not supported. */ + if (pState->file_stat.m_bit_flag & + (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && + (pState->file_stat.m_method != 0) && + (pState->file_stat.m_method != MZ_DEFLATED)) { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Init state - save args */ + pState->pZip = pZip; + pState->flags = flags; + + /* Init state - reset variables to defaults */ + pState->status = TINFL_STATUS_DONE; +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + pState->file_crc32 = MZ_CRC32_INIT; +#endif + pState->read_buf_ofs = 0; + pState->out_buf_ofs = 0; + pState->pRead_buf = NULL; + pState->pWrite_buf = NULL; + pState->out_blk_remain = 0; + + /* Read and parse the local directory entry. */ + pState->cur_file_ofs = pState->file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + pState->cur_file_ofs += + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) > + pZip->m_archive_size) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Decompress the file either directly from memory or from a file input + * buffer. */ + if (pZip->m_pState->m_pMem) { + pState->pRead_buf = + (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs; + pState->read_buf_size = pState->read_buf_avail = + pState->file_stat.m_comp_size; + pState->comp_remaining = pState->file_stat.m_comp_size; + } else { + if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || + (!pState->file_stat.m_method))) { + /* Decompression required, therefore intermediate read buffer required */ + pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, + (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + if (NULL == + (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, + (size_t)pState->read_buf_size))) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + } else { + /* Decompression not required - we will be reading directly into user + * buffer, no temp buf required */ + pState->read_buf_size = 0; + } + pState->read_buf_avail = 0; + pState->comp_remaining = pState->file_stat.m_comp_size; + } + + if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || + (!pState->file_stat.m_method))) { + /* Decompression required, init decompressor */ + tinfl_init(&pState->inflator); + + /* Allocate write buffer */ + if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, + TINFL_LZ_DICT_SIZE))) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + if (pState->pRead_buf) + pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + } + + return pState; +} + +mz_zip_reader_extract_iter_state * +mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, + mz_uint flags) { + mz_uint32 file_index; + + /* Locate file index by name */ + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return NULL; + + /* Construct iterator */ + return mz_zip_reader_extract_iter_new(pZip, file_index, flags); +} + +size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state *pState, + void *pvBuf, size_t buf_size) { + size_t copied_to_caller = 0; + + /* Argument sanity check */ + if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf)) + return 0; + + if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || + (!pState->file_stat.m_method)) { + /* The file is stored or the caller has requested the compressed data, calc + * amount to return. */ + copied_to_caller = (size_t)MZ_MIN(buf_size, pState->comp_remaining); + + /* Zip is in memory....or requires reading from a file? */ + if (pState->pZip->m_pState->m_pMem) { + /* Copy data to caller's buffer */ + memcpy(pvBuf, pState->pRead_buf, copied_to_caller); + pState->pRead_buf = ((mz_uint8 *)pState->pRead_buf) + copied_to_caller; + } else { + /* Read directly into caller's buffer */ + if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, + pState->cur_file_ofs, pvBuf, + copied_to_caller) != copied_to_caller) { + /* Failed to read all that was asked for, flag failure and alert user */ + mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED); + pState->status = TINFL_STATUS_FAILED; + copied_to_caller = 0; + } + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + /* Compute CRC if not returning compressed data only */ + if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + pState->file_crc32 = (mz_uint32)mz_crc32( + pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller); +#endif + + /* Advance offsets, dec counters */ + pState->cur_file_ofs += copied_to_caller; + pState->out_buf_ofs += copied_to_caller; + pState->comp_remaining -= copied_to_caller; + } else { + do { + /* Calc ptr to write buffer - given current output pos and block size */ + mz_uint8 *pWrite_buf_cur = + (mz_uint8 *)pState->pWrite_buf + + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + + /* Calc max output size - given current output pos and block size */ + size_t in_buf_size, + out_buf_size = TINFL_LZ_DICT_SIZE - + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + + if (!pState->out_blk_remain) { + /* Read more data from file if none available (and reading from file) */ + if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem)) { + /* Calc read size */ + pState->read_buf_avail = + MZ_MIN(pState->read_buf_size, pState->comp_remaining); + if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, + pState->cur_file_ofs, pState->pRead_buf, + (size_t)pState->read_buf_avail) != + pState->read_buf_avail) { + mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED); + pState->status = TINFL_STATUS_FAILED; + break; + } + + /* Advance offsets, dec counters */ + pState->cur_file_ofs += pState->read_buf_avail; + pState->comp_remaining -= pState->read_buf_avail; + pState->read_buf_ofs = 0; + } + + /* Perform decompression */ + in_buf_size = (size_t)pState->read_buf_avail; + pState->status = tinfl_decompress( + &pState->inflator, + (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs, + &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur, + &out_buf_size, + pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0); + pState->read_buf_avail -= in_buf_size; + pState->read_buf_ofs += in_buf_size; + + /* Update current output block size remaining */ + pState->out_blk_remain = out_buf_size; + } + + if (pState->out_blk_remain) { + /* Calc amount to return. */ + size_t to_copy = + MZ_MIN((buf_size - copied_to_caller), pState->out_blk_remain); + + /* Copy data to caller's buffer */ + memcpy((uint8_t *)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy); + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + /* Perform CRC */ + pState->file_crc32 = + (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy); +#endif + + /* Decrement data consumed from block */ + pState->out_blk_remain -= to_copy; + + /* Inc output offset, while performing sanity check */ + if ((pState->out_buf_ofs += to_copy) > + pState->file_stat.m_uncomp_size) { + mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED); + pState->status = TINFL_STATUS_FAILED; + break; + } + + /* Increment counter of data copied to caller */ + copied_to_caller += to_copy; + } + } while ((copied_to_caller < buf_size) && + ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) || + (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT))); + } + + /* Return how many bytes were copied into user buffer */ + return copied_to_caller; +} + +mz_bool +mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState) { + int status; + + /* Argument sanity check */ + if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState)) + return MZ_FALSE; + + /* Was decompression completed and requested? */ + if ((pState->status == TINFL_STATUS_DONE) && + (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size) { + mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + pState->status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (pState->file_crc32 != pState->file_stat.m_crc32) { + mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED); + pState->status = TINFL_STATUS_FAILED; + } +#endif + } + + /* Free buffers */ + if (!pState->pZip->m_pState->m_pMem) + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf); + if (pState->pWrite_buf) + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf); + + /* Save status */ + status = pState->status; + + /* Free context */ + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState); + + return status == TINFL_STATUS_DONE; +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, + const void *pBuf, size_t n) { + (void)ofs; + + return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque); +} + +mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, + const char *pDst_filename, + mz_uint flags) { + mz_bool status; + mz_zip_archive_file_stat file_stat; + MZ_FILE *pFile; + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + if (file_stat.m_is_directory || (!file_stat.m_is_supported)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + pFile = MZ_FOPEN(pDst_filename, "wb"); + if (!pFile) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + status = mz_zip_reader_extract_to_callback( + pZip, file_index, mz_zip_file_write_callback, pFile, flags); + + if (MZ_FCLOSE(pFile) == EOF) { + if (status) + mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); + + status = MZ_FALSE; + } + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO) + if (status) + mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time); +#endif + + return status; +} + +mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, + const char *pArchive_filename, + const char *pDst_filename, + mz_uint flags) { + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, + &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags); +} + +mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, + MZ_FILE *pFile, mz_uint flags) { + mz_zip_archive_file_stat file_stat; + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + if (file_stat.m_is_directory || (!file_stat.m_is_supported)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + return mz_zip_reader_extract_to_callback( + pZip, file_index, mz_zip_file_write_callback, pFile, flags); +} + +mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, + const char *pArchive_filename, + MZ_FILE *pFile, mz_uint flags) { + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, + &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags); +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n) { + mz_uint32 *p = (mz_uint32 *)pOpaque; + (void)file_ofs; + *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n); + return n; +} + +mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, + mz_uint flags) { + mz_zip_archive_file_stat file_stat; + mz_zip_internal_state *pState; + const mz_uint8 *pCentral_dir_header; + mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE; + mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE; + mz_uint32 + local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + mz_uint64 local_header_ofs = 0; + mz_uint32 local_header_filename_len, local_header_extra_len, + local_header_crc32; + mz_uint64 local_header_comp_size, local_header_uncomp_size; + mz_uint32 uncomp_crc32 = MZ_CRC32_INIT; + mz_bool has_data_descriptor; + mz_uint32 local_header_bit_flags; + + mz_zip_array file_data_array; + mz_zip_array_init(&file_data_array, 1); + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || + (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (file_index > pZip->m_total_files) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + pCentral_dir_header = mz_zip_get_cdh(pZip, file_index); + + if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header, + &file_stat, &found_zip64_ext_data_in_cdir)) + return MZ_FALSE; + + /* A directory or zero length file */ + if (file_stat.m_is_directory || (!file_stat.m_uncomp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_is_encrypted) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports stored and deflate. */ + if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + if (!file_stat.m_is_supported) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + /* Read and parse the local directory entry. */ + local_header_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + local_header_filename_len = + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS); + local_header_extra_len = + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + local_header_comp_size = + MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS); + local_header_uncomp_size = + MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS); + local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS); + local_header_bit_flags = + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS); + has_data_descriptor = (local_header_bit_flags & 8) != 0; + + if (local_header_filename_len != strlen(file_stat.m_filename)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + local_header_filename_len + local_header_extra_len + + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (!mz_zip_array_resize( + pZip, &file_data_array, + MZ_MAX(local_header_filename_len, local_header_extra_len), + MZ_FALSE)) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + goto handle_failure; + } + + if (local_header_filename_len) { + if (pZip->m_pRead(pZip->m_pIO_opaque, + local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE, + file_data_array.m_p, + local_header_filename_len) != local_header_filename_len) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + /* I've seen 1 archive that had the same pathname, but used backslashes in + * the local dir and forward slashes in the central dir. Do we care about + * this? For now, this case will fail validation. */ + if (memcmp(file_stat.m_filename, file_data_array.m_p, + local_header_filename_len) != 0) { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } + + if ((local_header_extra_len) && + ((local_header_comp_size == MZ_UINT32_MAX) || + (local_header_uncomp_size == MZ_UINT32_MAX))) { + mz_uint32 extra_size_remaining = local_header_extra_len; + const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p; + + if (pZip->m_pRead(pZip->m_pIO_opaque, + local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + local_header_filename_len, + file_data_array.m_p, + local_header_extra_len) != local_header_extra_len) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + do { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + goto handle_failure; + } + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + goto handle_failure; + } + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { + const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32); + + if (field_data_size < sizeof(mz_uint64) * 2) { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + goto handle_failure; + } + + local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data); + local_header_comp_size = + MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); + + found_zip64_ext_data_in_ldir = MZ_TRUE; + break; + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + } + + /* TODO: parse local header extra data when local_header_comp_size is + * 0xFFFFFFFF! (big_descriptor.zip) */ + /* I've seen zips in the wild with the data descriptor bit set, but proper + * local header values and bogus data descriptors */ + if ((has_data_descriptor) && (!local_header_comp_size) && + (!local_header_crc32)) { + mz_uint8 descriptor_buf[32]; + mz_bool has_id; + const mz_uint8 *pSrc; + mz_uint32 file_crc32; + mz_uint64 comp_size = 0, uncomp_size = 0; + + mz_uint32 num_descriptor_uint32s = + ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4; + + if (pZip->m_pRead(pZip->m_pIO_opaque, + local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + local_header_filename_len + local_header_extra_len + + file_stat.m_comp_size, + descriptor_buf, + sizeof(mz_uint32) * num_descriptor_uint32s) != + (sizeof(mz_uint32) * num_descriptor_uint32s)) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID); + pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf; + + file_crc32 = MZ_READ_LE32(pSrc); + + if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) { + comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32)); + uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64)); + } else { + comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32)); + uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32)); + } + + if ((file_crc32 != file_stat.m_crc32) || + (comp_size != file_stat.m_comp_size) || + (uncomp_size != file_stat.m_uncomp_size)) { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } else { + if ((local_header_crc32 != file_stat.m_crc32) || + (local_header_comp_size != file_stat.m_comp_size) || + (local_header_uncomp_size != file_stat.m_uncomp_size)) { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } + + mz_zip_array_clear(pZip, &file_data_array); + + if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0) { + if (!mz_zip_reader_extract_to_callback( + pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0)) + return MZ_FALSE; + + /* 1 more check to be sure, although the extract checks too. */ + if (uncomp_crc32 != file_stat.m_crc32) { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + return MZ_FALSE; + } + } + + return MZ_TRUE; + +handle_failure: + mz_zip_array_clear(pZip, &file_data_array); + return MZ_FALSE; +} + +mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags) { + mz_zip_internal_state *pState; + uint32_t i; + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || + (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + /* Basic sanity checks */ + if (!pState->m_zip64) { + if (pZip->m_total_files > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (pZip->m_archive_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } else { + if (pZip->m_total_files >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (pState->m_central_dir.m_size >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } + + for (i = 0; i < pZip->m_total_files; i++) { + if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags) { + mz_uint32 found_index; + mz_zip_archive_file_stat stat; + + if (!mz_zip_reader_file_stat(pZip, i, &stat)) + return MZ_FALSE; + + if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0, + &found_index)) + return MZ_FALSE; + + /* This check can fail if there are duplicate filenames in the archive + * (which we don't check for when writing - that's up to the user) */ + if (found_index != i) + return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + } + + if (!mz_zip_validate_file(pZip, i, flags)) + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, + mz_uint flags, mz_zip_error *pErr) { + mz_bool success = MZ_TRUE; + mz_zip_archive zip; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + if ((!pMem) || (!size)) { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + mz_zip_zero_struct(&zip); + + if (!mz_zip_reader_init_mem(&zip, pMem, size, flags)) { + if (pErr) + *pErr = zip.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_validate_archive(&zip, flags)) { + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (!mz_zip_reader_end_internal(&zip, success)) { + if (!actual_err) + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (pErr) + *pErr = actual_err; + + return success; +} + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, + mz_zip_error *pErr) { + mz_bool success = MZ_TRUE; + mz_zip_archive zip; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + if (!pFilename) { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + mz_zip_zero_struct(&zip); + + if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0)) { + if (pErr) + *pErr = zip.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_validate_archive(&zip, flags)) { + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (!mz_zip_reader_end_internal(&zip, success)) { + if (!actual_err) + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (pErr) + *pErr = actual_err; + + return success; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +/* ------------------- .ZIP archive writing */ + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v) { + p[0] = (mz_uint8)v; + p[1] = (mz_uint8)(v >> 8); +} +static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v) { + p[0] = (mz_uint8)v; + p[1] = (mz_uint8)(v >> 8); + p[2] = (mz_uint8)(v >> 16); + p[3] = (mz_uint8)(v >> 24); +} +static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v) { + mz_write_le32(p, (mz_uint32)v); + mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32)); +} + +#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v)) +#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v)) +#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v)) + +static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n) { + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_zip_internal_state *pState = pZip->m_pState; + mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size); + + if (!n) + return 0; + + /* An allocation this big is likely to just fail on 32-bit systems, so don't + * even go there. */ + if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + return 0; + } + + if (new_size > pState->m_mem_capacity) { + void *pNew_block; + size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity); + + while (new_capacity < new_size) + new_capacity *= 2; + + if (NULL == (pNew_block = pZip->m_pRealloc( + pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity))) { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return 0; + } + + pState->m_pMem = pNew_block; + pState->m_mem_capacity = new_capacity; + } + memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n); + pState->m_mem_size = (size_t)new_size; + return n; +} + +static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip, + mz_bool set_last_error) { + mz_zip_internal_state *pState; + mz_bool status = MZ_TRUE; + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || + ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && + (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))) { + if (set_last_error) + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + pState = pZip->m_pState; + pZip->m_pState = NULL; + mz_zip_array_clear(pZip, &pState->m_central_dir); + mz_zip_array_clear(pZip, &pState->m_central_dir_offsets); + mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets); + +#ifndef MINIZ_NO_STDIO + if (pState->m_pFile) { + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) { + if (MZ_FCLOSE(pState->m_pFile) == EOF) { + if (set_last_error) + mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); + status = MZ_FALSE; + } + } + + pState->m_pFile = NULL; + } +#endif /* #ifndef MINIZ_NO_STDIO */ + + if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem); + pState->m_pMem = NULL; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + pZip->m_zip_mode = MZ_ZIP_MODE_INVALID; + return status; +} + +mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, + mz_uint flags) { + mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0; + + if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || + (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) { + if (!pZip->m_pRead) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + if (pZip->m_file_offset_alignment) { + /* Ensure user specified file offset alignment is a power of 2. */ + if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + if (!pZip->m_pAlloc) + pZip->m_pAlloc = miniz_def_alloc_func; + if (!pZip->m_pFree) + pZip->m_pFree = miniz_def_free_func; + if (!pZip->m_pRealloc) + pZip->m_pRealloc = miniz_def_realloc_func; + + pZip->m_archive_size = existing_size; + pZip->m_central_directory_file_ofs = 0; + pZip->m_total_files = 0; + + if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state)); + + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, + sizeof(mz_uint8)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, + sizeof(mz_uint32)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, + sizeof(mz_uint32)); + + pZip->m_pState->m_zip64 = zip64; + pZip->m_pState->m_zip64_has_extended_info_fields = zip64; + + pZip->m_zip_type = MZ_ZIP_TYPE_USER; + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size) { + return mz_zip_writer_init_v2(pZip, existing_size, 0); +} + +mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, + size_t size_to_reserve_at_beginning, + size_t initial_allocation_size, + mz_uint flags) { + pZip->m_pWrite = mz_zip_heap_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_mem_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_HEAP; + + if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, + size_to_reserve_at_beginning))) { + if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, initial_allocation_size))) { + mz_zip_writer_end_internal(pZip, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + pZip->m_pState->m_mem_capacity = initial_allocation_size; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, + size_t size_to_reserve_at_beginning, + size_t initial_allocation_size) { + return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning, + initial_allocation_size, 0); +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n) { + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile); + + file_ofs += pZip->m_pState->m_file_archive_start_ofs; + + if (((mz_int64)file_ofs < 0) || + (((cur_ofs != (mz_int64)file_ofs)) && + (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET)))) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + return 0; + } + + return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile); +} + +mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, + mz_uint64 size_to_reserve_at_beginning) { + return mz_zip_writer_init_file_v2(pZip, pFilename, + size_to_reserve_at_beginning, 0); +} + +mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, + mz_uint64 size_to_reserve_at_beginning, + mz_uint flags) { + MZ_FILE *pFile; + + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags)) + return MZ_FALSE; + + if (NULL == (pFile = MZ_FOPEN( + pFilename, + (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb"))) { + mz_zip_writer_end(pZip); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + } + + pZip->m_pState->m_pFile = pFile; + pZip->m_zip_type = MZ_ZIP_TYPE_FILE; + + if (size_to_reserve_at_beginning) { + mz_uint64 cur_ofs = 0; + char buf[4096]; + + MZ_CLEAR_OBJ(buf); + + do { + size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning); + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n) { + mz_zip_writer_end(pZip); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_ofs += n; + size_to_reserve_at_beginning -= n; + } while (size_to_reserve_at_beginning); + } + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, + mz_uint flags) { + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, 0, flags)) + return MZ_FALSE; + + pZip->m_pState->m_pFile = pFile; + pZip->m_pState->m_file_archive_start_ofs = + MZ_FTELL64(pZip->m_pState->m_pFile); + pZip->m_zip_type = MZ_ZIP_TYPE_CFILE; + + return MZ_TRUE; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, + const char *pFilename, + mz_uint flags) { + mz_zip_internal_state *pState; + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (flags & MZ_ZIP_FLAG_WRITE_ZIP64) { + /* We don't support converting a non-zip64 file to zip64 - this seems like + * more trouble than it's worth. (What about the existing 32-bit data + * descriptors that could follow the compressed data?) */ + if (!pZip->m_pState->m_zip64) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + /* No sense in trying to write to an archive that's already at the support max + * size */ + if (pZip->m_pState->m_zip64) { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + if (pZip->m_total_files == MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + } + + pState = pZip->m_pState; + + if (pState->m_pFile) { +#ifdef MINIZ_NO_STDIO + (void)pFilename; + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); +#else + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) { + if (!pFilename) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Archive is being read from stdio and was originally opened only for + * reading. Try to reopen as writable. */ + if (NULL == + (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile))) { + /* The mz_zip_archive is now in a bogus state because pState->m_pFile is + * NULL, so just close it. */ + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + } + } + + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; +#endif /* #ifdef MINIZ_NO_STDIO */ + } else if (pState->m_pMem) { + /* Archive lives in a memory block. Assume it's from the heap that we can + * resize using the realloc callback. */ + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState->m_mem_capacity = pState->m_mem_size; + pZip->m_pWrite = mz_zip_heap_write_func; + pZip->m_pNeeds_keepalive = NULL; + } + /* Archive is being read via a user provided read function - make sure the + user has specified a write function too. */ + else if (!pZip->m_pWrite) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Start writing new files at the archive's current central directory + * location. */ + /* TODO: We could add a flag that lets the user start writing immediately + * AFTER the existing central dir - this would be safer. */ + pZip->m_archive_size = pZip->m_central_directory_file_ofs; + pZip->m_central_directory_file_ofs = 0; + + /* Clear the sorted central dir offsets, they aren't useful or maintained now. + */ + /* Even though we're now in write mode, files can still be extracted and + * verified, but file locates will be slow. */ + /* TODO: We could easily maintain the sorted central directory offsets. */ + mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets); + + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_from_reader_v2_noreopen(mz_zip_archive *pZip, + const char *pFilename, + mz_uint flags) { + mz_zip_internal_state *pState; + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (flags & MZ_ZIP_FLAG_WRITE_ZIP64) { + /* We don't support converting a non-zip64 file to zip64 - this seems like + * more trouble than it's worth. (What about the existing 32-bit data + * descriptors that could follow the compressed data?) */ + if (!pZip->m_pState->m_zip64) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + /* No sense in trying to write to an archive that's already at the support max + * size */ + if (pZip->m_pState->m_zip64) { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + if (pZip->m_total_files == MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + } + + pState = pZip->m_pState; + + if (pState->m_pFile) { +#ifdef MINIZ_NO_STDIO + (void)pFilename; + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); +#else + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) { + if (!pFilename) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; +#endif /* #ifdef MINIZ_NO_STDIO */ + } else if (pState->m_pMem) { + /* Archive lives in a memory block. Assume it's from the heap that we can + * resize using the realloc callback. */ + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState->m_mem_capacity = pState->m_mem_size; + pZip->m_pWrite = mz_zip_heap_write_func; + pZip->m_pNeeds_keepalive = NULL; + } + /* Archive is being read via a user provided read function - make sure the + user has specified a write function too. */ + else if (!pZip->m_pWrite) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Start writing new files at the archive's current central directory + * location. */ + /* TODO: We could add a flag that lets the user start writing immediately + * AFTER the existing central dir - this would be safer. */ + pZip->m_archive_size = pZip->m_central_directory_file_ofs; + pZip->m_central_directory_file_ofs = 0; + + /* Clear the sorted central dir offsets, they aren't useful or maintained now. + */ + /* Even though we're now in write mode, files can still be extracted and + * verified, but file locates will be slow. */ + /* TODO: We could easily maintain the sorted central directory offsets. */ + mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets); + + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, + const char *pFilename) { + return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0); +} + +/* TODO: pArchive_name is a terrible name here! */ +mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, + const void *pBuf, size_t buf_size, + mz_uint level_and_flags) { + return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, + level_and_flags, 0, 0); +} + +typedef struct { + mz_zip_archive *m_pZip; + mz_uint64 m_cur_archive_file_ofs; + mz_uint64 m_comp_size; +} mz_zip_writer_add_state; + +static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len, + void *pUser) { + mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser; + if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, + pState->m_cur_archive_file_ofs, pBuf, + len) != len) + return MZ_FALSE; + + pState->m_cur_archive_file_ofs += len; + pState->m_comp_size += len; + return MZ_TRUE; +} + +#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE \ + (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2) +#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE \ + (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3) +static mz_uint32 +mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size, + mz_uint64 *pComp_size, + mz_uint64 *pLocal_header_ofs) { + mz_uint8 *pDst = pBuf; + mz_uint32 field_size = 0; + + MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID); + MZ_WRITE_LE16(pDst + 2, 0); + pDst += sizeof(mz_uint16) * 2; + + if (pUncomp_size) { + MZ_WRITE_LE64(pDst, *pUncomp_size); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + if (pComp_size) { + MZ_WRITE_LE64(pDst, *pComp_size); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + if (pLocal_header_ofs) { + MZ_WRITE_LE64(pDst, *pLocal_header_ofs); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + MZ_WRITE_LE16(pBuf + 2, field_size); + + return (mz_uint32)(pDst - pBuf); +} + +static mz_bool mz_zip_writer_create_local_dir_header( + mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, + mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, + mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, + mz_uint16 dos_time, mz_uint16 dos_date) { + (void)pZip; + memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_SIG_OFS, MZ_ZIP_LOCAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_VERSION_NEEDED_OFS, method ? 20 : 0); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_BIT_FLAG_OFS, bit_flags); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_METHOD_OFS, method); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, + MZ_MIN(comp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, + MZ_MIN(uncomp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size); + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_create_central_dir_header( + mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, + mz_uint16 extra_size, mz_uint16 comment_size, mz_uint64 uncomp_size, + mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, + mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date, + mz_uint64 local_header_ofs, mz_uint32 ext_attributes) { + (void)pZip; + memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, + MZ_MIN(comp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, + MZ_MIN(uncomp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, + MZ_MIN(local_header_ofs, MZ_UINT32_MAX)); + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_add_to_central_dir( + mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size, + const void *pExtra, mz_uint16 extra_size, const void *pComment, + mz_uint16 comment_size, mz_uint64 uncomp_size, mz_uint64 comp_size, + mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, + mz_uint16 dos_time, mz_uint16 dos_date, mz_uint64 local_header_ofs, + mz_uint32 ext_attributes, const char *user_extra_data, + mz_uint user_extra_data_len) { + mz_zip_internal_state *pState = pZip->m_pState; + mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size; + size_t orig_central_dir_size = pState->m_central_dir.m_size; + mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE]; + + if (!pZip->m_pState->m_zip64) { + if (local_header_ofs > 0xFFFFFFFF) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + } + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + + user_extra_data_len + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!mz_zip_writer_create_central_dir_header( + pZip, central_dir_header, filename_size, + (mz_uint16)(extra_size + user_extra_data_len), comment_size, + uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, + dos_date, local_header_ofs, ext_attributes)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, + filename_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, + extra_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data, + user_extra_data_len)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, + comment_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, + ¢ral_dir_ofs, 1))) { + /* Try to resize the central directory array back into its original state. + */ + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name) { + /* Basic ZIP archive filename validity checks: Valid filenames cannot start + * with a forward slash, cannot contain a drive letter, and cannot use + * DOS-style backward slashes. */ + if (*pArchive_name == '/') + return MZ_FALSE; + + /* Making sure the name does not contain drive letters or DOS style backward + * slashes is the responsibility of the program using miniz*/ + + return MZ_TRUE; +} + +static mz_uint +mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip) { + mz_uint32 n; + if (!pZip->m_file_offset_alignment) + return 0; + n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1)); + return (mz_uint)((pZip->m_file_offset_alignment - n) & + (pZip->m_file_offset_alignment - 1)); +} + +static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, + mz_uint64 cur_file_ofs, mz_uint32 n) { + char buf[4096]; + memset(buf, 0, MZ_MIN(sizeof(buf), n)); + while (n) { + mz_uint32 s = MZ_MIN(sizeof(buf), n); + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_file_ofs += s; + n -= s; + } + return MZ_TRUE; +} + +mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, + const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, + mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint64 uncomp_size, + mz_uint32 uncomp_crc32) { + return mz_zip_writer_add_mem_ex_v2( + pZip, pArchive_name, pBuf, buf_size, pComment, comment_size, + level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0); +} + +mz_bool mz_zip_writer_add_mem_ex_v2( + mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, + MZ_TIME_T *last_modified, const char *user_extra_data, + mz_uint user_extra_data_len, const char *user_extra_data_central, + mz_uint user_extra_data_central_len) { + mz_uint16 method = 0, dos_time = 0, dos_date = 0; + mz_uint level, ext_attributes = 0, num_alignment_padding_bytes; + mz_uint64 local_dir_header_ofs = 0, cur_archive_file_ofs = 0, comp_size = 0; + size_t archive_name_size; + mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE]; + tdefl_compressor *pComp = NULL; + mz_bool store_data_uncompressed; + mz_zip_internal_state *pState; + mz_uint8 *pExtra_data = NULL; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_uint16 bit_flags = 0; + + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + + if (uncomp_size || + (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) + bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR; + + if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) + bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; + + level = level_and_flags & 0xF; + store_data_uncompressed = + ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)); + + if ((!pZip) || (!pZip->m_pState) || + (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) || + (!pArchive_name) || ((comment_size) && (!pComment)) || + (level > MZ_UBER_COMPRESSION)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + local_dir_header_ofs = pZip->m_archive_size; + cur_archive_file_ofs = pZip->m_archive_size; + + if (pState->m_zip64) { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + if (pZip->m_total_files == MZ_UINT16_MAX) { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */ + } + if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF)) { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + + if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + +#ifndef MINIZ_NO_TIME + if (last_modified != NULL) { + mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date); + } else { + MZ_TIME_T cur_time; + time(&cur_time); + mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date); + } +#endif /* #ifndef MINIZ_NO_TIME */ + + if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) { + uncomp_crc32 = + (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, buf_size); + uncomp_size = buf_size; + if (uncomp_size <= 3) { + level = 0; + store_data_uncompressed = MZ_TRUE; + } + } + + archive_name_size = strlen(pArchive_name); + if (archive_name_size > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + num_alignment_padding_bytes = + mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!pState->m_zip64) { + /* Bail early if the archive would obviously become too large */ + if ((pZip->m_archive_size + num_alignment_padding_bytes + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + + user_extra_data_len + pState->m_central_dir.m_size + + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len + + MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF) { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + + if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/')) { + /* Set DOS Subdirectory attribute bit. */ + ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG; + + /* Subdirectories cannot contain data. */ + if ((buf_size) || (uncomp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + /* Try to do any allocations before writing to the archive, so if an + * allocation fails the file remains unmodified. (A good idea if we're doing + * an in-place modification.) */ + if ((!mz_zip_array_ensure_room( + pZip, &pState->m_central_dir, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + + (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) || + (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if ((!store_data_uncompressed) && (buf_size)) { + if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, + num_alignment_padding_bytes)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return MZ_FALSE; + } + + local_dir_header_ofs += num_alignment_padding_bytes; + if (pZip->m_file_offset_alignment) { + MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == + 0); + } + cur_archive_file_ofs += num_alignment_padding_bytes; + + MZ_CLEAR_OBJ(local_dir_header); + + if (!store_data_uncompressed || + (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) { + method = MZ_DEFLATED; + } + + if (pState->m_zip64) { + if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) { + pExtra_data = extra_data; + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs + : NULL); + } + + if (!mz_zip_writer_create_local_dir_header( + pZip, local_dir_header, (mz_uint16)archive_name_size, + (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, + bit_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, + local_dir_header, + sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, + archive_name_size) != archive_name_size) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_archive_file_ofs += archive_name_size; + + if (pExtra_data != NULL) { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, + extra_size) != extra_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += extra_size; + } + } else { + if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + if (!mz_zip_writer_create_local_dir_header( + pZip, local_dir_header, (mz_uint16)archive_name_size, + (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags, + dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, + local_dir_header, + sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, + archive_name_size) != archive_name_size) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_archive_file_ofs += archive_name_size; + } + + if (user_extra_data_len > 0) { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + user_extra_data, + user_extra_data_len) != user_extra_data_len) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += user_extra_data_len; + } + + if (store_data_uncompressed) { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf, + buf_size) != buf_size) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += buf_size; + comp_size = buf_size; + } else if (buf_size) { + mz_zip_writer_add_state state; + + state.m_pZip = pZip; + state.m_cur_archive_file_ofs = cur_archive_file_ofs; + state.m_comp_size = 0; + + if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, + tdefl_create_comp_flags_from_zip_params( + level, -15, MZ_DEFAULT_STRATEGY)) != + TDEFL_STATUS_OKAY) || + (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != + TDEFL_STATUS_DONE)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED); + } + + comp_size = state.m_comp_size; + cur_archive_file_ofs = state.m_cur_archive_file_ofs; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + pComp = NULL; + + if (uncomp_size) { + mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64]; + mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32; + + MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR); + + MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID); + MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32); + if (pExtra_data == NULL) { + if (comp_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(local_dir_footer + 8, comp_size); + MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size); + } else { + MZ_WRITE_LE64(local_dir_footer + 8, comp_size); + MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size); + local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64; + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + local_dir_footer, + local_dir_footer_size) != local_dir_footer_size) + return MZ_FALSE; + + cur_archive_file_ofs += local_dir_footer_size; + } + + if (pExtra_data != NULL) { + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_add_to_central_dir( + pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, + (mz_uint16)extra_size, pComment, comment_size, uncomp_size, comp_size, + uncomp_crc32, method, bit_flags, dos_time, dos_date, + local_dir_header_ofs, ext_attributes, user_extra_data_central, + user_extra_data_central_len)) + return MZ_FALSE; + + pZip->m_total_files++; + pZip->m_archive_size = cur_archive_file_ofs; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_add_read_buf_callback( + mz_zip_archive *pZip, const char *pArchive_name, + mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size, + const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint32 ext_attributes, + const char *user_extra_data, mz_uint user_extra_data_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len) { + mz_uint16 gen_flags = (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) + ? 0 + : MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR; + mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes; + mz_uint16 method = 0, dos_time = 0, dos_date = 0; + mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = 0, uncomp_size = 0, + comp_size = 0; + size_t archive_name_size; + mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE]; + mz_uint8 *pExtra_data = NULL; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_zip_internal_state *pState; + mz_uint64 file_ofs = 0, cur_archive_header_file_ofs; + + if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) + gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; + + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + level = level_and_flags & 0xF; + + /* Sanity checks */ + if ((!pZip) || (!pZip->m_pState) || + (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || + ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + cur_archive_file_ofs = pZip->m_archive_size; + + if ((!pState->m_zip64) && (max_size > MZ_UINT32_MAX)) { + /* Source file is too large for non-zip64 */ + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + pState->m_zip64 = MZ_TRUE; + } + + /* We could support this, but why? */ + if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + if (pState->m_zip64) { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + if (pZip->m_total_files == MZ_UINT16_MAX) { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */ + } + } + + archive_name_size = strlen(pArchive_name); + if (archive_name_size > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + num_alignment_padding_bytes = + mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!pState->m_zip64) { + /* Bail early if the archive would obviously become too large */ + if ((pZip->m_archive_size + num_alignment_padding_bytes + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + + user_extra_data_len + pState->m_central_dir.m_size + + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024 + + MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > + 0xFFFFFFFF) { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + +#ifndef MINIZ_NO_TIME + if (pFile_time) { + mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date); + } +#endif + + if (max_size <= 3) + level = 0; + + if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, + num_alignment_padding_bytes)) { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += num_alignment_padding_bytes; + local_dir_header_ofs = cur_archive_file_ofs; + + if (pZip->m_file_offset_alignment) { + MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) == + 0); + } + + if (max_size && level) { + method = MZ_DEFLATED; + } + + MZ_CLEAR_OBJ(local_dir_header); + if (pState->m_zip64) { + if (max_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) { + pExtra_data = extra_data; + if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs + : NULL); + else + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, NULL, NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs + : NULL); + } + + if (!mz_zip_writer_create_local_dir_header( + pZip, local_dir_header, (mz_uint16)archive_name_size, + (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, + gen_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + local_dir_header, + sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, + archive_name_size) != archive_name_size) { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += archive_name_size; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, + extra_size) != extra_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += extra_size; + } else { + if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + if (!mz_zip_writer_create_local_dir_header( + pZip, local_dir_header, (mz_uint16)archive_name_size, + (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags, + dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + local_dir_header, + sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, + archive_name_size) != archive_name_size) { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += archive_name_size; + } + + if (user_extra_data_len > 0) { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + user_extra_data, + user_extra_data_len) != user_extra_data_len) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += user_extra_data_len; + } + + if (max_size) { + void *pRead_buf = + pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE); + if (!pRead_buf) { + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!level) { + while (1) { + size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, + MZ_ZIP_MAX_IO_BUF_SIZE); + if (n == 0) + break; + + if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, + n) != n) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + file_ofs += n; + uncomp_crc32 = + (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n); + cur_archive_file_ofs += n; + } + uncomp_size = file_ofs; + comp_size = uncomp_size; + } else { + mz_bool result = MZ_FALSE; + mz_zip_writer_add_state state; + tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor)); + if (!pComp) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + state.m_pZip = pZip; + state.m_cur_archive_file_ofs = cur_archive_file_ofs; + state.m_comp_size = 0; + + if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, + tdefl_create_comp_flags_from_zip_params( + level, -15, MZ_DEFAULT_STRATEGY)) != + TDEFL_STATUS_OKAY) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + } + + for (;;) { + tdefl_status status; + tdefl_flush flush = TDEFL_NO_FLUSH; + + size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, + MZ_ZIP_MAX_IO_BUF_SIZE); + if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size)) { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + break; + } + + file_ofs += n; + uncomp_crc32 = + (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n); + + if (pZip->m_pNeeds_keepalive != NULL && + pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque)) + flush = TDEFL_FULL_FLUSH; + + if (n == 0) + flush = TDEFL_FINISH; + + status = tdefl_compress_buffer(pComp, pRead_buf, n, flush); + if (status == TDEFL_STATUS_DONE) { + result = MZ_TRUE; + break; + } else if (status != TDEFL_STATUS_OKAY) { + mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED); + break; + } + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + + if (!result) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return MZ_FALSE; + } + + uncomp_size = file_ofs; + comp_size = state.m_comp_size; + cur_archive_file_ofs = state.m_cur_archive_file_ofs; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + } + + if (!(level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)) { + mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64]; + mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32; + + MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID); + MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32); + if (pExtra_data == NULL) { + if (comp_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(local_dir_footer + 8, comp_size); + MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size); + } else { + MZ_WRITE_LE64(local_dir_footer + 8, comp_size); + MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size); + local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64; + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, + local_dir_footer, + local_dir_footer_size) != local_dir_footer_size) + return MZ_FALSE; + + cur_archive_file_ofs += local_dir_footer_size; + } + + if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) { + if (pExtra_data != NULL) { + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs + : NULL); + } + + if (!mz_zip_writer_create_local_dir_header( + pZip, local_dir_header, (mz_uint16)archive_name_size, + (mz_uint16)(extra_size + user_extra_data_len), + (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size, + (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size, + uncomp_crc32, method, gen_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + cur_archive_header_file_ofs = local_dir_header_ofs; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, + local_dir_header, + sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + if (pExtra_data != NULL) { + cur_archive_header_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, + pArchive_name, + archive_name_size) != archive_name_size) { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_header_file_ofs += archive_name_size; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, + extra_data, extra_size) != extra_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_header_file_ofs += extra_size; + } + } + + if (pExtra_data != NULL) { + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_add_to_central_dir( + pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, + (mz_uint16)extra_size, pComment, comment_size, uncomp_size, comp_size, + uncomp_crc32, method, gen_flags, dos_time, dos_date, + local_dir_header_ofs, ext_attributes, user_extra_data_central, + user_extra_data_central_len)) + return MZ_FALSE; + + pZip->m_total_files++; + pZip->m_archive_size = cur_archive_file_ofs; + + return MZ_TRUE; +} + +#ifndef MINIZ_NO_STDIO + +static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n) { + MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pSrc_file); + + if (((mz_int64)file_ofs < 0) || + (((cur_ofs != (mz_int64)file_ofs)) && + (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET)))) + return 0; + + return MZ_FREAD(pBuf, 1, n, pSrc_file); +} + +mz_bool mz_zip_writer_add_cfile( + mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, + mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, + mz_uint16 comment_size, mz_uint level_and_flags, mz_uint32 ext_attributes, + const char *user_extra_data, mz_uint user_extra_data_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len) { + return mz_zip_writer_add_read_buf_callback( + pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, max_size, + pFile_time, pComment, comment_size, level_and_flags, ext_attributes, + user_extra_data, user_extra_data_len, user_extra_data_central, + user_extra_data_central_len); +} + +mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, + const char *pSrc_filename, const void *pComment, + mz_uint16 comment_size, mz_uint level_and_flags, + mz_uint32 ext_attributes) { + MZ_FILE *pSrc_file = NULL; + mz_uint64 uncomp_size = 0; + MZ_TIME_T file_modified_time; + MZ_TIME_T *pFile_time = NULL; + mz_bool status; + + memset(&file_modified_time, 0, sizeof(file_modified_time)); + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO) + pFile_time = &file_modified_time; + if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED); +#endif + + pSrc_file = MZ_FOPEN(pSrc_filename, "rb"); + if (!pSrc_file) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + MZ_FSEEK64(pSrc_file, 0, SEEK_END); + uncomp_size = MZ_FTELL64(pSrc_file); + MZ_FSEEK64(pSrc_file, 0, SEEK_SET); + + status = mz_zip_writer_add_cfile( + pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, + comment_size, level_and_flags, ext_attributes, NULL, 0, NULL, 0); + + MZ_FCLOSE(pSrc_file); + + return status; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +static mz_bool mz_zip_writer_update_zip64_extension_block( + mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt, + uint32_t ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size, + mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start) { + /* + 64 should be enough for any new zip64 data */ + if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE); + + if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start)) { + mz_uint8 new_ext_block[64]; + mz_uint8 *pDst = new_ext_block; + mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID); + mz_write_le16(pDst + sizeof(mz_uint16), 0); + pDst += sizeof(mz_uint16) * 2; + + if (pUncomp_size) { + mz_write_le64(pDst, *pUncomp_size); + pDst += sizeof(mz_uint64); + } + + if (pComp_size) { + mz_write_le64(pDst, *pComp_size); + pDst += sizeof(mz_uint64); + } + + if (pLocal_header_ofs) { + mz_write_le64(pDst, *pLocal_header_ofs); + pDst += sizeof(mz_uint64); + } + + if (pDisk_start) { + mz_write_le32(pDst, *pDisk_start); + pDst += sizeof(mz_uint32); + } + + mz_write_le16(new_ext_block + sizeof(mz_uint16), + (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2)); + + if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block, + pDst - new_ext_block)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if ((pExt) && (ext_len)) { + mz_uint32 extra_size_remaining = ext_len; + const mz_uint8 *pExtra_data = pExt; + + do { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { + if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data, + field_total_size)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + } + + return MZ_TRUE; +} + +/* TODO: This func is now pretty freakin complex due to zip64, split it up? */ +mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, + mz_zip_archive *pSource_zip, + mz_uint src_file_index) { + mz_uint n, bit_flags, num_alignment_padding_bytes, + src_central_dir_following_data_size; + mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs; + mz_uint64 cur_src_file_ofs, cur_dst_file_ofs; + mz_uint32 + local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / + sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE]; + size_t orig_central_dir_size; + mz_zip_internal_state *pState; + void *pBuf; + const mz_uint8 *pSrc_central_header; + mz_zip_archive_file_stat src_file_stat; + mz_uint32 src_filename_len, src_comment_len, src_ext_len; + mz_uint32 local_header_filename_size, local_header_extra_len; + mz_uint64 local_header_comp_size, local_header_uncomp_size; + mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE; + + /* Sanity checks */ + if ((!pZip) || (!pZip->m_pState) || + (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + /* Don't support copying files from zip64 archives to non-zip64, even though + * in some cases this is possible */ + if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Get pointer to the source central dir header and crack it */ + if (NULL == + (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index))) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) != + MZ_ZIP_CENTRAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + src_filename_len = + MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS); + src_comment_len = + MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS); + src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS); + src_central_dir_following_data_size = + src_filename_len + src_ext_len + src_comment_len; + + /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32 + * fudge factor in case we need to add more extra data) */ + if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + num_alignment_padding_bytes = + mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + if (!pState->m_zip64) { + if (pZip->m_total_files == MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + /* TODO: Our zip64 support still has some 32-bit limits that may not be + * worth fixing. */ + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + + if (!mz_zip_file_stat_internal(pSource_zip, src_file_index, + pSrc_central_header, &src_file_stat, NULL)) + return MZ_FALSE; + + cur_src_file_ofs = src_file_stat.m_local_header_ofs; + cur_dst_file_ofs = pZip->m_archive_size; + + /* Read the source archive's local dir header */ + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, + pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE; + + /* Compute the total size we need to copy (filename+extra data+compressed + * data) */ + local_header_filename_size = + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS); + local_header_extra_len = + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + local_header_comp_size = + MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS); + local_header_uncomp_size = + MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS); + src_archive_bytes_remaining = local_header_filename_size + + local_header_extra_len + + src_file_stat.m_comp_size; + + /* Try to find a zip64 extended information field */ + if ((local_header_extra_len) && + ((local_header_comp_size == MZ_UINT32_MAX) || + (local_header_uncomp_size == MZ_UINT32_MAX))) { + mz_zip_array file_data_array; + const mz_uint8 *pExtra_data; + mz_uint32 extra_size_remaining = local_header_extra_len; + + mz_zip_array_init(&file_data_array, 1); + if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len, + MZ_FALSE)) { + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, + src_file_stat.m_local_header_ofs + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + + local_header_filename_size, + file_data_array.m_p, local_header_extra_len) != + local_header_extra_len) { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + pExtra_data = (const mz_uint8 *)file_data_array.m_p; + + do { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { + const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32); + + if (field_data_size < sizeof(mz_uint64) * 2) { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data); + local_header_comp_size = MZ_READ_LE64( + pSrc_field_data + + sizeof(mz_uint64)); /* may be 0 if there's a descriptor */ + + found_zip64_ext_data_in_ldir = MZ_TRUE; + break; + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + + mz_zip_array_clear(pZip, &file_data_array); + } + + if (!pState->m_zip64) { + /* Try to detect if the new archive will most likely wind up too big and + * bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which + * could be present, +64 is a fudge factor). */ + /* We also check when the archive is finalized so this doesn't need to be + * perfect. */ + mz_uint64 approx_new_archive_size = + cur_dst_file_ofs + num_alignment_padding_bytes + + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining + + (sizeof(mz_uint32) * 4) + pState->m_central_dir.m_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64; + + if (approx_new_archive_size >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } + + /* Write dest archive padding */ + if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, + num_alignment_padding_bytes)) + return MZ_FALSE; + + cur_dst_file_ofs += num_alignment_padding_bytes; + + local_dir_header_ofs = cur_dst_file_ofs; + if (pZip->m_file_offset_alignment) { + MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == + 0); + } + + /* The original zip's local header+ext block doesn't change, even with zip64, + * so we can just copy it over to the dest zip */ + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE; + + /* Copy over the source archive bytes to the dest archive, also ensure we have + * enough buf space to handle optional data descriptor */ + if (NULL == (pBuf = pZip->m_pAlloc( + pZip->m_pAlloc_opaque, 1, + (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, + src_archive_bytes_remaining))))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + while (src_archive_bytes_remaining) { + n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, + src_archive_bytes_remaining); + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, + n) != n) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + cur_src_file_ofs += n; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_dst_file_ofs += n; + + src_archive_bytes_remaining -= n; + } + + /* Now deal with the optional data descriptor */ + bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS); + if (bit_flags & 8) { + /* Copy data descriptor */ + if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir)) { + /* src is zip64, dest must be zip64 */ + + /* name uint32_t's */ + /* id 1 (optional in zip64?) */ + /* crc 1 */ + /* comp_size 2 */ + /* uncomp_size 2 */ + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, + pBuf, (sizeof(mz_uint32) * 6)) != + (sizeof(mz_uint32) * 6)) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + n = sizeof(mz_uint32) * + ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5); + } else { + /* src is NOT zip64 */ + mz_bool has_id; + + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, + pBuf, sizeof(mz_uint32) * 4) != + sizeof(mz_uint32) * 4) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID); + + if (pZip->m_pState->m_zip64) { + /* dest is zip64, so upgrade the data descriptor */ + const mz_uint32 *pSrc_descriptor = + (const mz_uint32 *)((const mz_uint8 *)pBuf + + (has_id ? sizeof(mz_uint32) : 0)); + const mz_uint32 src_crc32 = pSrc_descriptor[0]; + const mz_uint64 src_comp_size = pSrc_descriptor[1]; + const mz_uint64 src_uncomp_size = pSrc_descriptor[2]; + + mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID); + mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32); + mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size); + mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4, + src_uncomp_size); + + n = sizeof(mz_uint32) * 6; + } else { + /* dest is NOT zip64, just copy it as-is */ + n = sizeof(mz_uint32) * (has_id ? 4 : 3); + } + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_src_file_ofs += n; + cur_dst_file_ofs += n; + } + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + + /* Finally, add the new central dir header */ + orig_central_dir_size = pState->m_central_dir.m_size; + + memcpy(new_central_header, pSrc_central_header, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE); + + if (pState->m_zip64) { + /* This is the painful part: We need to write a new central dir header + ext + * block with updated zip64 fields, and ensure the old fields (if any) are + * not included. */ + const mz_uint8 *pSrc_ext = + pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len; + mz_zip_array new_ext_block; + + mz_zip_array_init(&new_ext_block, sizeof(mz_uint8)); + + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, + MZ_UINT32_MAX); + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, + MZ_UINT32_MAX); + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, + MZ_UINT32_MAX); + + if (!mz_zip_writer_update_zip64_extension_block( + &new_ext_block, pZip, pSrc_ext, src_ext_len, + &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size, + &local_dir_header_ofs, NULL)) { + mz_zip_array_clear(pZip, &new_ext_block); + return MZ_FALSE; + } + + MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS, + new_ext_block.m_size); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, + new_central_header, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) { + mz_zip_array_clear(pZip, &new_ext_block); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, + pSrc_central_header + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, + src_filename_len)) { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p, + new_ext_block.m_size)) { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, + pSrc_central_header + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + src_filename_len + src_ext_len, + src_comment_len)) { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + mz_zip_array_clear(pZip, &new_ext_block); + } else { + /* sanity checks */ + if (cur_dst_file_ofs > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (local_dir_header_ofs >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, + local_dir_header_ofs); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, + new_central_header, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, + pSrc_central_header + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, + src_central_dir_following_data_size)) { + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + } + + /* This shouldn't trigger unless we screwed up during the initial sanity + * checks */ + if (pState->m_central_dir.m_size >= MZ_UINT32_MAX) { + /* TODO: Support central dirs >= 32-bits in size */ + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + } + + n = (mz_uint32)orig_central_dir_size; + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1)) { + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, + MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + pZip->m_total_files++; + pZip->m_archive_size = cur_dst_file_ofs; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip) { + mz_zip_internal_state *pState; + mz_uint64 central_dir_ofs, central_dir_size; + mz_uint8 hdr[256]; + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + if (pState->m_zip64) { + if ((pZip->m_total_files > MZ_UINT32_MAX) || + (pState->m_central_dir.m_size >= MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } else { + if ((pZip->m_total_files > MZ_UINT16_MAX) || + ((pZip->m_archive_size + pState->m_central_dir.m_size + + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + + central_dir_ofs = 0; + central_dir_size = 0; + if (pZip->m_total_files) { + /* Write central directory */ + central_dir_ofs = pZip->m_archive_size; + central_dir_size = pState->m_central_dir.m_size; + pZip->m_central_directory_file_ofs = central_dir_ofs; + if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs, + pState->m_central_dir.m_p, + (size_t)central_dir_size) != central_dir_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += central_dir_size; + } + + if (pState->m_zip64) { + /* Write zip64 end of central directory header */ + mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size; + + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) - + sizeof(mz_uint64)); + MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS, + 0x031E); /* TODO: always Unix */ + MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, + pZip->m_total_files); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS, + pZip->m_total_files); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs); + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) != + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE; + + /* Write zip64 end of central directory locator */ + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS, + rel_ofs_to_zip64_ecdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1); + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) != + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE; + } + + /* Write end of central directory record */ + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, + MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files)); + MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, + MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files)); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, + MZ_MIN(MZ_UINT32_MAX, central_dir_size)); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, + MZ_MIN(MZ_UINT32_MAX, central_dir_ofs)); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + +#ifndef MINIZ_NO_STDIO + if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); +#endif /* #ifndef MINIZ_NO_STDIO */ + + pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE; + + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED; + return MZ_TRUE; +} + +mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, + size_t *pSize) { + if ((!ppBuf) || (!pSize)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + *ppBuf = NULL; + *pSize = 0; + + if ((!pZip) || (!pZip->m_pState)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (pZip->m_pWrite != mz_zip_heap_write_func) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_finalize_archive(pZip)) + return MZ_FALSE; + + *ppBuf = pZip->m_pState->m_pMem; + *pSize = pZip->m_pState->m_mem_size; + pZip->m_pState->m_pMem = NULL; + pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_end(mz_zip_archive *pZip) { + return mz_zip_writer_end_internal(pZip, MZ_TRUE); +} + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_add_mem_to_archive_file_in_place( + const char *pZip_filename, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags) { + return mz_zip_add_mem_to_archive_file_in_place_v2( + pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size, + level_and_flags, NULL); +} + +mz_bool mz_zip_add_mem_to_archive_file_in_place_v2( + const char *pZip_filename, const char *pArchive_name, const void *pBuf, + size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_zip_error *pErr) { + mz_bool status, created_new_archive = MZ_FALSE; + mz_zip_archive zip_archive; + struct MZ_FILE_STAT_STRUCT file_stat; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + mz_zip_zero_struct(&zip_archive); + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + + if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || + ((comment_size) && (!pComment)) || + ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION)) { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) { + if (pErr) + *pErr = MZ_ZIP_INVALID_FILENAME; + return MZ_FALSE; + } + + /* Important: The regular non-64 bit version of stat() can fail here if the + * file is very large, which could cause the archive to be overwritten. */ + /* So be sure to compile with _LARGEFILE64_SOURCE 1 */ + if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0) { + /* Create a new archive. */ + if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0, + level_and_flags)) { + if (pErr) + *pErr = zip_archive.m_last_error; + return MZ_FALSE; + } + + created_new_archive = MZ_TRUE; + } else { + /* Append to an existing archive. */ + if (!mz_zip_reader_init_file_v2( + &zip_archive, pZip_filename, + level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, + 0)) { + if (pErr) + *pErr = zip_archive.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename, + level_and_flags)) { + if (pErr) + *pErr = zip_archive.m_last_error; + + mz_zip_reader_end_internal(&zip_archive, MZ_FALSE); + + return MZ_FALSE; + } + } + + status = + mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, + pComment, comment_size, level_and_flags, 0, 0); + actual_err = zip_archive.m_last_error; + + /* Always finalize, even if adding failed for some reason, so we have a valid + * central directory. (This may not always succeed, but we can try.) */ + if (!mz_zip_writer_finalize_archive(&zip_archive)) { + if (!actual_err) + actual_err = zip_archive.m_last_error; + + status = MZ_FALSE; + } + + if (!mz_zip_writer_end_internal(&zip_archive, status)) { + if (!actual_err) + actual_err = zip_archive.m_last_error; + + status = MZ_FALSE; + } + + if ((!status) && (created_new_archive)) { + /* It's a new archive and something went wrong, so just delete it. */ + int ignoredStatus = MZ_DELETE_FILE(pZip_filename); + (void)ignoredStatus; + } + + if (pErr) + *pErr = actual_err; + + return status; +} + +void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, + const char *pArchive_name, + const char *pComment, + size_t *pSize, mz_uint flags, + mz_zip_error *pErr) { + mz_uint32 file_index; + mz_zip_archive zip_archive; + void *p = NULL; + + if (pSize) + *pSize = 0; + + if ((!pZip_filename) || (!pArchive_name)) { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + + return NULL; + } + + mz_zip_zero_struct(&zip_archive); + if (!mz_zip_reader_init_file_v2( + &zip_archive, pZip_filename, + flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) { + if (pErr) + *pErr = zip_archive.m_last_error; + + return NULL; + } + + if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags, + &file_index)) { + p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags); + } + + mz_zip_reader_end_internal(&zip_archive, p != NULL); + + if (pErr) + *pErr = zip_archive.m_last_error; + + return p; +} + +void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, + const char *pArchive_name, + size_t *pSize, mz_uint flags) { + return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name, + NULL, pSize, flags, NULL); +} + +#endif /* #ifndef MINIZ_NO_STDIO */ + +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */ + +/* ------------------- Misc utils */ + +mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip) { + return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID; +} + +mz_zip_type mz_zip_get_type(mz_zip_archive *pZip) { + return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID; +} + +mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num) { + mz_zip_error prev_err; + + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + prev_err = pZip->m_last_error; + + pZip->m_last_error = err_num; + return prev_err; +} + +mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip) { + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + return pZip->m_last_error; +} + +mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip) { + return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR); +} + +mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip) { + mz_zip_error prev_err; + + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + prev_err = pZip->m_last_error; + + pZip->m_last_error = MZ_ZIP_NO_ERROR; + return prev_err; +} + +const char *mz_zip_get_error_string(mz_zip_error mz_err) { + switch (mz_err) { + case MZ_ZIP_NO_ERROR: + return "no error"; + case MZ_ZIP_UNDEFINED_ERROR: + return "undefined error"; + case MZ_ZIP_TOO_MANY_FILES: + return "too many files"; + case MZ_ZIP_FILE_TOO_LARGE: + return "file too large"; + case MZ_ZIP_UNSUPPORTED_METHOD: + return "unsupported method"; + case MZ_ZIP_UNSUPPORTED_ENCRYPTION: + return "unsupported encryption"; + case MZ_ZIP_UNSUPPORTED_FEATURE: + return "unsupported feature"; + case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR: + return "failed finding central directory"; + case MZ_ZIP_NOT_AN_ARCHIVE: + return "not a ZIP archive"; + case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED: + return "invalid header or archive is corrupted"; + case MZ_ZIP_UNSUPPORTED_MULTIDISK: + return "unsupported multidisk archive"; + case MZ_ZIP_DECOMPRESSION_FAILED: + return "decompression failed or archive is corrupted"; + case MZ_ZIP_COMPRESSION_FAILED: + return "compression failed"; + case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE: + return "unexpected decompressed size"; + case MZ_ZIP_CRC_CHECK_FAILED: + return "CRC-32 check failed"; + case MZ_ZIP_UNSUPPORTED_CDIR_SIZE: + return "unsupported central directory size"; + case MZ_ZIP_ALLOC_FAILED: + return "allocation failed"; + case MZ_ZIP_FILE_OPEN_FAILED: + return "file open failed"; + case MZ_ZIP_FILE_CREATE_FAILED: + return "file create failed"; + case MZ_ZIP_FILE_WRITE_FAILED: + return "file write failed"; + case MZ_ZIP_FILE_READ_FAILED: + return "file read failed"; + case MZ_ZIP_FILE_CLOSE_FAILED: + return "file close failed"; + case MZ_ZIP_FILE_SEEK_FAILED: + return "file seek failed"; + case MZ_ZIP_FILE_STAT_FAILED: + return "file stat failed"; + case MZ_ZIP_INVALID_PARAMETER: + return "invalid parameter"; + case MZ_ZIP_INVALID_FILENAME: + return "invalid filename"; + case MZ_ZIP_BUF_TOO_SMALL: + return "buffer too small"; + case MZ_ZIP_INTERNAL_ERROR: + return "internal error"; + case MZ_ZIP_FILE_NOT_FOUND: + return "file not found"; + case MZ_ZIP_ARCHIVE_TOO_LARGE: + return "archive is too large"; + case MZ_ZIP_VALIDATION_FAILED: + return "validation failed"; + case MZ_ZIP_WRITE_CALLBACK_FAILED: + return "write callback failed"; + case MZ_ZIP_TOTAL_ERRORS: + return "total errors"; + default: + break; + } + + return "unknown error"; +} + +/* Note: Just because the archive is not zip64 doesn't necessarily mean it + * doesn't have Zip64 extended information extra field, argh. */ +mz_bool mz_zip_is_zip64(mz_zip_archive *pZip) { + if ((!pZip) || (!pZip->m_pState)) + return MZ_FALSE; + + return pZip->m_pState->m_zip64; +} + +size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip) { + if ((!pZip) || (!pZip->m_pState)) + return 0; + + return pZip->m_pState->m_central_dir.m_size; +} + +mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip) { + return pZip ? pZip->m_total_files : 0; +} + +mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip) { + if (!pZip) + return 0; + return pZip->m_archive_size; +} + +mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip) { + if ((!pZip) || (!pZip->m_pState)) + return 0; + return pZip->m_pState->m_file_archive_start_ofs; +} + +MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip) { + if ((!pZip) || (!pZip->m_pState)) + return 0; + return pZip->m_pState->m_pFile; +} + +size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, + void *pBuf, size_t n) { + if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n); +} + +mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, + char *pFilename, mz_uint filename_buf_size) { + mz_uint n; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) { + if (filename_buf_size) + pFilename[0] = '\0'; + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return 0; + } + n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + if (filename_buf_size) { + n = MZ_MIN(n, filename_buf_size - 1); + memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n); + pFilename[n] = '\0'; + } + return n + 1; +} + +mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, + mz_zip_archive_file_stat *pStat) { + return mz_zip_file_stat_internal( + pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL); +} + +mz_bool mz_zip_end(mz_zip_archive *pZip) { + if (!pZip) + return MZ_FALSE; + + if (pZip->m_zip_mode == MZ_ZIP_MODE_READING) + return mz_zip_reader_end(pZip); +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) || + (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)) + return mz_zip_writer_end(pZip); +#endif + + return MZ_FALSE; +} + +#ifdef __cplusplus +} +#endif + +#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/ diff --git a/TheOtherUpdater/include/zip/zip.c b/TheOtherUpdater/include/zip/zip.c new file mode 100644 index 00000000..fde4db18 --- /dev/null +++ b/TheOtherUpdater/include/zip/zip.c @@ -0,0 +1,1779 @@ +/* + * 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 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. + */ +#define __STDC_WANT_LIB_EXT1__ 1 + +#include +#include +#include + +#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ + defined(__MINGW32__) +/* Win32, DOS, MSVC, MSVS */ +#include + +#define STRCLONE(STR) ((STR) ? _strdup(STR) : NULL) +#define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) && \ + (P)[1] == ':') +#define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE(P) ? 2 : 0) + +#else + +#include // needed for symlink() +#define STRCLONE(STR) ((STR) ? strdup(STR) : NULL) + +#endif + +#ifdef __MINGW32__ +#include +#include +#endif + +#include "miniz.h" +#include "zip.h" + +#ifdef _MSC_VER +#include + +#define ftruncate(fd, sz) (-(_chsize_s((fd), (sz)) != 0)) +#define fileno _fileno +#endif + +#ifndef HAS_DEVICE +#define HAS_DEVICE(P) 0 +#endif + +#ifndef FILESYSTEM_PREFIX_LEN +#define FILESYSTEM_PREFIX_LEN(P) 0 +#endif + +#ifndef ISSLASH +#define ISSLASH(C) ((C) == '/' || (C) == '\\') +#endif + +#define CLEANUP(ptr) \ + do { \ + if (ptr) { \ + free((void *)ptr); \ + ptr = NULL; \ + } \ + } while (0) + +#define UNX_IFDIR 0040000 /* Unix directory */ +#define UNX_IFREG 0100000 /* Unix regular file */ +#define UNX_IFSOCK 0140000 /* Unix socket (BSD, not SysV or Amiga) */ +#define UNX_IFLNK 0120000 /* Unix symbolic link (not SysV, Amiga) */ +#define UNX_IFBLK 0060000 /* Unix block special (not Amiga) */ +#define UNX_IFCHR 0020000 /* Unix character special (not Amiga) */ +#define UNX_IFIFO 0010000 /* Unix fifo (BCC, not MSC or Amiga) */ + +struct zip_entry_t { + ssize_t index; + char *name; + mz_uint64 uncomp_size; + mz_uint64 comp_size; + mz_uint32 uncomp_crc32; + mz_uint64 offset; + mz_uint8 header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE]; + mz_uint64 header_offset; + mz_uint16 method; + mz_zip_writer_add_state state; + tdefl_compressor comp; + mz_uint32 external_attr; + time_t m_time; +}; + +struct zip_t { + mz_zip_archive archive; + mz_uint level; + struct zip_entry_t entry; +}; + +enum zip_modify_t { + MZ_KEEP = 0, + MZ_DELETE = 1, + MZ_MOVE = 2, +}; + +struct zip_entry_mark_t { + ssize_t file_index; + enum zip_modify_t type; + mz_uint64 m_local_header_ofs; + size_t lf_length; +}; + +static const char *const zip_errlist[30] = { + NULL, + "not initialized\0", + "invalid entry name\0", + "entry not found\0", + "invalid zip mode\0", + "invalid compression level\0", + "no zip 64 support\0", + "memset error\0", + "cannot write data to entry\0", + "cannot initialize tdefl compressor\0", + "invalid index\0", + "header not found\0", + "cannot flush tdefl buffer\0", + "cannot write entry header\0", + "cannot create entry header\0", + "cannot write to central dir\0", + "cannot open file\0", + "invalid entry type\0", + "extracting data using no memory allocation\0", + "file not found\0", + "no permission\0", + "out of memory\0", + "invalid zip archive name\0", + "make dir error\0", + "symlink error\0", + "close archive error\0", + "capacity size too small\0", + "fseek error\0", + "fread error\0", + "fwrite error\0", +}; + +const char *zip_strerror(int errnum) { + errnum = -errnum; + if (errnum <= 0 || errnum >= 30) { + return NULL; + } + + return zip_errlist[errnum]; +} + +static const char *zip_basename(const char *name) { + char const *p; + char const *base = name += FILESYSTEM_PREFIX_LEN(name); + int all_slashes = 1; + + for (p = name; *p; p++) { + if (ISSLASH(*p)) + base = p + 1; + else + all_slashes = 0; + } + + /* If NAME is all slashes, arrange to return `/'. */ + if (*base == '\0' && ISSLASH(*name) && all_slashes) + --base; + + return base; +} + +static int zip_mkpath(char *path) { + char *p; + char npath[MAX_PATH + 1]; + int len = 0; + int has_device = HAS_DEVICE(path); + + memset(npath, 0, MAX_PATH + 1); + if (has_device) { + // only on windows + npath[0] = path[0]; + npath[1] = path[1]; + len = 2; + } + for (p = path + len; *p && len < MAX_PATH; p++) { + if (ISSLASH(*p) && ((!has_device && len > 0) || (has_device && len > 2))) { +#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ + defined(__MINGW32__) +#else + if ('\\' == *p) { + *p = '/'; + } +#endif + + if (MZ_MKDIR(npath) == -1) { + if (errno != EEXIST) { + return ZIP_EMKDIR; + } + } + } + npath[len++] = *p; + } + + return 0; +} + +static char *zip_strrpl(const char *str, size_t n, char oldchar, char newchar) { + char c; + size_t i; + char *rpl = (char *)calloc((1 + n), sizeof(char)); + char *begin = rpl; + if (!rpl) { + return NULL; + } + + for (i = 0; (i < n) && (c = *str++); ++i) { + if (c == oldchar) { + c = newchar; + } + *rpl++ = c; + } + + return begin; +} + +static char *zip_name_normalize(char *name, char *const nname, size_t len) { + size_t offn = 0; + size_t offnn = 0, ncpy = 0; + + if (name == NULL || nname == NULL || len <= 0) { + return NULL; + } + // skip trailing '/' + while (ISSLASH(*name)) + name++; + + for (; offn < len; offn++) { + if (ISSLASH(name[offn])) { + if (ncpy > 0 && strcmp(&nname[offnn], ".\0") && + strcmp(&nname[offnn], "..\0")) { + offnn += ncpy; + nname[offnn++] = name[offn]; // append '/' + } + ncpy = 0; + } else { + nname[offnn + ncpy] = name[offn]; + ncpy++; + } + } + + // at the end, extra check what we've already copied + if (ncpy == 0 || !strcmp(&nname[offnn], ".\0") || + !strcmp(&nname[offnn], "..\0")) { + nname[offnn] = 0; + } + return nname; +} + +static mz_bool zip_name_match(const char *name1, const char *name2) { + char *nname2 = NULL; + +#ifdef ZIP_RAW_ENTRYNAME + nname2 = STRCLONE(name2); +#else + nname2 = zip_strrpl(name2, strlen(name2), '\\', '/'); +#endif + + if (!nname2) { + return MZ_FALSE; + } + + mz_bool res = (strcmp(name1, nname2) == 0) ? MZ_TRUE : MZ_FALSE; + CLEANUP(nname2); + return res; +} + +static int zip_archive_truncate(mz_zip_archive *pzip) { + mz_zip_internal_state *pState = pzip->m_pState; + mz_uint64 file_size = pzip->m_archive_size; + if ((pzip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem)) { + return 0; + } + if (pzip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED) { + if (pState->m_pFile) { + int fd = fileno(pState->m_pFile); + return ftruncate(fd, file_size); + } + } + return 0; +} + +static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir, + int (*on_extract)(const char *filename, + void *arg), + void *arg) { + int err = 0; + mz_uint i, n; + char path[MAX_PATH + 1]; + char symlink_to[MAX_PATH + 1]; + mz_zip_archive_file_stat info; + size_t dirlen = 0; + mz_uint32 xattr = 0; + + memset(path, 0, sizeof(path)); + memset(symlink_to, 0, sizeof(symlink_to)); + + dirlen = strlen(dir); + if (dirlen + 1 > MAX_PATH) { + return ZIP_EINVENTNAME; + } + + memset((void *)&info, 0, sizeof(mz_zip_archive_file_stat)); + +#if defined(_MSC_VER) + strcpy_s(path, MAX_PATH, dir); +#else + strcpy(path, dir); +#endif + + if (!ISSLASH(path[dirlen - 1])) { +#if defined(_WIN32) || defined(__WIN32__) + path[dirlen] = '\\'; +#else + path[dirlen] = '/'; +#endif + ++dirlen; + } + + // Get and print information about each file in the archive. + n = mz_zip_reader_get_num_files(zip_archive); + for (i = 0; i < n; ++i) { + if (!mz_zip_reader_file_stat(zip_archive, i, &info)) { + // Cannot get information about zip archive; + err = ZIP_ENOENT; + goto out; + } + + if (!zip_name_normalize(info.m_filename, info.m_filename, + strlen(info.m_filename))) { + // Cannot normalize file name; + err = ZIP_EINVENTNAME; + goto out; + } +#if defined(_MSC_VER) + strncpy_s(&path[dirlen], MAX_PATH - dirlen, info.m_filename, + MAX_PATH - dirlen); +#else + strncpy(&path[dirlen], info.m_filename, MAX_PATH - dirlen); +#endif + err = zip_mkpath(path); + if (err < 0) { + // Cannot make a path + goto out; + } + + if ((((info.m_version_made_by >> 8) == 3) || + ((info.m_version_made_by >> 8) == + 19)) // if zip is produced on Unix or macOS (3 and 19 from + // section 4.4.2.2 of zip standard) + && info.m_external_attr & + (0x20 << 24)) { // and has sym link attribute (0x80 is file, 0x40 + // is directory) +#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ + defined(__MINGW32__) +#else + if (info.m_uncomp_size > MAX_PATH || + !mz_zip_reader_extract_to_mem_no_alloc(zip_archive, i, symlink_to, + MAX_PATH, 0, NULL, 0)) { + err = ZIP_EMEMNOALLOC; + goto out; + } + symlink_to[info.m_uncomp_size] = '\0'; + if (symlink(symlink_to, path) != 0) { + err = ZIP_ESYMLINK; + goto out; + } +#endif + } else { + if (!mz_zip_reader_is_file_a_directory(zip_archive, i)) { + if (!mz_zip_reader_extract_to_file(zip_archive, i, path, 0)) { + // Cannot extract zip archive to file + err = ZIP_ENOFILE; + goto out; + } + } + +#if defined(_MSC_VER) || defined(PS4) + (void)xattr; // unused +#else + xattr = (info.m_external_attr >> 16) & 0xFFFF; + if (xattr > 0 && xattr <= MZ_UINT16_MAX) { + if (CHMOD(path, (mode_t)xattr) < 0) { + err = ZIP_ENOPERM; + goto out; + } + } +#endif + } + + if (on_extract) { + if (on_extract(path, arg) < 0) { + goto out; + } + } + } + +out: + // Close the archive, freeing any resources it was using + if (!mz_zip_reader_end(zip_archive)) { + // Cannot end zip reader + err = ZIP_ECLSZIP; + } + return err; +} + +static inline void zip_archive_finalize(mz_zip_archive *pzip) { + mz_zip_writer_finalize_archive(pzip); + zip_archive_truncate(pzip); +} + +static ssize_t zip_entry_mark(struct zip_t *zip, + struct zip_entry_mark_t *entry_mark, + const ssize_t n, char *const entries[], + const size_t len) { + ssize_t i = 0; + ssize_t err = 0; + if (!zip || !entry_mark || !entries) { + return ZIP_ENOINIT; + } + + mz_zip_archive_file_stat file_stat; + mz_uint64 d_pos = ~0UL; + for (i = 0; i < n; ++i) { + if ((err = zip_entry_openbyindex(zip, i))) { + return (ssize_t)err; + } + + mz_bool name_matches = MZ_FALSE; + { + size_t j; + for (j = 0; j < len; ++j) { + if (zip_name_match(zip->entry.name, entries[j])) { + name_matches = MZ_TRUE; + break; + } + } + } + if (name_matches) { + entry_mark[i].type = MZ_DELETE; + } else { + entry_mark[i].type = MZ_KEEP; + } + + if (!mz_zip_reader_file_stat(&zip->archive, i, &file_stat)) { + return ZIP_ENOENT; + } + + zip_entry_close(zip); + + entry_mark[i].m_local_header_ofs = file_stat.m_local_header_ofs; + entry_mark[i].file_index = (ssize_t)-1; + entry_mark[i].lf_length = 0; + if ((entry_mark[i].type) == MZ_DELETE && + (d_pos > entry_mark[i].m_local_header_ofs)) { + d_pos = entry_mark[i].m_local_header_ofs; + } + } + + for (i = 0; i < n; ++i) { + if ((entry_mark[i].m_local_header_ofs > d_pos) && + (entry_mark[i].type != MZ_DELETE)) { + entry_mark[i].type = MZ_MOVE; + } + } + return err; +} + +static ssize_t zip_index_next(mz_uint64 *local_header_ofs_array, + ssize_t cur_index) { + ssize_t new_index = 0, i; + for (i = cur_index - 1; i >= 0; --i) { + if (local_header_ofs_array[cur_index] > local_header_ofs_array[i]) { + new_index = i + 1; + return new_index; + } + } + return new_index; +} + +static ssize_t zip_sort(mz_uint64 *local_header_ofs_array, ssize_t cur_index) { + ssize_t nxt_index = zip_index_next(local_header_ofs_array, cur_index); + + if (nxt_index != cur_index) { + mz_uint64 temp = local_header_ofs_array[cur_index]; + ssize_t i; + for (i = cur_index; i > nxt_index; i--) { + local_header_ofs_array[i] = local_header_ofs_array[i - 1]; + } + local_header_ofs_array[nxt_index] = temp; + } + return nxt_index; +} + +static int zip_index_update(struct zip_entry_mark_t *entry_mark, + ssize_t last_index, ssize_t nxt_index) { + ssize_t j; + for (j = 0; j < last_index; j++) { + if (entry_mark[j].file_index >= nxt_index) { + entry_mark[j].file_index += 1; + } + } + entry_mark[nxt_index].file_index = last_index; + return 0; +} + +static int zip_entry_finalize(struct zip_t *zip, + struct zip_entry_mark_t *entry_mark, + const ssize_t n) { + + ssize_t i = 0; + mz_uint64 *local_header_ofs_array = (mz_uint64 *)calloc(n, sizeof(mz_uint64)); + if (!local_header_ofs_array) { + return ZIP_EOOMEM; + } + + for (i = 0; i < n; ++i) { + local_header_ofs_array[i] = entry_mark[i].m_local_header_ofs; + ssize_t index = zip_sort(local_header_ofs_array, i); + + if (index != i) { + zip_index_update(entry_mark, i, index); + } + entry_mark[i].file_index = index; + } + + size_t *length = (size_t *)calloc(n, sizeof(size_t)); + if (!length) { + CLEANUP(local_header_ofs_array); + return ZIP_EOOMEM; + } + for (i = 0; i < n - 1; i++) { + length[i] = + (size_t)(local_header_ofs_array[i + 1] - local_header_ofs_array[i]); + } + length[n - 1] = + (size_t)(zip->archive.m_archive_size - local_header_ofs_array[n - 1]); + + for (i = 0; i < n; i++) { + entry_mark[i].lf_length = length[entry_mark[i].file_index]; + } + + CLEANUP(length); + CLEANUP(local_header_ofs_array); + return 0; +} + +static ssize_t zip_entry_set(struct zip_t *zip, + struct zip_entry_mark_t *entry_mark, ssize_t n, + char *const entries[], const size_t len) { + ssize_t err = 0; + + if ((err = zip_entry_mark(zip, entry_mark, n, entries, len)) < 0) { + return err; + } + if ((err = zip_entry_finalize(zip, entry_mark, n)) < 0) { + return err; + } + return 0; +} + +static ssize_t zip_file_move(MZ_FILE *m_pFile, const mz_uint64 to, + const mz_uint64 from, const size_t length, + mz_uint8 *move_buf, const size_t capacity_size) { + if (length > capacity_size) { + return ZIP_ECAPSIZE; + } + if (MZ_FSEEK64(m_pFile, from, SEEK_SET)) { + MZ_FCLOSE(m_pFile); + return ZIP_EFSEEK; + } + + if (fread(move_buf, 1, length, m_pFile) != length) { + MZ_FCLOSE(m_pFile); + return ZIP_EFREAD; + } + if (MZ_FSEEK64(m_pFile, to, SEEK_SET)) { + MZ_FCLOSE(m_pFile); + return ZIP_EFSEEK; + } + if (fwrite(move_buf, 1, length, m_pFile) != length) { + MZ_FCLOSE(m_pFile); + return ZIP_EFWRITE; + } + return (ssize_t)length; +} + +static ssize_t zip_files_move(MZ_FILE *m_pFile, mz_uint64 writen_num, + mz_uint64 read_num, size_t length) { + ssize_t n = 0; + const size_t page_size = 1 << 12; // 4K + mz_uint8 *move_buf = (mz_uint8 *)calloc(1, page_size); + if (!move_buf) { + return ZIP_EOOMEM; + } + + ssize_t moved_length = 0; + ssize_t move_count = 0; + while ((mz_int64)length > 0) { + move_count = (length >= page_size) ? page_size : length; + n = zip_file_move(m_pFile, writen_num, read_num, move_count, move_buf, + page_size); + if (n < 0) { + moved_length = n; + goto cleanup; + } + + if (n != move_count) { + goto cleanup; + } + + writen_num += move_count; + read_num += move_count; + length -= move_count; + moved_length += move_count; + } + +cleanup: + CLEANUP(move_buf); + return moved_length; +} + +static int zip_central_dir_move(mz_zip_internal_state *pState, int begin, + int end, int entry_num) { + if (begin == entry_num) { + return 0; + } + + size_t l_size = 0; + size_t r_size = 0; + mz_uint32 d_size = 0; + mz_uint8 *next = NULL; + mz_uint8 *deleted = &MZ_ZIP_ARRAY_ELEMENT( + &pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, begin)); + l_size = (size_t)(deleted - (mz_uint8 *)(pState->m_central_dir.m_p)); + if (end == entry_num) { + r_size = 0; + } else { + next = &MZ_ZIP_ARRAY_ELEMENT( + &pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, end)); + r_size = pState->m_central_dir.m_size - + (mz_uint32)(next - (mz_uint8 *)(pState->m_central_dir.m_p)); + d_size = (mz_uint32)(next - deleted); + } + + if (next && l_size == 0) { + memmove(pState->m_central_dir.m_p, next, r_size); + pState->m_central_dir.m_p = MZ_REALLOC(pState->m_central_dir.m_p, r_size); + { + int i; + for (i = end; i < entry_num; i++) { + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, i) -= + d_size; + } + } + } + + if (next && l_size * r_size != 0) { + memmove(deleted, next, r_size); + { + int i; + for (i = end; i < entry_num; i++) { + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, i) -= + d_size; + } + } + } + + pState->m_central_dir.m_size = l_size + r_size; + return 0; +} + +static int zip_central_dir_delete(mz_zip_internal_state *pState, + int *deleted_entry_index_array, + int entry_num) { + int i = 0; + int begin = 0; + int end = 0; + int d_num = 0; + while (i < entry_num) { + while ((!deleted_entry_index_array[i]) && (i < entry_num)) { + i++; + } + begin = i; + + while ((deleted_entry_index_array[i]) && (i < entry_num)) { + i++; + } + end = i; + zip_central_dir_move(pState, begin, end, entry_num); + } + + i = 0; + while (i < entry_num) { + while ((!deleted_entry_index_array[i]) && (i < entry_num)) { + i++; + } + begin = i; + if (begin == entry_num) { + break; + } + while ((deleted_entry_index_array[i]) && (i < entry_num)) { + i++; + } + end = i; + int k = 0, j; + for (j = end; j < entry_num; j++) { + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, + begin + k) = + (mz_uint32)MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, + mz_uint32, j); + k++; + } + d_num += end - begin; + } + + pState->m_central_dir_offsets.m_size = + sizeof(mz_uint32) * (entry_num - d_num); + return 0; +} + +static ssize_t zip_entries_delete_mark(struct zip_t *zip, + struct zip_entry_mark_t *entry_mark, + int entry_num) { + mz_uint64 writen_num = 0; + mz_uint64 read_num = 0; + size_t deleted_length = 0; + size_t move_length = 0; + int i = 0; + size_t deleted_entry_num = 0; + ssize_t n = 0; + + mz_bool *deleted_entry_flag_array = + (mz_bool *)calloc(entry_num, sizeof(mz_bool)); + if (deleted_entry_flag_array == NULL) { + return ZIP_EOOMEM; + } + + mz_zip_internal_state *pState = zip->archive.m_pState; + zip->archive.m_zip_mode = MZ_ZIP_MODE_WRITING; + + if ((!pState->m_pFile) || MZ_FSEEK64(pState->m_pFile, 0, SEEK_SET)) { + CLEANUP(deleted_entry_flag_array); + return ZIP_ENOENT; + } + + while (i < entry_num) { + while ((entry_mark[i].type == MZ_KEEP) && (i < entry_num)) { + writen_num += entry_mark[i].lf_length; + read_num = writen_num; + i++; + } + + while ((entry_mark[i].type == MZ_DELETE) && (i < entry_num)) { + deleted_entry_flag_array[i] = MZ_TRUE; + read_num += entry_mark[i].lf_length; + deleted_length += entry_mark[i].lf_length; + i++; + deleted_entry_num++; + } + + while ((entry_mark[i].type == MZ_MOVE) && (i < entry_num)) { + move_length += entry_mark[i].lf_length; + mz_uint8 *p = &MZ_ZIP_ARRAY_ELEMENT( + &pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, i)); + if (!p) { + CLEANUP(deleted_entry_flag_array); + return ZIP_ENOENT; + } + mz_uint32 offset = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); + offset -= (mz_uint32)deleted_length; + MZ_WRITE_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS, offset); + i++; + } + + n = zip_files_move(pState->m_pFile, writen_num, read_num, move_length); + if (n != (ssize_t)move_length) { + CLEANUP(deleted_entry_flag_array); + return n; + } + writen_num += move_length; + read_num += move_length; + } + + zip->archive.m_archive_size -= (mz_uint64)deleted_length; + zip->archive.m_total_files = + (mz_uint32)entry_num - (mz_uint32)deleted_entry_num; + + zip_central_dir_delete(pState, deleted_entry_flag_array, entry_num); + CLEANUP(deleted_entry_flag_array); + + return (ssize_t)deleted_entry_num; +} + +struct zip_t *zip_open(const char *zipname, int level, char mode) { + struct zip_t *zip = NULL; + + if (!zipname || strlen(zipname) < 1) { + // zip_t archive name is empty or NULL + goto cleanup; + } + + if (level < 0) + level = MZ_DEFAULT_LEVEL; + if ((level & 0xF) > MZ_UBER_COMPRESSION) { + // Wrong compression level + goto cleanup; + } + + zip = (struct zip_t *)calloc((size_t)1, sizeof(struct zip_t)); + if (!zip) + goto cleanup; + + zip->level = (mz_uint)level; + switch (mode) { + case 'w': + // Create a new archive. + if (!mz_zip_writer_init_file_v2(&(zip->archive), zipname, 0, + MZ_ZIP_FLAG_WRITE_ZIP64)) { + // Cannot initialize zip_archive writer + goto cleanup; + } + break; + + case 'r': + case 'a': + case 'd': + if (!mz_zip_reader_init_file_v2_rpb( + &(zip->archive), zipname, + zip->level | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) { + // An archive file does not exist or cannot initialize + // zip_archive reader + goto cleanup; + } + if ((mode == 'a' || mode == 'd')) { + if (!mz_zip_writer_init_from_reader_v2_noreopen(&(zip->archive), zipname, + 0)) { + mz_zip_reader_end(&(zip->archive)); + goto cleanup; + } + } + break; + + default: + goto cleanup; + } + + return zip; + +cleanup: + CLEANUP(zip); + return NULL; +} + +void zip_close(struct zip_t *zip) { + if (zip) { + // Always finalize, even if adding failed for some reason, so we have a + // valid central directory. + mz_zip_writer_finalize_archive(&(zip->archive)); + zip_archive_truncate(&(zip->archive)); + mz_zip_writer_end(&(zip->archive)); + mz_zip_reader_end(&(zip->archive)); + + CLEANUP(zip); + } +} + +int zip_is64(struct zip_t *zip) { + if (!zip || !zip->archive.m_pState) { + // zip_t handler or zip state is not initialized + return ZIP_ENOINIT; + } + + return (int)zip->archive.m_pState->m_zip64; +} + +static int _zip_entry_open(struct zip_t *zip, const char *entryname, + int case_sensitive) { + size_t entrylen = 0; + mz_zip_archive *pzip = NULL; + mz_uint num_alignment_padding_bytes, level; + mz_zip_archive_file_stat stats; + int err = 0; + mz_uint16 dos_time, dos_date; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_uint64 local_dir_header_ofs = 0; + + if (!zip) { + return ZIP_ENOINIT; + } + + local_dir_header_ofs = zip->archive.m_archive_size; + + if (!entryname) { + return ZIP_EINVENTNAME; + } + + entrylen = strlen(entryname); + if (entrylen == 0) { + return ZIP_EINVENTNAME; + } + + /* + .ZIP File Format Specification Version: 6.3.3 + + 4.4.17.1 The name of the file, with optional relative path. + The path stored MUST not contain a drive or + device letter, or a leading slash. All slashes + MUST be forward slashes '/' as opposed to + backwards slashes '\' for compatibility with Amiga + and UNIX file systems etc. If input came from standard + input, there is no file name field. + */ + if (zip->entry.name) { + CLEANUP(zip->entry.name); + } +#ifdef ZIP_RAW_ENTRYNAME + zip->entry.name = STRCLONE(entryname); +#else + zip->entry.name = zip_strrpl(entryname, entrylen, '\\', '/'); +#endif + + if (!zip->entry.name) { + // Cannot parse zip entry name + return ZIP_EINVENTNAME; + } + + pzip = &(zip->archive); + if (pzip->m_zip_mode == MZ_ZIP_MODE_READING) { + zip->entry.index = (ssize_t)mz_zip_reader_locate_file( + pzip, zip->entry.name, NULL, + case_sensitive ? MZ_ZIP_FLAG_CASE_SENSITIVE : 0); + if (zip->entry.index < (ssize_t)0) { + err = ZIP_ENOENT; + goto cleanup; + } + + if (!mz_zip_reader_file_stat(pzip, (mz_uint)zip->entry.index, &stats)) { + err = ZIP_ENOENT; + goto cleanup; + } + + zip->entry.comp_size = stats.m_comp_size; + zip->entry.uncomp_size = stats.m_uncomp_size; + zip->entry.uncomp_crc32 = stats.m_crc32; + zip->entry.offset = stats.m_central_dir_ofs; + zip->entry.header_offset = stats.m_local_header_ofs; + zip->entry.method = stats.m_method; + zip->entry.external_attr = stats.m_external_attr; +#ifndef MINIZ_NO_TIME + zip->entry.m_time = stats.m_time; +#endif + + return 0; + } + + level = zip->level & 0xF; + + zip->entry.index = (ssize_t)zip->archive.m_total_files; + zip->entry.comp_size = 0; + zip->entry.uncomp_size = 0; + zip->entry.uncomp_crc32 = MZ_CRC32_INIT; + zip->entry.offset = zip->archive.m_archive_size; + zip->entry.header_offset = zip->archive.m_archive_size; + memset(zip->entry.header, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE * sizeof(mz_uint8)); + zip->entry.method = level ? MZ_DEFLATED : 0; + + // UNIX or APPLE +#if MZ_PLATFORM == 3 || MZ_PLATFORM == 19 + // regular file with rw-r--r-- permissions + zip->entry.external_attr = (mz_uint32)(0100644) << 16; +#else + zip->entry.external_attr = 0; +#endif + + num_alignment_padding_bytes = + mz_zip_writer_compute_padding_needed_for_file_alignment(pzip); + + if (!pzip->m_pState || (pzip->m_zip_mode != MZ_ZIP_MODE_WRITING)) { + // Invalid zip mode + err = ZIP_EINVMODE; + goto cleanup; + } + if (zip->level & MZ_ZIP_FLAG_COMPRESSED_DATA) { + // Invalid zip compression level + err = ZIP_EINVLVL; + goto cleanup; + } + + if (!mz_zip_writer_write_zeros(pzip, zip->entry.offset, + num_alignment_padding_bytes)) { + // Cannot memset zip entry header + err = ZIP_EMEMSET; + goto cleanup; + } + local_dir_header_ofs += num_alignment_padding_bytes; + + zip->entry.m_time = time(NULL); +#ifndef MINIZ_NO_TIME + mz_zip_time_t_to_dos_time(zip->entry.m_time, &dos_time, &dos_date); +#endif + + // ZIP64 header with NULL sizes (sizes will be in the data descriptor, just + // after file data) + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, NULL, NULL, + (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + + if (!mz_zip_writer_create_local_dir_header( + #pragma warning(suppress: 4267) + pzip, zip->entry.header, entrylen, (mz_uint16)extra_size, 0, 0, 0, + zip->entry.method, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 | + MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR, + dos_time, dos_date)) { + // Cannot create zip entry header + err = ZIP_EMEMSET; + goto cleanup; + } + + zip->entry.header_offset = zip->entry.offset + num_alignment_padding_bytes; + + if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.header_offset, + zip->entry.header, + sizeof(zip->entry.header)) != sizeof(zip->entry.header)) { + // Cannot write zip entry header + err = ZIP_EMEMSET; + goto cleanup; + } + + if (pzip->m_file_offset_alignment) { + MZ_ASSERT( + (zip->entry.header_offset & (pzip->m_file_offset_alignment - 1)) == 0); + } + zip->entry.offset += num_alignment_padding_bytes + sizeof(zip->entry.header); + + if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, zip->entry.name, + entrylen) != entrylen) { + // Cannot write data to zip entry + err = ZIP_EWRTENT; + goto cleanup; + } + + zip->entry.offset += entrylen; + + if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, extra_data, + extra_size) != extra_size) { + // Cannot write ZIP64 data to zip entry + err = ZIP_EWRTENT; + goto cleanup; + } + zip->entry.offset += extra_size; + + if (level) { + zip->entry.state.m_pZip = pzip; + zip->entry.state.m_cur_archive_file_ofs = zip->entry.offset; + zip->entry.state.m_comp_size = 0; + + if (tdefl_init(&(zip->entry.comp), mz_zip_writer_add_put_buf_callback, + &(zip->entry.state), + (int)tdefl_create_comp_flags_from_zip_params( + (int)level, -15, MZ_DEFAULT_STRATEGY)) != + TDEFL_STATUS_OKAY) { + // Cannot initialize the zip compressor + err = ZIP_ETDEFLINIT; + goto cleanup; + } + } + + return 0; + +cleanup: + CLEANUP(zip->entry.name); + return err; +} + +int zip_entry_open(struct zip_t *zip, const char *entryname) { + return _zip_entry_open(zip, entryname, 0); +} + +int zip_entry_opencasesensitive(struct zip_t *zip, const char *entryname) { + return _zip_entry_open(zip, entryname, 1); +} + +int zip_entry_openbyindex(struct zip_t *zip, size_t index) { + mz_zip_archive *pZip = NULL; + mz_zip_archive_file_stat stats; + mz_uint namelen; + const mz_uint8 *pHeader; + const char *pFilename; + + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + pZip = &(zip->archive); + if (pZip->m_zip_mode != MZ_ZIP_MODE_READING) { + // open by index requires readonly mode + return ZIP_EINVMODE; + } + + if (index >= (size_t)pZip->m_total_files) { + // index out of range + return ZIP_EINVIDX; + } + + if (!(pHeader = &MZ_ZIP_ARRAY_ELEMENT( + &pZip->m_pState->m_central_dir, mz_uint8, + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, + mz_uint32, index)))) { + // cannot find header in central directory + return ZIP_ENOHDR; + } + + namelen = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS); + pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + + /* + .ZIP File Format Specification Version: 6.3.3 + + 4.4.17.1 The name of the file, with optional relative path. + The path stored MUST not contain a drive or + device letter, or a leading slash. All slashes + MUST be forward slashes '/' as opposed to + backwards slashes '\' for compatibility with Amiga + and UNIX file systems etc. If input came from standard + input, there is no file name field. + */ + if (zip->entry.name) { + CLEANUP(zip->entry.name); + } +#ifdef ZIP_RAW_ENTRYNAME + zip->entry.name = STRCLONE(pFilename); +#else + zip->entry.name = zip_strrpl(pFilename, namelen, '\\', '/'); +#endif + + if (!zip->entry.name) { + // local entry name is NULL + return ZIP_EINVENTNAME; + } + + if (!mz_zip_reader_file_stat(pZip, (mz_uint)index, &stats)) { + return ZIP_ENOENT; + } + + zip->entry.index = (ssize_t)index; + zip->entry.comp_size = stats.m_comp_size; + zip->entry.uncomp_size = stats.m_uncomp_size; + zip->entry.uncomp_crc32 = stats.m_crc32; + zip->entry.offset = stats.m_central_dir_ofs; + zip->entry.header_offset = stats.m_local_header_ofs; + zip->entry.method = stats.m_method; + zip->entry.external_attr = stats.m_external_attr; +#ifndef MINIZ_NO_TIME + zip->entry.m_time = stats.m_time; +#endif + + return 0; +} + +int zip_entry_close(struct zip_t *zip) { + mz_zip_archive *pzip = NULL; + mz_uint level; + tdefl_status done; + mz_uint16 entrylen; + mz_uint16 dos_time = 0, dos_date = 0; + int err = 0; + mz_uint8 *pExtra_data = NULL; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64]; + mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64; + + if (!zip) { + // zip_t handler is not initialized + err = ZIP_ENOINIT; + goto cleanup; + } + + pzip = &(zip->archive); + if (pzip->m_zip_mode == MZ_ZIP_MODE_READING) { + goto cleanup; + } + + level = zip->level & 0xF; + if (level) { + done = tdefl_compress_buffer(&(zip->entry.comp), "", 0, TDEFL_FINISH); + if (done != TDEFL_STATUS_DONE && done != TDEFL_STATUS_OKAY) { + // Cannot flush compressed buffer + err = ZIP_ETDEFLBUF; + goto cleanup; + } + zip->entry.comp_size = zip->entry.state.m_comp_size; + zip->entry.offset = zip->entry.state.m_cur_archive_file_ofs; + zip->entry.method = MZ_DEFLATED; + } + + entrylen = (mz_uint16)strlen(zip->entry.name); +#ifndef MINIZ_NO_TIME + mz_zip_time_t_to_dos_time(zip->entry.m_time, &dos_time, &dos_date); +#endif + + MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID); + MZ_WRITE_LE32(local_dir_footer + 4, zip->entry.uncomp_crc32); + MZ_WRITE_LE64(local_dir_footer + 8, zip->entry.comp_size); + MZ_WRITE_LE64(local_dir_footer + 16, zip->entry.uncomp_size); + + if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, local_dir_footer, + local_dir_footer_size) != local_dir_footer_size) { + // Cannot write zip entry header + err = ZIP_EWRTHDR; + goto cleanup; + } + zip->entry.offset += local_dir_footer_size; + + pExtra_data = extra_data; + extra_size = mz_zip_writer_create_zip64_extra_data( + extra_data, + (zip->entry.uncomp_size >= MZ_UINT32_MAX) ? &zip->entry.uncomp_size + : NULL, + (zip->entry.comp_size >= MZ_UINT32_MAX) ? &zip->entry.comp_size : NULL, + (zip->entry.header_offset >= MZ_UINT32_MAX) ? &zip->entry.header_offset + : NULL); + + if ((entrylen) && (zip->entry.name[entrylen - 1] == '/') && + !zip->entry.uncomp_size) { + /* Set DOS Subdirectory attribute bit. */ + zip->entry.external_attr |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG; + } + + if (!mz_zip_writer_add_to_central_dir( + pzip, zip->entry.name, entrylen, pExtra_data, (mz_uint16)extra_size, + "", 0, zip->entry.uncomp_size, zip->entry.comp_size, + zip->entry.uncomp_crc32, zip->entry.method, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 | + MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR, + dos_time, dos_date, zip->entry.header_offset, + zip->entry.external_attr, NULL, 0)) { + // Cannot write to zip central dir + err = ZIP_EWRTDIR; + goto cleanup; + } + + pzip->m_total_files++; + pzip->m_archive_size = zip->entry.offset; + +cleanup: + if (zip) { + zip->entry.m_time = 0; + CLEANUP(zip->entry.name); + } + return err; +} + +const char *zip_entry_name(struct zip_t *zip) { + if (!zip) { + // zip_t handler is not initialized + return NULL; + } + + return zip->entry.name; +} + +ssize_t zip_entry_index(struct zip_t *zip) { + if (!zip) { + // zip_t handler is not initialized + return (ssize_t)ZIP_ENOINIT; + } + + return zip->entry.index; +} + +int zip_entry_isdir(struct zip_t *zip) { + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + if (zip->entry.index < (ssize_t)0) { + // zip entry is not opened + return ZIP_EINVIDX; + } + + return (int)mz_zip_reader_is_file_a_directory(&zip->archive, + (mz_uint)zip->entry.index); +} + +unsigned long long zip_entry_size(struct zip_t *zip) { + return zip_entry_uncomp_size(zip); +} + +unsigned long long zip_entry_uncomp_size(struct zip_t *zip) { + return zip ? zip->entry.uncomp_size : 0; +} + +unsigned long long zip_entry_comp_size(struct zip_t *zip) { + return zip ? zip->entry.comp_size : 0; +} + +unsigned int zip_entry_crc32(struct zip_t *zip) { + return zip ? zip->entry.uncomp_crc32 : 0; +} + +int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize) { + mz_uint level; + mz_zip_archive *pzip = NULL; + tdefl_status status; + + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + pzip = &(zip->archive); + if (buf && bufsize > 0) { + zip->entry.uncomp_size += bufsize; + zip->entry.uncomp_crc32 = (mz_uint32)mz_crc32( + zip->entry.uncomp_crc32, (const mz_uint8 *)buf, bufsize); + + level = zip->level & 0xF; + if (!level) { + if ((pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, buf, + bufsize) != bufsize)) { + // Cannot write buffer + return ZIP_EWRTENT; + } + zip->entry.offset += bufsize; + zip->entry.comp_size += bufsize; + } else { + status = tdefl_compress_buffer(&(zip->entry.comp), buf, bufsize, + TDEFL_NO_FLUSH); + if (status != TDEFL_STATUS_DONE && status != TDEFL_STATUS_OKAY) { + // Cannot compress buffer + return ZIP_ETDEFLBUF; + } + } + } + + return 0; +} + +int zip_entry_fwrite(struct zip_t *zip, const char *filename) { + int err = 0; + size_t n = 0; + MZ_FILE *stream = NULL; + mz_uint8 buf[MZ_ZIP_MAX_IO_BUF_SIZE]; + struct MZ_FILE_STAT_STRUCT file_stat; + mz_uint16 modes; + + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + memset(buf, 0, MZ_ZIP_MAX_IO_BUF_SIZE); + memset((void *)&file_stat, 0, sizeof(struct MZ_FILE_STAT_STRUCT)); + if (MZ_FILE_STAT(filename, &file_stat) != 0) { + // problem getting information - check errno + return ZIP_ENOENT; + } + +#if defined(_WIN32) || defined(__WIN32__) || defined(DJGPP) + (void)modes; // unused +#else + /* Initialize with permission bits--which are not implementation-optional */ + modes = file_stat.st_mode & + (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX); + if (S_ISDIR(file_stat.st_mode)) + modes |= UNX_IFDIR; + if (S_ISREG(file_stat.st_mode)) + modes |= UNX_IFREG; + if (S_ISLNK(file_stat.st_mode)) + modes |= UNX_IFLNK; + if (S_ISBLK(file_stat.st_mode)) + modes |= UNX_IFBLK; + if (S_ISCHR(file_stat.st_mode)) + modes |= UNX_IFCHR; + if (S_ISFIFO(file_stat.st_mode)) + modes |= UNX_IFIFO; + if (S_ISSOCK(file_stat.st_mode)) + modes |= UNX_IFSOCK; + zip->entry.external_attr = (modes << 16) | !(file_stat.st_mode & S_IWUSR); + if ((file_stat.st_mode & S_IFMT) == S_IFDIR) { + zip->entry.external_attr |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG; + } +#endif + + zip->entry.m_time = file_stat.st_mtime; + + if (!(stream = MZ_FOPEN(filename, "rb"))) { + // Cannot open filename + return ZIP_EOPNFILE; + } + + while ((n = fread(buf, sizeof(mz_uint8), MZ_ZIP_MAX_IO_BUF_SIZE, stream)) > + 0) { + if (zip_entry_write(zip, buf, n) < 0) { + err = ZIP_EWRTENT; + break; + } + } + fclose(stream); + + return err; +} + +ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize) { + mz_zip_archive *pzip = NULL; + mz_uint idx; + size_t size = 0; + + if (!zip) { + // zip_t handler is not initialized + return (ssize_t)ZIP_ENOINIT; + } + + pzip = &(zip->archive); + if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || + zip->entry.index < (ssize_t)0) { + // the entry is not found or we do not have read access + return (ssize_t)ZIP_ENOENT; + } + + idx = (mz_uint)zip->entry.index; + if (mz_zip_reader_is_file_a_directory(pzip, idx)) { + // the entry is a directory + return (ssize_t)ZIP_EINVENTTYPE; + } + + *buf = mz_zip_reader_extract_to_heap(pzip, idx, &size, 0); + if (*buf && bufsize) { + *bufsize = size; + } + return (ssize_t)size; +} + +ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) { + mz_zip_archive *pzip = NULL; + + if (!zip) { + // zip_t handler is not initialized + return (ssize_t)ZIP_ENOINIT; + } + + pzip = &(zip->archive); + if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || + zip->entry.index < (ssize_t)0) { + // the entry is not found or we do not have read access + return (ssize_t)ZIP_ENOENT; + } + + if (!mz_zip_reader_extract_to_mem_no_alloc(pzip, (mz_uint)zip->entry.index, + buf, bufsize, 0, NULL, 0)) { + return (ssize_t)ZIP_EMEMNOALLOC; + } + + return (ssize_t)zip->entry.uncomp_size; +} + +int zip_entry_fread(struct zip_t *zip, const char *filename) { + mz_zip_archive *pzip = NULL; + mz_uint idx; + mz_uint32 xattr = 0; + mz_zip_archive_file_stat info; + + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + memset((void *)&info, 0, sizeof(mz_zip_archive_file_stat)); + pzip = &(zip->archive); + if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || + zip->entry.index < (ssize_t)0) { + // the entry is not found or we do not have read access + return ZIP_ENOENT; + } + + idx = (mz_uint)zip->entry.index; + if (mz_zip_reader_is_file_a_directory(pzip, idx)) { + // the entry is a directory + return ZIP_EINVENTTYPE; + } + + if (!mz_zip_reader_extract_to_file(pzip, idx, filename, 0)) { + return ZIP_ENOFILE; + } + +#if defined(_MSC_VER) || defined(PS4) + (void)xattr; // unused +#else + if (!mz_zip_reader_file_stat(pzip, idx, &info)) { + // Cannot get information about zip archive; + return ZIP_ENOFILE; + } + + xattr = (info.m_external_attr >> 16) & 0xFFFF; + if (xattr > 0 && xattr <= MZ_UINT16_MAX) { + if (CHMOD(filename, (mode_t)xattr) < 0) { + return ZIP_ENOPERM; + } + } +#endif + + return 0; +} + +int zip_entry_extract(struct zip_t *zip, + size_t (*on_extract)(void *arg, uint64_t offset, + const void *buf, size_t bufsize), + void *arg) { + mz_zip_archive *pzip = NULL; + mz_uint idx; + + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + pzip = &(zip->archive); + if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || + zip->entry.index < (ssize_t)0) { + // the entry is not found or we do not have read access + return ZIP_ENOENT; + } + + idx = (mz_uint)zip->entry.index; + return (mz_zip_reader_extract_to_callback(pzip, idx, on_extract, arg, 0)) + ? 0 + : ZIP_EINVIDX; +} + +ssize_t zip_entries_total(struct zip_t *zip) { + if (!zip) { + // zip_t handler is not initialized + return ZIP_ENOINIT; + } + + return (ssize_t)zip->archive.m_total_files; +} + +ssize_t zip_entries_delete(struct zip_t *zip, char *const entries[], + size_t len) { + ssize_t n = 0; + ssize_t err = 0; + struct zip_entry_mark_t *entry_mark = NULL; + + if (zip == NULL || (entries == NULL && len != 0)) { + return ZIP_ENOINIT; + } + + if (entries == NULL && len == 0) { + return 0; + } + + n = zip_entries_total(zip); + + entry_mark = (struct zip_entry_mark_t *)calloc( + (size_t)n, sizeof(struct zip_entry_mark_t)); + if (!entry_mark) { + return ZIP_EOOMEM; + } + + zip->archive.m_zip_mode = MZ_ZIP_MODE_READING; + + err = zip_entry_set(zip, entry_mark, n, entries, len); + if (err < 0) { + CLEANUP(entry_mark); + return err; + } + + err = zip_entries_delete_mark(zip, entry_mark, (int)n); + CLEANUP(entry_mark); + return err; +} + +int zip_stream_extract(const char *stream, size_t size, const char *dir, + int (*on_extract)(const char *filename, void *arg), + void *arg) { + mz_zip_archive zip_archive; + if (!stream || !dir) { + // Cannot parse zip archive stream + return ZIP_ENOINIT; + } + if (!memset(&zip_archive, 0, sizeof(mz_zip_archive))) { + // Cannot memset zip archive + return ZIP_EMEMSET; + } + if (!mz_zip_reader_init_mem(&zip_archive, stream, size, 0)) { + // Cannot initialize zip_archive reader + return ZIP_ENOINIT; + } + + return zip_archive_extract(&zip_archive, dir, on_extract, arg); +} + +struct zip_t *zip_stream_open(const char *stream, size_t size, int level, + char mode) { + struct zip_t *zip = (struct zip_t *)calloc((size_t)1, sizeof(struct zip_t)); + if (!zip) { + return NULL; + } + + if (level < 0) { + level = MZ_DEFAULT_LEVEL; + } + if ((level & 0xF) > MZ_UBER_COMPRESSION) { + // Wrong compression level + goto cleanup; + } + zip->level = (mz_uint)level; + + if ((stream != NULL) && (size > 0) && (mode == 'r')) { + if (!mz_zip_reader_init_mem(&(zip->archive), stream, size, 0)) { + goto cleanup; + } + } else if ((stream == NULL) && (size == 0) && (mode == 'w')) { + // Create a new archive. + if (!mz_zip_writer_init_heap(&(zip->archive), 0, 1024)) { + // Cannot initialize zip_archive writer + goto cleanup; + } + } else { + goto cleanup; + } + return zip; + +cleanup: + CLEANUP(zip); + return NULL; +} + +ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) { + size_t n; + + if (!zip) { + return (ssize_t)ZIP_ENOINIT; + } + zip_archive_finalize(&(zip->archive)); + + n = (size_t)zip->archive.m_archive_size; + if (bufsize != NULL) { + *bufsize = n; + } + + *buf = calloc(sizeof(unsigned char), n); + memcpy(*buf, zip->archive.m_pState->m_pMem, n); + + return (ssize_t)n; +} + +void zip_stream_close(struct zip_t *zip) { + if (zip) { + mz_zip_writer_end(&(zip->archive)); + mz_zip_reader_end(&(zip->archive)); + CLEANUP(zip); + } +} + +int zip_create(const char *zipname, const char *filenames[], size_t len) { + int err = 0; + size_t i; + mz_zip_archive zip_archive; + struct MZ_FILE_STAT_STRUCT file_stat; + mz_uint32 ext_attributes = 0; + mz_uint16 modes; + + if (!zipname || strlen(zipname) < 1) { + // zip_t archive name is empty or NULL + return ZIP_EINVZIPNAME; + } + + // Create a new archive. + if (!memset(&(zip_archive), 0, sizeof(zip_archive))) { + // Cannot memset zip archive + return ZIP_EMEMSET; + } + + if (!mz_zip_writer_init_file(&zip_archive, zipname, 0)) { + // Cannot initialize zip_archive writer + return ZIP_ENOINIT; + } + + if (!memset((void *)&file_stat, 0, sizeof(struct MZ_FILE_STAT_STRUCT))) { + return ZIP_EMEMSET; + } + + for (i = 0; i < len; ++i) { + const char *name = filenames[i]; + if (!name) { + err = ZIP_EINVENTNAME; + break; + } + + if (MZ_FILE_STAT(name, &file_stat) != 0) { + // problem getting information - check errno + err = ZIP_ENOFILE; + break; + } + +#if defined(_WIN32) || defined(__WIN32__) || defined(DJGPP) + (void)modes; // unused +#else + + /* Initialize with permission bits--which are not implementation-optional */ + modes = file_stat.st_mode & + (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX); + if (S_ISDIR(file_stat.st_mode)) + modes |= UNX_IFDIR; + if (S_ISREG(file_stat.st_mode)) + modes |= UNX_IFREG; + if (S_ISLNK(file_stat.st_mode)) + modes |= UNX_IFLNK; + if (S_ISBLK(file_stat.st_mode)) + modes |= UNX_IFBLK; + if (S_ISCHR(file_stat.st_mode)) + modes |= UNX_IFCHR; + if (S_ISFIFO(file_stat.st_mode)) + modes |= UNX_IFIFO; + if (S_ISSOCK(file_stat.st_mode)) + modes |= UNX_IFSOCK; + ext_attributes = (modes << 16) | !(file_stat.st_mode & S_IWUSR); + if ((file_stat.st_mode & S_IFMT) == S_IFDIR) { + ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG; + } +#endif + + if (!mz_zip_writer_add_file(&zip_archive, zip_basename(name), name, "", 0, + ZIP_DEFAULT_COMPRESSION_LEVEL, + ext_attributes)) { + // Cannot add file to zip_archive + err = ZIP_ENOFILE; + break; + } + } + + mz_zip_writer_finalize_archive(&zip_archive); + mz_zip_writer_end(&zip_archive); + return err; +} + +int zip_extract(const char *zipname, const char *dir, + int (*on_extract)(const char *filename, void *arg), void *arg) { + mz_zip_archive zip_archive; + + if (!zipname || !dir) { + // Cannot parse zip archive name + return ZIP_EINVZIPNAME; + } + + if (!memset(&zip_archive, 0, sizeof(mz_zip_archive))) { + // Cannot memset zip archive + return ZIP_EMEMSET; + } + + // Now try to open the archive. + if (!mz_zip_reader_init_file(&zip_archive, zipname, 0)) { + // Cannot initialize zip_archive reader + return ZIP_ENOINIT; + } + + return zip_archive_extract(&zip_archive, dir, on_extract, arg); +} diff --git a/TheOtherUpdater/include/zip/zip.h b/TheOtherUpdater/include/zip/zip.h new file mode 100644 index 00000000..6de72194 --- /dev/null +++ b/TheOtherUpdater/include/zip/zip.h @@ -0,0 +1,468 @@ +/* + * 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 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. + */ + +#pragma once +#ifndef ZIP_H +#define ZIP_H + +#include +#include +#include + +#ifndef ZIP_SHARED +#define ZIP_EXPORT +#else +#ifdef _WIN32 +#ifdef ZIP_BUILD_SHARED +#define ZIP_EXPORT __declspec(dllexport) +#else +#define ZIP_EXPORT __declspec(dllimport) +#endif +#else +#define ZIP_EXPORT __attribute__((visibility("default"))) +#endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(_POSIX_C_SOURCE) && defined(_MSC_VER) +// 64-bit Windows is the only mainstream platform +// where sizeof(long) != sizeof(void*) +#ifdef _WIN64 +typedef long long ssize_t; /* byte count or error */ +#else +typedef long ssize_t; /* byte count or error */ +#endif +#endif + +#ifndef MAX_PATH +#define MAX_PATH 1024 /* # chars in a path name including NULL */ +#endif + +/** + * @mainpage + * + * Documenation for @ref zip. + */ + +/** + * @addtogroup zip + * @{ + */ + +/** + * Default zip compression level. + */ +#define ZIP_DEFAULT_COMPRESSION_LEVEL 6 + +/** + * Error codes + */ +#define ZIP_ENOINIT -1 // not initialized +#define ZIP_EINVENTNAME -2 // invalid entry name +#define ZIP_ENOENT -3 // entry not found +#define ZIP_EINVMODE -4 // invalid zip mode +#define ZIP_EINVLVL -5 // invalid compression level +#define ZIP_ENOSUP64 -6 // no zip 64 support +#define ZIP_EMEMSET -7 // memset error +#define ZIP_EWRTENT -8 // cannot write data to entry +#define ZIP_ETDEFLINIT -9 // cannot initialize tdefl compressor +#define ZIP_EINVIDX -10 // invalid index +#define ZIP_ENOHDR -11 // header not found +#define ZIP_ETDEFLBUF -12 // cannot flush tdefl buffer +#define ZIP_ECRTHDR -13 // cannot create entry header +#define ZIP_EWRTHDR -14 // cannot write entry header +#define ZIP_EWRTDIR -15 // cannot write to central dir +#define ZIP_EOPNFILE -16 // cannot open file +#define ZIP_EINVENTTYPE -17 // invalid entry type +#define ZIP_EMEMNOALLOC -18 // extracting data using no memory allocation +#define ZIP_ENOFILE -19 // file not found +#define ZIP_ENOPERM -20 // no permission +#define ZIP_EOOMEM -21 // out of memory +#define ZIP_EINVZIPNAME -22 // invalid zip archive name +#define ZIP_EMKDIR -23 // make dir error +#define ZIP_ESYMLINK -24 // symlink error +#define ZIP_ECLSZIP -25 // close archive error +#define ZIP_ECAPSIZE -26 // capacity size too small +#define ZIP_EFSEEK -27 // fseek error +#define ZIP_EFREAD -28 // fread error +#define ZIP_EFWRITE -29 // fwrite error + +/** + * Looks up the error message string coresponding to an error number. + * @param errnum error number + * @return error message string coresponding to errnum or NULL if error is not + * found. + */ +extern ZIP_EXPORT const char *zip_strerror(int errnum); + +/** + * @struct zip_t + * + * This data structure is used throughout the library to represent zip archive - + * forward declaration. + */ +struct zip_t; + +/** + * Opens zip archive with compression level using the given mode. + * + * @param zipname zip archive file name. + * @param level compression level (0-9 are the standard zlib-style levels). + * @param mode file access mode. + * - 'r': opens a file for reading/extracting (the file must exists). + * - 'w': creates an empty file for writing. + * - 'a': appends to an existing archive. + * + * @return the zip archive handler or NULL on error + */ +extern ZIP_EXPORT struct zip_t *zip_open(const char *zipname, int level, + char mode); + +/** + * Closes the zip archive, releases resources - always finalize. + * + * @param zip zip archive handler. + */ +extern ZIP_EXPORT void zip_close(struct zip_t *zip); + +/** + * Determines if the archive has a zip64 end of central directory headers. + * + * @param zip zip archive handler. + * + * @return the return code - 1 (true), 0 (false), negative number (< 0) on + * error. + */ +extern ZIP_EXPORT int zip_is64(struct zip_t *zip); + +/** + * Opens an entry by name in the zip archive. + * + * For zip archive opened in 'w' or 'a' mode the function will append + * a new entry. In readonly mode the function tries to locate the entry + * in global dictionary. + * + * @param zip zip archive handler. + * @param entryname an entry name in local dictionary. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_open(struct zip_t *zip, const char *entryname); + +/** + * Opens an entry by name in the zip archive. + * + * For zip archive opened in 'w' or 'a' mode the function will append + * a new entry. In readonly mode the function tries to locate the entry + * in global dictionary (case sensitive). + * + * @param zip zip archive handler. + * @param entryname an entry name in local dictionary (case sensitive). + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_opencasesensitive(struct zip_t *zip, + const char *entryname); + +/** + * Opens a new entry by index in the zip archive. + * + * This function is only valid if zip archive was opened in 'r' (readonly) mode. + * + * @param zip zip archive handler. + * @param index index in local dictionary. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_openbyindex(struct zip_t *zip, size_t index); + +/** + * Closes a zip entry, flushes buffer and releases resources. + * + * @param zip zip archive handler. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_close(struct zip_t *zip); + +/** + * Returns a local name of the current zip entry. + * + * The main difference between user's entry name and local entry name + * is optional relative path. + * Following .ZIP File Format Specification - the path stored MUST not contain + * a drive or device letter, or a leading slash. + * All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' + * for compatibility with Amiga and UNIX file systems etc. + * + * @param zip: zip archive handler. + * + * @return the pointer to the current zip entry name, or NULL on error. + */ +extern ZIP_EXPORT const char *zip_entry_name(struct zip_t *zip); + +/** + * Returns an index of the current zip entry. + * + * @param zip zip archive handler. + * + * @return the index on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT ssize_t zip_entry_index(struct zip_t *zip); + +/** + * Determines if the current zip entry is a directory entry. + * + * @param zip zip archive handler. + * + * @return the return code - 1 (true), 0 (false), negative number (< 0) on + * error. + */ +extern ZIP_EXPORT int zip_entry_isdir(struct zip_t *zip); + +/** + * Returns the uncompressed size of the current zip entry. + * Alias for zip_entry_uncomp_size (for backward compatibility). + * + * @param zip zip archive handler. + * + * @return the uncompressed size in bytes. + */ +extern ZIP_EXPORT unsigned long long zip_entry_size(struct zip_t *zip); + +/** + * Returns the uncompressed size of the current zip entry. + * + * @param zip zip archive handler. + * + * @return the uncompressed size in bytes. + */ +extern ZIP_EXPORT unsigned long long zip_entry_uncomp_size(struct zip_t *zip); + +/** + * Returns the compressed size of the current zip entry. + * + * @param zip zip archive handler. + * + * @return the compressed size in bytes. + */ +extern ZIP_EXPORT unsigned long long zip_entry_comp_size(struct zip_t *zip); + +/** + * Returns CRC-32 checksum of the current zip entry. + * + * @param zip zip archive handler. + * + * @return the CRC-32 checksum. + */ +extern ZIP_EXPORT unsigned int zip_entry_crc32(struct zip_t *zip); + +/** + * Compresses an input buffer for the current zip entry. + * + * @param zip zip archive handler. + * @param buf input buffer. + * @param bufsize input buffer size (in bytes). + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_write(struct zip_t *zip, const void *buf, + size_t bufsize); + +/** + * Compresses a file for the current zip entry. + * + * @param zip zip archive handler. + * @param filename input file. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_fwrite(struct zip_t *zip, const char *filename); + +/** + * Extracts the current zip entry into output buffer. + * + * The function allocates sufficient memory for a output buffer. + * + * @param zip zip archive handler. + * @param buf output buffer. + * @param bufsize output buffer size (in bytes). + * + * @note remember to release memory allocated for a output buffer. + * for large entries, please take a look at zip_entry_extract function. + * + * @return the return code - the number of bytes actually read on success. + * Otherwise a negative number (< 0) on error. + */ +extern ZIP_EXPORT ssize_t zip_entry_read(struct zip_t *zip, void **buf, + size_t *bufsize); + +/** + * Extracts the current zip entry into a memory buffer using no memory + * allocation. + * + * @param zip zip archive handler. + * @param buf preallocated output buffer. + * @param bufsize output buffer size (in bytes). + * + * @note ensure supplied output buffer is large enough. + * zip_entry_size function (returns uncompressed size for the current + * entry) can be handy to estimate how big buffer is needed. + * For large entries, please take a look at zip_entry_extract function. + * + * @return the return code - the number of bytes actually read on success. + * Otherwise a negative number (< 0) on error (e.g. bufsize is not large + * enough). + */ +extern ZIP_EXPORT ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, + size_t bufsize); + +/** + * Extracts the current zip entry into output file. + * + * @param zip zip archive handler. + * @param filename output file. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_entry_fread(struct zip_t *zip, const char *filename); + +/** + * Extracts the current zip entry using a callback function (on_extract). + * + * @param zip zip archive handler. + * @param on_extract callback function. + * @param arg opaque pointer (optional argument, which you can pass to the + * on_extract callback) + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int +zip_entry_extract(struct zip_t *zip, + size_t (*on_extract)(void *arg, uint64_t offset, + const void *data, size_t size), + void *arg); + +/** + * Returns the number of all entries (files and directories) in the zip archive. + * + * @param zip zip archive handler. + * + * @return the return code - the number of entries on success, negative number + * (< 0) on error. + */ +extern ZIP_EXPORT ssize_t zip_entries_total(struct zip_t *zip); + +/** + * Deletes zip archive entries. + * + * @param zip zip archive handler. + * @param entries array of zip archive entries to be deleted. + * @param len the number of entries to be deleted. + * @return the number of deleted entries, or negative number (< 0) on error. + */ +extern ZIP_EXPORT ssize_t zip_entries_delete(struct zip_t *zip, + char *const entries[], size_t len); + +/** + * Extracts a zip archive stream into directory. + * + * If on_extract is not NULL, the callback will be called after + * successfully extracted each zip entry. + * Returning a negative value from the callback will cause abort and return an + * error. The last argument (void *arg) is optional, which you can use to pass + * data to the on_extract callback. + * + * @param stream zip archive stream. + * @param size stream size. + * @param dir output directory. + * @param on_extract on extract callback. + * @param arg opaque pointer. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int +zip_stream_extract(const char *stream, size_t size, const char *dir, + int (*on_extract)(const char *filename, void *arg), + void *arg); + +/** + * Opens zip archive stream into memory. + * + * @param stream zip archive stream. + * @param size stream size. + * + * @return the zip archive handler or NULL on error + */ +extern ZIP_EXPORT struct zip_t *zip_stream_open(const char *stream, size_t size, + int level, char mode); + +/** + * Copy zip archive stream output buffer. + * + * @param zip zip archive handler. + * @param buf output buffer. User should free buf. + * @param bufsize output buffer size (in bytes). + * + * @return copy size + */ +extern ZIP_EXPORT ssize_t zip_stream_copy(struct zip_t *zip, void **buf, + size_t *bufsize); + +/** + * Close zip archive releases resources. + * + * @param zip zip archive handler. + * + * @return + */ +extern ZIP_EXPORT void zip_stream_close(struct zip_t *zip); + +/** + * Creates a new archive and puts files into a single zip archive. + * + * @param zipname zip archive file. + * @param filenames input files. + * @param len: number of input files. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_create(const char *zipname, const char *filenames[], + size_t len); + +/** + * Extracts a zip archive file into directory. + * + * If on_extract_entry is not NULL, the callback will be called after + * successfully extracted each zip entry. + * Returning a negative value from the callback will cause abort and return an + * error. The last argument (void *arg) is optional, which you can use to pass + * data to the on_extract_entry callback. + * + * @param zipname zip archive file. + * @param dir output directory. + * @param on_extract_entry on extract callback. + * @param arg opaque pointer. + * + * @return the return code - 0 on success, negative number (< 0) on error. + */ +extern ZIP_EXPORT int zip_extract(const char *zipname, const char *dir, + int (*on_extract_entry)(const char *filename, + void *arg), + void *arg); +/** @} */ +#ifdef __cplusplus +} +#endif + +#endif diff --git a/TheOtherUpdater/packages.config b/TheOtherUpdater/packages.config new file mode 100644 index 00000000..78af10df --- /dev/null +++ b/TheOtherUpdater/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/nuget.config b/nuget.config index 9074a9b8..f64757a6 100644 --- a/nuget.config +++ b/nuget.config @@ -3,7 +3,6 @@ - - + \ No newline at end of file diff --git a/packages.lock.json b/packages.lock.json deleted file mode 100644 index e013e419..00000000 --- a/packages.lock.json +++ /dev/null @@ -1,913 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net6.0": { - "AmongUs.GameLibs.Steam": { - "type": "Direct", - "requested": "[2023.7.11, )", - "resolved": "2023.7.11", - "contentHash": "e5zbU+4AYnp1zAQDizO5GRIh1kemkgCa8rFVAcr9bxeupkBu5dwwdHxArWv/pUybIJTZfOPjkOnicZ2qKWLX7g==" - }, - "BepInEx.IL2CPP.MSBuild": { - "type": "Direct", - "requested": "[2.1.0-rc.1, )", - "resolved": "2.1.0-rc.1", - "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA==" - }, - "BepInEx.Unity.IL2CPP": { - "type": "Direct", - "requested": "[6.0.0-be.671, )", - "resolved": "6.0.0-be.671", - "contentHash": "XpmrBitEO7pe5YG9VHqn0nuelEF5Dp0Rpkxa2F7PFZF1a00KSsdCL809++HYnGzLumNOCIt7mO7yyDNP5k25mw==", - "dependencies": { - "BepInEx.Core": "6.0.0-be.671", - "BepInEx.Unity.Common": "6.0.0-be.671", - "HarmonyX": "2.10.1", - "Iced": "1.18.0", - "Il2CppInterop.Generator": "1.4.6-ci.367", - "Il2CppInterop.HarmonySupport": "1.4.6-ci.367", - "Il2CppInterop.Runtime": "1.4.6-ci.367", - "MonoMod.RuntimeDetour": "22.5.1.1", - "Samboy063.Cpp2IL.Core": "2022.1.0-development.866" - } - }, - "Disarm": { - "type": "Direct", - "requested": "[2022.1.0-master.26, )", - "resolved": "2022.1.0-master.26", - "contentHash": "YnZEbRGr0nG+N3G8WbRQ4Lkg8dTD3oso9iJlCVBmyhEyhLyqs+drBs1kWQbQqFPnb9mi/RJ++R9bPb+L3HF03Q==" - }, - "Reactor": { - "type": "Direct", - "requested": "[2.2.0, )", - "resolved": "2.2.0", - "contentHash": "foMHya01tmr//3tw+kO7FmY1ojnR0m+ShMU6sxogbnWeO85lmX3QM8aSIsYeAhtJSThf6Ben6iTM4O0KgVcmqw==", - "dependencies": { - "BepInEx.Unity.IL2CPP": "6.0.0-be.670" - } - }, - "Samboy063.Cpp2IL.Core": { - "type": "Direct", - "requested": "[2022.1.0-development.886, )", - "resolved": "2022.1.0-development.886", - "contentHash": "N6A+u0fb4IBRvKdAzbprjb4DIsim7oc4LElrK5C+9rEI27kxq5iXw99zotx4PZ17ZeIC0Lzc8aYx8qg912rlcQ==", - "dependencies": { - "AsmResolver.DotNet": "5.1.0", - "Disarm": "2022.1.0-master.26", - "Iced": "1.18.0", - "Samboy063.LibCpp2IL": "2022.1.0-development.886", - "StableNameDotNet": "0.1.0-development.886", - "js6pak.Gee.External.Capstone": "2.1.0" - } - }, - "Samboy063.LibCpp2IL": { - "type": "Direct", - "requested": "[2022.1.0-development.886, )", - "resolved": "2022.1.0-development.886", - "contentHash": "Rs77LVSqqnZSRdelbU9jxIRA5SEn1Os7J0NS/6Fi4td71X8JUVOfiC7NX0iMTBaLvduKvg6K0swuxqhZ4stRJQ==", - "dependencies": { - "AssetRipper.VersionUtilities": "1.3.1", - "Samboy063.WasmDisassembler": "2022.1.0-development.886" - } - }, - "Samboy063.WasmDisassembler": { - "type": "Direct", - "requested": "[2022.1.0-development.886, )", - "resolved": "2022.1.0-development.886", - "contentHash": "J/WEuSkbMJbno6/BmlDYIKLqGfBflv3sKjx+qiYh4oxhjC76STB9ZSoTpV4Rj9Zgqbg3GZG8leKMiPMiMPo0Ow==" - }, - "StableNameDotNet": { - "type": "Direct", - "requested": "[0.1.0-development.886, )", - "resolved": "0.1.0-development.886", - "contentHash": "YFYhREaRaPkMlhf33ljpbVi/ZH6Z/4nRGSDc9Qut6JC14FyLy2ltSrXJnFeHBhogimGHeFnwY7bcL046HqiEDg==" - }, - "AsmResolver": { - "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "7PjujQzgQ3wjzqZYT4CY8SV6zx7FY6swIwj3Yk4QLolLqo9sBPb7FLF3W30QFvCsCkNfiVWXlSbeZKs4xGgQOQ==" - }, - "AsmResolver.DotNet": { - "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "oKrBU94OaSrbbTwydvpLRFalYxozrNXGkl13nIkm823ZFQtPNYOiOMJb5DQLvkCJlWyis7q865tg803T5zg9IA==", - "dependencies": { - "AsmResolver.PE": "5.1.0", - "System.Text.Json": "6.0.7" - } - }, - "AsmResolver.PE": { - "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "XD3iAgLSInJIODKUUlpHWXf8MR9H1SFMb1lsmabb4GxxxnDQRPjMxjglv2NOCjQQuNB2Oh0bvjHE7ewf82UqyQ==", - "dependencies": { - "AsmResolver.PE.File": "5.1.0" - } - }, - "AsmResolver.PE.File": { - "type": "Transitive", - "resolved": "5.1.0", - "contentHash": "YituBYe0Fh471sXQMfu+f4tWKX/JZvRwrX6g/SVsr4XkUIUzYi/aGT3/QvjHoYx19fE1KYOB6zBKqPkkOK7HPw==", - "dependencies": { - "AsmResolver": "5.1.0" - } - }, - "AssetRipper.VersionUtilities": { - "type": "Transitive", - "resolved": "1.3.1", - "contentHash": "/1D18NOpqm7rS7+qVUbAReVMNWwgDuYpsnf0RkX1Aah/I0a0irqldoFJ+Kku7YdbSm0zqD+Z6iYUGKoP3GwTNQ==" - }, - "BepInEx.Core": { - "type": "Transitive", - "resolved": "6.0.0-be.671", - "contentHash": "Hp9QsgwtlGuNULFq5tF8YHrVD5R5WA5nMgFTJbcScWsGJDq7KPEhiLNGvKHAxcmMM8GA0CKM+jn8cJPtlMKvNQ==", - "dependencies": { - "HarmonyX": "2.10.1", - "MonoMod.Utils": "22.5.1.1", - "SemanticVersioning": "2.0.2" - } - }, - "BepInEx.Unity.Common": { - "type": "Transitive", - "resolved": "6.0.0-be.671", - "contentHash": "05W7ERsHizZl0MacTAhiGkcihZl2b0DYBP0e6gA1Vzoay+teQ/mHy3zorGu1r8lLWlesH4LXl89HwFjrMA1ZKw==", - "dependencies": { - "AssetRipper.VersionUtilities": "1.2.1", - "MonoMod.Utils": "22.5.1.1" - } - }, - "HarmonyX": { - "type": "Transitive", - "resolved": "2.10.1", - "contentHash": "9LodMC9Y0u1TW96eKJoWrFJFpmzbgojEO38/Q+e7c1mFPhmHt8xcR8qhI06iF1rf0Dnsk+hqENFVSgbtwl/bEw==", - "dependencies": { - "MonoMod.RuntimeDetour": "22.3.23.4", - "System.Reflection.Emit": "4.7.0" - } - }, - "Iced": { - "type": "Transitive", - "resolved": "1.18.0", - "contentHash": "G60lZOvbvqttA+SBSv/yY6/wUboXKJlkffhSNR9iOrx0M5gpcK1TRr6xrFR+qAhqIAhvrsPF1jkn9fYb4lEufQ==" - }, - "Il2CppInterop.Common": { - "type": "Transitive", - "resolved": "1.4.6-ci.367", - "contentHash": "zviSAk0COGdxx1KLTJlSi6lyvfRjbPO4qhj9RvLAU5zP74hwAkjhim0WsSo9clkkyGS+KXDrjnUEHqfXuMMm9Q==", - "dependencies": { - "Iced": "1.17.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "System.Net.Http": "4.3.4" - } - }, - "Il2CppInterop.Generator": { - "type": "Transitive", - "resolved": "1.4.6-ci.367", - "contentHash": "VP/1LX3wEy0/5BCrgggzIm9niyRGp/zjXaxFJip1D2bvM7oIXwK0LR0Rp8BE/uxKW8aQjVYxxwVwsdXPS/1KZw==", - "dependencies": { - "Il2CppInterop.Common": "1.4.6-ci.367", - "Mono.Cecil": "0.11.3" - } - }, - "Il2CppInterop.HarmonySupport": { - "type": "Transitive", - "resolved": "1.4.6-ci.367", - "contentHash": "rKb4Bt4cZQNWtI1L1/n/m5jJelP8pwAcQHwN/gaUAcobnapGZPJvRp8gyLQRvthGm3sxeleIQelEsv6L+21A2g==", - "dependencies": { - "HarmonyX": "2.10.0", - "Il2CppInterop.Runtime": "1.4.6-ci.367" - } - }, - "Il2CppInterop.Runtime": { - "type": "Transitive", - "resolved": "1.4.6-ci.367", - "contentHash": "Wb4rj/ESlfiYljfVXskndbkYNSX1WxPcsylrYex39QnVzujk6tRQUbHLA7PZn509z6P5wYbqJvhodzJ+w9Kk4A==", - "dependencies": { - "Iced": "1.17.0", - "Il2CppInterop.Common": "1.4.6-ci.367" - } - }, - "js6pak.Gee.External.Capstone": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "YYpq7NM50bSSVUDjXyV/eiITk6syXqItPjKBOb3jEWS6RFsk0DNhpWMPW6b3hKDmArARuWDU6S2pVu1IeVrvIA==" - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, - "Mono.Cecil": { - "type": "Transitive", - "resolved": "0.11.4", - "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ==" - }, - "MonoMod.RuntimeDetour": { - "type": "Transitive", - "resolved": "22.5.1.1", - "contentHash": "WG5zLRuAr8KJEnIkKTuIG1OJCrGIT3pjvnAD43E0FDchHf3Dp985MF/8tmIQvAzCZV87JNs6QKeGGqmwDmpXpw==", - "dependencies": { - "Mono.Cecil": "0.11.4", - "MonoMod.Utils": "22.5.1.1", - "System.Collections.NonGeneric": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.7.0", - "System.Reflection.Emit.Lightweight": "4.7.0", - "System.Reflection.TypeExtensions": "4.7.0" - } - }, - "MonoMod.Utils": { - "type": "Transitive", - "resolved": "22.5.1.1", - "contentHash": "vBObO1atXxhi2C4AuC53y87Bqeogi9xIrD1Ym3YWr5uxc8Nrm8SrsFeD1i3x04R999+XQ3FdeHrbXScyWYEHqQ==", - "dependencies": { - "Mono.Cecil": "0.11.4", - "System.Collections.NonGeneric": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.7.0", - "System.Reflection.Emit.Lightweight": "4.7.0", - "System.Reflection.TypeExtensions": "4.7.0" - } - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" - }, - "SemanticVersioning": { - "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "AucBYo3DSI0IDxdUjKksBcQJXPHyoPyrCXYURW1WDsLI4M65Ar/goSHjdnHOAY9MiYDNKqDlIgaYm+zL2hA1KA==" - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - } - } - } -} \ No newline at end of file diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/AmongUs.GameLibs.Steam.2023.7.11.nupkg b/packages/AmongUs.GameLibs.Steam.2023.7.11/AmongUs.GameLibs.Steam.2023.7.11.nupkg deleted file mode 100644 index e91df337..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/AmongUs.GameLibs.Steam.2023.7.11.nupkg and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUs.GameLibs.Steam.props b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUs.GameLibs.Steam.props deleted file mode 100644 index e2924283..00000000 --- a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUs.GameLibs.Steam.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp-firstpass.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp-firstpass.dll deleted file mode 100644 index d71a5fd9..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp-firstpass.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp.dll deleted file mode 100644 index 4eb643db..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Assembly-CSharp.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Hazel.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Hazel.dll deleted file mode 100644 index 6a836efa..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Hazel.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Mono.Security.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Mono.Security.dll deleted file mode 100644 index 53d6dc13..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Mono.Security.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Newtonsoft.Json.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Newtonsoft.Json.dll deleted file mode 100644 index 7ef22d48..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Core.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Core.dll deleted file mode 100644 index ac48e000..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Core.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Windows.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Windows.dll deleted file mode 100644 index 50a7f26b..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Rewired_Windows.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll deleted file mode 100644 index 88f25104..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Buffers.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Buffers.dll deleted file mode 100644 index e919dbf2..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Buffers.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Collections.Immutable.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Collections.Immutable.dll deleted file mode 100644 index b6a810e4..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Collections.Immutable.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Memory.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Memory.dll deleted file mode 100644 index 2c65e52e..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Memory.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Reflection.Metadata.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Reflection.Metadata.dll deleted file mode 100644 index 78d620c9..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Reflection.Metadata.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Json.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Json.dll deleted file mode 100644 index 11cea042..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Json.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Threading.Tasks.Extensions.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Threading.Tasks.Extensions.dll deleted file mode 100644 index 75f2f60b..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Threading.Tasks.Extensions.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Unity.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Unity.dll deleted file mode 100644 index 9ed40bd6..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.Unity.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.dll deleted file mode 100644 index df6369a5..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Core.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Core.dll deleted file mode 100644 index cf620d3e..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Core.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Data.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Data.dll deleted file mode 100644 index 8af8a82c..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Data.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Net.Http.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Net.Http.dll deleted file mode 100644 index 7aed4f09..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Net.Http.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.Linq.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.Linq.dll deleted file mode 100644 index b9f1536b..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.Linq.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.dll deleted file mode 100644 index 6070e864..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Xml.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Addressables.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Addressables.dll deleted file mode 100644 index f93840fa..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Addressables.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.ResourceManager.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.ResourceManager.dll deleted file mode 100644 index 942a5d7f..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.ResourceManager.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Analytics.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Analytics.dll deleted file mode 100644 index b0a6cd76..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Analytics.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Configuration.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Configuration.dll deleted file mode 100644 index 8520cb4d..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Configuration.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Device.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Device.dll deleted file mode 100644 index 1703339d..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Device.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Internal.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Internal.dll deleted file mode 100644 index bdc21491..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Internal.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Registration.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Registration.dll deleted file mode 100644 index 294f0de4..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Registration.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Scheduler.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Scheduler.dll deleted file mode 100644 index d51ba5b4..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Scheduler.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Telemetry.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Telemetry.dll deleted file mode 100644 index 804ca25b..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Telemetry.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AndroidJNIModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AndroidJNIModule.dll deleted file mode 100644 index e786ac35..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AndroidJNIModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AnimationModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AnimationModule.dll deleted file mode 100644 index ac95b9ea..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AnimationModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AudioModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AudioModule.dll deleted file mode 100644 index caded64a..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AudioModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.CoreModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.CoreModule.dll deleted file mode 100644 index 08b59e35..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.CoreModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ParticleSystemModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ParticleSystemModule.dll deleted file mode 100644 index d3e04499..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ParticleSystemModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Physics2DModule.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Physics2DModule.dll deleted file mode 100644 index de847e1b..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Physics2DModule.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.dll deleted file mode 100644 index a3ab72cf..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/io.sentry.unity.runtime.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/io.sentry.unity.runtime.dll deleted file mode 100644 index a9389584..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/io.sentry.unity.runtime.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/mscorlib.dll b/packages/AmongUs.GameLibs.Steam.2023.7.11/build/mscorlib.dll deleted file mode 100644 index e29655ba..00000000 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/mscorlib.dll and /dev/null differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/AmongUs.GameLibs.Steam.2024.3.5.nupkg b/packages/AmongUs.GameLibs.Steam.2024.3.5/AmongUs.GameLibs.Steam.2024.3.5.nupkg new file mode 100644 index 00000000..7575a5d7 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/AmongUs.GameLibs.Steam.2024.3.5.nupkg differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AddressablesPlayAssetDelivery.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AddressablesPlayAssetDelivery.dll similarity index 70% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/AddressablesPlayAssetDelivery.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/AddressablesPlayAssetDelivery.dll index 6fcc5bc8..8c5a8c7c 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AddressablesPlayAssetDelivery.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AddressablesPlayAssetDelivery.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUs.GameLibs.Steam.props b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUs.GameLibs.Steam.props new file mode 100644 index 00000000..37bde6ec --- /dev/null +++ b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUs.GameLibs.Steam.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUsCaching.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUsCaching.dll similarity index 79% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUsCaching.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUsCaching.dll index 105a015e..dc9f8863 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AmongUsCaching.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AmongUsCaching.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AppleAuth.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AppleAuth.dll similarity index 85% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/AppleAuth.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/AppleAuth.dll index c324a455..ec7045b3 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/AppleAuth.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/AppleAuth.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp-firstpass.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp-firstpass.dll new file mode 100644 index 00000000..f3c87576 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp-firstpass.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp.dll new file mode 100644 index 00000000..0ead8e1a Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Assembly-CSharp.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/CsvHelper.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/CsvHelper.dll new file mode 100644 index 00000000..a44e0bdd Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/CsvHelper.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Hazel.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Hazel.dll new file mode 100644 index 00000000..4bdc7361 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Hazel.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Mono.Security.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Mono.Security.dll new file mode 100644 index 00000000..d20aa047 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Mono.Security.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Newtonsoft.Json.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Newtonsoft.Json.dll new file mode 100644 index 00000000..66834101 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Newtonsoft.Json.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/QRCoder.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/QRCoder.dll similarity index 73% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/QRCoder.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/QRCoder.dll index 91cf8870..81ddda87 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/QRCoder.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/QRCoder.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Core.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Core.dll new file mode 100644 index 00000000..da47f3cf Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Core.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Windows.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Windows.dll new file mode 100644 index 00000000..6b9ff4b7 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Rewired_Windows.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll new file mode 100644 index 00000000..ad5cbcc0 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Buffers.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Buffers.dll new file mode 100644 index 00000000..a18e84ac Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Buffers.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Collections.Immutable.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Collections.Immutable.dll new file mode 100644 index 00000000..d05c2f20 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Collections.Immutable.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Memory.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Memory.dll new file mode 100644 index 00000000..7ef57888 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Memory.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Numerics.Vectors.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Numerics.Vectors.dll similarity index 66% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Numerics.Vectors.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Numerics.Vectors.dll index 8e3b8f79..328b8146 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Numerics.Vectors.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Numerics.Vectors.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Reflection.Metadata.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Reflection.Metadata.dll new file mode 100644 index 00000000..4fa5ff87 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Reflection.Metadata.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll similarity index 66% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll index 333623ab..2cb21319 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Runtime.CompilerServices.Unsafe.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Encodings.Web.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Encodings.Web.dll similarity index 58% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Encodings.Web.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Encodings.Web.dll index dd90cf9e..fd86063c 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Sentry.System.Text.Encodings.Web.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Encodings.Web.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Json.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Json.dll new file mode 100644 index 00000000..27243714 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Text.Json.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Threading.Tasks.Extensions.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Threading.Tasks.Extensions.dll new file mode 100644 index 00000000..78c03545 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.System.Threading.Tasks.Extensions.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Unity.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Unity.dll new file mode 100644 index 00000000..4f700639 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.Unity.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.dll new file mode 100644 index 00000000..517274db Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Sentry.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Configuration.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Configuration.dll similarity index 58% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Configuration.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Configuration.dll index 4e75c7c1..412618e4 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Configuration.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Configuration.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Core.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Core.dll new file mode 100644 index 00000000..dd7dadbb Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Core.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Data.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Data.dll new file mode 100644 index 00000000..774f58fa Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Data.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Net.Http.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Net.Http.dll new file mode 100644 index 00000000..fe977ce6 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Net.Http.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Numerics.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Numerics.dll similarity index 51% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Numerics.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Numerics.dll index 25ab435d..de39b421 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Numerics.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Numerics.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Runtime.Serialization.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Runtime.Serialization.dll similarity index 58% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Runtime.Serialization.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Runtime.Serialization.dll index e269caf2..7ceb9681 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.Runtime.Serialization.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Runtime.Serialization.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.Linq.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.Linq.dll new file mode 100644 index 00000000..f8fe2a57 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.Linq.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.dll new file mode 100644 index 00000000..5e7d8b32 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.Xml.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.dll similarity index 53% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.dll index 954923e1..43e506f5 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/System.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/System.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Addressables.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Addressables.dll new file mode 100644 index 00000000..f1d8ccbc Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Addressables.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Analytics.DataPrivacy.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Analytics.DataPrivacy.dll similarity index 81% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Analytics.DataPrivacy.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Analytics.DataPrivacy.dll index c1673690..22ff2e67 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Analytics.DataPrivacy.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Analytics.DataPrivacy.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ProBuilder.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ProBuilder.dll new file mode 100644 index 00000000..9a5846d5 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ProBuilder.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ResourceManager.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ResourceManager.dll new file mode 100644 index 00000000..173351bf Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.ResourceManager.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Configuration.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Configuration.dll new file mode 100644 index 00000000..c6d4b4c6 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Configuration.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Device.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Device.dll new file mode 100644 index 00000000..029a7843 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Device.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Environments.Internal.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Environments.Internal.dll similarity index 84% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Environments.Internal.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Environments.Internal.dll index e9013433..13222698 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Environments.Internal.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Environments.Internal.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Internal.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Internal.dll new file mode 100644 index 00000000..ecaa6030 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Internal.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Registration.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Registration.dll new file mode 100644 index 00000000..e74ab862 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Registration.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Scheduler.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Scheduler.dll new file mode 100644 index 00000000..9c278136 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Scheduler.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Telemetry.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Telemetry.dll new file mode 100644 index 00000000..1ad47f8a Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Telemetry.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Threading.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Threading.dll similarity index 85% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Threading.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Threading.dll index 2fc3b724..720a889e 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.Services.Core.Threading.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.Threading.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.dll new file mode 100644 index 00000000..ed449af1 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.Services.Core.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.TextMeshPro.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.TextMeshPro.dll similarity index 62% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.TextMeshPro.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.TextMeshPro.dll index 631ab6fe..d9150e19 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/Unity.TextMeshPro.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/Unity.TextMeshPro.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AIModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AIModule.dll similarity index 78% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AIModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AIModule.dll index c246a0fc..5aa662cd 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AIModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AIModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AndroidJNIModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AndroidJNIModule.dll new file mode 100644 index 00000000..34750797 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AndroidJNIModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AssetBundleModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AssetBundleModule.dll similarity index 65% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AssetBundleModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AssetBundleModule.dll index cc89cae2..ea1abbb6 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.AssetBundleModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AssetBundleModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AudioModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AudioModule.dll new file mode 100644 index 00000000..778f85ec Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.AudioModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.CoreModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.CoreModule.dll new file mode 100644 index 00000000..ffe72552 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.CoreModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.DirectorModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.DirectorModule.dll similarity index 81% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.DirectorModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.DirectorModule.dll index a7e7bee4..ced09601 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.DirectorModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.DirectorModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.GridModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.GridModule.dll similarity index 67% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.GridModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.GridModule.dll index 06684674..221623af 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.GridModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.GridModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.IMGUIModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.IMGUIModule.dll similarity index 57% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.IMGUIModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.IMGUIModule.dll index d48eac16..7110ce23 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.IMGUIModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.IMGUIModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ImageConversionModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ImageConversionModule.dll similarity index 84% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ImageConversionModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ImageConversionModule.dll index 73ce1533..c2631fff 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ImageConversionModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ImageConversionModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputLegacyModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputLegacyModule.dll similarity index 67% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputLegacyModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputLegacyModule.dll index e7fa4640..63a914bd 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputLegacyModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputLegacyModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputModule.dll similarity index 82% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputModule.dll index 81c2ea4d..4449fad5 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.InputModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.InputModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.JSONSerializeModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.JSONSerializeModule.dll similarity index 79% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.JSONSerializeModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.JSONSerializeModule.dll index d75cbd4d..e571cef2 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.JSONSerializeModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.JSONSerializeModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ParticleSystemModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ParticleSystemModule.dll new file mode 100644 index 00000000..2a9ea854 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ParticleSystemModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Physics2DModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Physics2DModule.dll new file mode 100644 index 00000000..5b0a88a9 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Physics2DModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.PhysicsModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.PhysicsModule.dll similarity index 58% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.PhysicsModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.PhysicsModule.dll index 1e353bf4..b186ba4b 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.PhysicsModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.PhysicsModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.SecurityCore.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.SecurityCore.dll similarity index 88% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.SecurityCore.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.SecurityCore.dll index 21dcb13a..95bb86ae 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.Purchasing.SecurityCore.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.SecurityCore.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.dll new file mode 100644 index 00000000..8e54bc37 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.Purchasing.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ScreenCaptureModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ScreenCaptureModule.dll similarity index 81% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ScreenCaptureModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ScreenCaptureModule.dll index 7fe4cd44..e1adea03 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.ScreenCaptureModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.ScreenCaptureModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.SharedInternalsModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SharedInternalsModule.dll similarity index 70% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.SharedInternalsModule.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SharedInternalsModule.dll index f1f4c38b..24ce692d 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.SharedInternalsModule.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SharedInternalsModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteMaskModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteMaskModule.dll new file mode 100644 index 00000000..5dea6549 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteMaskModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteShapeModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteShapeModule.dll new file mode 100644 index 00000000..cc69f7e4 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SpriteShapeModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SubsystemsModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SubsystemsModule.dll new file mode 100644 index 00000000..00fcbeaf Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.SubsystemsModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TerrainModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TerrainModule.dll new file mode 100644 index 00000000..7fa8eb1a Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TerrainModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextCoreModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextCoreModule.dll new file mode 100644 index 00000000..fa8a26f3 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextCoreModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextRenderingModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextRenderingModule.dll new file mode 100644 index 00000000..6417e1c0 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TextRenderingModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TilemapModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TilemapModule.dll new file mode 100644 index 00000000..233064ff Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.TilemapModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UI.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UI.dll new file mode 100644 index 00000000..fb50b053 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UI.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIElementsNativeModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIElementsNativeModule.dll new file mode 100644 index 00000000..0a13578d Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIElementsNativeModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIModule.dll new file mode 100644 index 00000000..f599dc6e Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UIModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityAnalyticsModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityAnalyticsModule.dll new file mode 100644 index 00000000..3463a2b5 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityAnalyticsModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestAssetBundleModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestAssetBundleModule.dll new file mode 100644 index 00000000..4b0d6185 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestAssetBundleModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestModule.dll new file mode 100644 index 00000000..e66987c9 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.UnityWebRequestModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VFXModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VFXModule.dll new file mode 100644 index 00000000..36d84b32 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VFXModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VRModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VRModule.dll new file mode 100644 index 00000000..1ccbd5c1 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VRModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VideoModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VideoModule.dll new file mode 100644 index 00000000..9755f8f9 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.VideoModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.XRModule.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.XRModule.dll new file mode 100644 index 00000000..3f2d4f67 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.XRModule.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.dll similarity index 91% rename from packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.dll rename to packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.dll index 9aa4ffc5..c4b09b9c 100644 Binary files a/packages/AmongUs.GameLibs.Steam.2023.7.11/build/UnityEngine.dll and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/UnityEngine.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/io.sentry.unity.runtime.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/io.sentry.unity.runtime.dll new file mode 100644 index 00000000..a52cbdd5 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/io.sentry.unity.runtime.dll differ diff --git a/packages/AmongUs.GameLibs.Steam.2024.3.5/build/mscorlib.dll b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/mscorlib.dll new file mode 100644 index 00000000..c90c40f1 Binary files /dev/null and b/packages/AmongUs.GameLibs.Steam.2024.3.5/build/mscorlib.dll differ