From 6a48b1299981145ffde9c1487f48023a065e4cde Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 25 Mar 2018 03:25:04 +0300 Subject: [PATCH 01/50] Fixed typo in the error message: it's YM2612 is OPN2 which is not OPL --- src/sound/mididevices/music_opnmidi_mididevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/mididevices/music_opnmidi_mididevice.cpp b/src/sound/mididevices/music_opnmidi_mididevice.cpp index 84c3c4d26..0d47646cd 100644 --- a/src/sound/mididevices/music_opnmidi_mididevice.cpp +++ b/src/sound/mididevices/music_opnmidi_mididevice.cpp @@ -70,7 +70,7 @@ OPNMIDIDevice::OPNMIDIDevice(const char *args) int lump = Wads.CheckNumForFullName("xg.wopn"); if (lump < 0) { - I_Error("No OPL bank found"); + I_Error("No OPN bank found"); } FMemLump data = Wads.ReadLump(lump); opn2_openBankData(Renderer, data.GetMem(), data.GetSize()); From 892033931e5dd72476ac9815ba2eb618c6438d41 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 25 Mar 2018 03:26:41 +0300 Subject: [PATCH 02/50] Fixed double-increment and use a safer way to fetch a bank names (in case of new bank will be added (or removed) on ADLMIDI side, no need to change the count of banks in "some deep place" of code) --- src/menu/menudef.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index ea410f571..c0c538088 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -1381,7 +1381,11 @@ static void InitCrosshairsList() // Initialize the music configuration submenus // //============================================================================= -extern const char* const banknames[74]; +extern "C" +{ + extern int adl_getBanksCount(); + extern const char *const *adl_getBankNames(); +} static void InitMusicMenus() { @@ -1427,11 +1431,12 @@ static void InitMusicMenus() { if (soundfonts.Size() > 0) { - for(int i=0;i<74;i++) + int adl_banks_count = adl_getBanksCount(); + const char *const *adl_bank_names = adl_getBankNames(); + for(int i=0; i < adl_banks_count; i++) { - auto it = CreateOptionMenuItemCommand(banknames[i], FStringf("adl_bank %d", i), true); + auto it = CreateOptionMenuItemCommand(adl_bank_names[i], FStringf("adl_bank %d", i), true); static_cast(*menu)->mItems.Push(it); - i++; } } } From 5a7b53a865c2b0a1bb1cfc4f2c8b027ad47f0d81 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 25 Mar 2018 04:14:39 +0300 Subject: [PATCH 03/50] ADL&OPN: More setup: Chips count and Volume model! Notes: * ADL: The DMX volume model was set as default to unify volumes on all bank. Otherwise, if you will use 'Generic' or 'Win9x', the sound will became too loud than wanted. Each bank has own default volume model which is used when 'Auto' is set. * ADL: 6 chips is optimal to work with default banks * OPN: 8 chips are set to provide 48 polyphony channels. (each OPN2 chip has 6 channels only) * Text files: junk spaces from end of lines are was auto-removed. --- .../mididevices/music_adlmidi_mididevice.cpp | 20 ++- .../mididevices/music_opnmidi_mididevice.cpp | 11 +- wadsrc/static/language.enu | 75 +++++---- wadsrc/static/menudef.txt | 149 ++++++++++-------- 4 files changed, 156 insertions(+), 99 deletions(-) diff --git a/src/sound/mididevices/music_adlmidi_mididevice.cpp b/src/sound/mididevices/music_adlmidi_mididevice.cpp index 21ae38f94..d878bfe1f 100644 --- a/src/sound/mididevices/music_adlmidi_mididevice.cpp +++ b/src/sound/mididevices/music_adlmidi_mididevice.cpp @@ -54,6 +54,14 @@ enum ME_PITCHWHEEL = 0xE0 }; +CUSTOM_CVAR(Int, adl_chips_count, 6, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +{ + if (currSong != nullptr && currSong->GetDeviceType() == MDEV_ADL) + { + MIDIDeviceChanged(-1, true); + } +} + CUSTOM_CVAR(Int, adl_bank, 14, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (currSong != nullptr && currSong->GetDeviceType() == MDEV_ADL) @@ -62,6 +70,14 @@ CUSTOM_CVAR(Int, adl_bank, 14, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) } } +CUSTOM_CVAR(Int, adl_volume_model, ADLMIDI_VolumeModel_DMX, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +{ + if (currSong != nullptr && currSong->GetDeviceType() == MDEV_ADL) + { + MIDIDeviceChanged(-1, true); + } +} + //========================================================================== // // ADLMIDIDevice Constructor @@ -74,7 +90,9 @@ ADLMIDIDevice::ADLMIDIDevice(const char *args) Renderer = adl_init(44100); // todo: make it configurable if (Renderer != nullptr) { - adl_setBank(Renderer, 14); + adl_setBank(Renderer, (int)adl_bank); + adl_setNumChips(Renderer, (int)adl_chips_count); + adl_setVolumeRangeModel(Renderer, (int)adl_volume_model); } } diff --git a/src/sound/mididevices/music_opnmidi_mididevice.cpp b/src/sound/mididevices/music_opnmidi_mididevice.cpp index 0d47646cd..f083ff634 100644 --- a/src/sound/mididevices/music_opnmidi_mididevice.cpp +++ b/src/sound/mididevices/music_opnmidi_mididevice.cpp @@ -55,6 +55,14 @@ enum ME_PITCHWHEEL = 0xE0 }; +CUSTOM_CVAR(Int, opn_chips_count, 8, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +{ + if (currSong != nullptr && currSong->GetDeviceType() == MDEV_OPN) + { + MIDIDeviceChanged(-1, true); + } +} + //========================================================================== // // OPNMIDIDevice Constructor @@ -73,7 +81,8 @@ OPNMIDIDevice::OPNMIDIDevice(const char *args) I_Error("No OPN bank found"); } FMemLump data = Wads.ReadLump(lump); - opn2_openBankData(Renderer, data.GetMem(), data.GetSize()); + opn2_openBankData(Renderer, data.GetMem(), (long)data.GetSize()); + opn2_setNumChips(Renderer, opn_chips_count); } } diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 6feba6fa4..da16d83e4 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -792,31 +792,31 @@ OB_MPPSKULLROD = "%k poured %p hellstaff on %o."; OB_MPPPHOENIXROD = "%o was burned down by %k's phoenix staff."; OB_MPPMACE = "%o was squished by %k's giant mace sphere."; -OB_MPFWEAPFIST = "%o was beaten to a pulp by %k's bare fists."; -OB_MPFWEAPAXE = "%o got the axe from %k."; -OB_MPFWEAPHAMMERM = "%o had %p head caved in by %k's hammer."; -OB_MPFWEAPHAMMERR = "%o's soul was forged anew by %k's hammer."; -OB_MPFWEAPQUIETUS = "%o was silenced by %k's mighty Quietus."; -OB_MPCWEAPMACE = "%o got a mace to the face from %k."; -OB_MPCWEAPSTAFFM = "%o was bitten by %k's serpent staff."; -OB_MPCWEAPSTAFFR = "%o choked on %k's serpent staff."; -OB_MPCWEAPFLAME = "%o was lit up by %k's flames."; -OB_MPCWEAPWRAITHVERGE = "%o was cleansed by %k's Wraithverge."; -OB_MPMWEAPWAND = "%o took one too many sapphire beams from %k."; -OB_MPMWEAPFROST = "%o was turned into a frosty fellow by %k."; -OB_MPMWEAPLIGHTNING = "%o recieved a shocking revelation from %k."; +OB_MPFWEAPFIST = "%o was beaten to a pulp by %k's bare fists."; +OB_MPFWEAPAXE = "%o got the axe from %k."; +OB_MPFWEAPHAMMERM = "%o had %p head caved in by %k's hammer."; +OB_MPFWEAPHAMMERR = "%o's soul was forged anew by %k's hammer."; +OB_MPFWEAPQUIETUS = "%o was silenced by %k's mighty Quietus."; +OB_MPCWEAPMACE = "%o got a mace to the face from %k."; +OB_MPCWEAPSTAFFM = "%o was bitten by %k's serpent staff."; +OB_MPCWEAPSTAFFR = "%o choked on %k's serpent staff."; +OB_MPCWEAPFLAME = "%o was lit up by %k's flames."; +OB_MPCWEAPWRAITHVERGE = "%o was cleansed by %k's Wraithverge."; +OB_MPMWEAPWAND = "%o took one too many sapphire beams from %k."; +OB_MPMWEAPFROST = "%o was turned into a frosty fellow by %k."; +OB_MPMWEAPLIGHTNING = "%o recieved a shocking revelation from %k."; OB_MPMWEAPBLOODSCOURGE = "%o was wiped off the face of the universe by %k's Bloodscourge."; -OB_MPPUNCHDAGGER = "%o was unwittingly backstabbed by %k."; -OB_MPELECTRICBOLT = "%o got bolted to the wall by %k."; -OB_MPPOISONBOLT = "%o recieved a lethal dose of %k's wrath."; -OB_MPASSAULTGUN = "%o was drilled full of holes by %k's assault gun."; -OB_MPMINIMISSILELAUNCHER = "%o gulped down %k's missile."; -OB_MPSTRIFEGRENADE = "%o was inverted by %k's H-E grenade."; -OB_MPPHOSPHOROUSGRENADE = "%o took a flame bath in %k's phosphorous pyre."; -OB_MPFLAMETHROWER = "%o was barbecued by %k."; +OB_MPPUNCHDAGGER = "%o was unwittingly backstabbed by %k."; +OB_MPELECTRICBOLT = "%o got bolted to the wall by %k."; +OB_MPPOISONBOLT = "%o recieved a lethal dose of %k's wrath."; +OB_MPASSAULTGUN = "%o was drilled full of holes by %k's assault gun."; +OB_MPMINIMISSILELAUNCHER = "%o gulped down %k's missile."; +OB_MPSTRIFEGRENADE = "%o was inverted by %k's H-E grenade."; +OB_MPPHOSPHOROUSGRENADE = "%o took a flame bath in %k's phosphorous pyre."; +OB_MPFLAMETHROWER = "%o was barbecued by %k."; OB_MPMAULER1 = "%o was zapped by %k."; -OB_MPMAULER = "%o was viciously vaporized by %k."; +OB_MPMAULER = "%o was viciously vaporized by %k."; OB_MPSIGIL = "%o bowed down to the sheer power of %k's Sigil."; // Same as OB_MPTELEFRAG, but shown when a monster telefrags you @@ -1626,13 +1626,13 @@ MNU_KNIGHT = "KNIGHT"; MNU_WARRIOR = "WARRIOR"; MNU_BERSERKER = "BERSERKER"; MNU_TITAN = "TITAN"; - + MNU_ALTARBOY = "ALTAR BOY"; MNU_ACOLYTE = "ACOLYTE"; MNU_PRIEST = "PRIEST"; MNU_CARDINAL = "CARDINAL"; MNU_POPE = "POPE"; - + MNU_APPRENTICE = "APPRENTICE"; MNU_ENCHANTER = "ENCHANTER"; MNU_SORCERER = "SORCERER"; @@ -1968,13 +1968,13 @@ MAPCOLORMNU_TITLE = "CUSTOMIZE MAP COLORS"; MAPCOLORMNU_DEFAULTMAPCOLORS = "Restore default custom colors"; MAPCOLORMNU_BACKCOLOR = "Background"; MAPCOLORMNU_YOURCOLOR = "You"; -MAPCOLORMNU_WALLCOLOR = "1-sided walls"; -MAPCOLORMNU_FDWALLCOLOR = "2-sided walls with different floors"; +MAPCOLORMNU_WALLCOLOR = "1-sided walls"; +MAPCOLORMNU_FDWALLCOLOR = "2-sided walls with different floors"; MAPCOLORMNU_CDWALLCOLOR = "2-sided walls with different ceilings"; -MAPCOLORMNU_EFWALLCOLOR = "2-sided walls with 3D floors"; +MAPCOLORMNU_EFWALLCOLOR = "2-sided walls with 3D floors"; MAPCOLORMNU_GRIDCOLOR = "Map grid"; MAPCOLORMNU_XHAIRCOLOR = "Center point"; -MAPCOLORMNU_NOTSEENCOLOR = "Not-yet-seen walls"; +MAPCOLORMNU_NOTSEENCOLOR = "Not-yet-seen walls"; MAPCOLORMNU_LOCKEDCOLOR = "Locked doors"; MAPCOLORMNU_INTRALEVELCOLOR = "Teleporter to the same map"; MAPCOLORMNU_INTERLEVELCOLOR = "Teleporter to a different map"; @@ -1982,7 +1982,7 @@ MAPCOLORMNU_SECRETSECTORCOLOR = "Secret sector"; MAPCOLORMNU_UNEXPLOREDSECRETCOLOR = "Unexplored secret"; MAPCOLORMNU_SPECIALWALLCOLOR = "Special trigger lines"; MAPCOLORMNU_CHEATMODE = "Cheat Mode"; -MAPCOLORMNU_TSWALLCOLOR = "Invisible 2-sided walls"; +MAPCOLORMNU_TSWALLCOLOR = "Invisible 2-sided walls"; MAPCOLORMNU_SECRETWALLCOLOR = "Secret walls"; MAPCOLORMNU_THINGCOLOR = "Actors"; MAPCOLORMNU_MONSTERCOLOR = "Monsters"; @@ -2024,7 +2024,7 @@ SCRBRDMNU_TEAMDEATHMATCH = "Team Deathmatch Options"; // Gameplay Menu GMPLYMNU_TITLE = "GAMEPLAY OPTIONS"; -GMPLYMNU_TEAMPLAY = "Teamplay"; +GMPLYMNU_TEAMPLAY = "Teamplay"; GMPLYMNU_TEAMDAMAGE = "Team damage scalar"; GMPLYMNU_SMARTAUTOAIM = "Smart Autoaim"; GMPLYMNU_FALLINGDAMAGE = "Falling damage"; @@ -2184,6 +2184,17 @@ ADVSNDMNU_FREEVERB = "Freeverb"; ADVSNDMNU_GLOBAL_FREEVERB = "Global Freeverb"; ADVSNDMNU_ADVRESAMPLING = "Advanced Resampling"; ADVSNDMNU_OPLBANK = "OPL Bank"; +ADVSNDMNU_ADLNUMCHIPS = "Number of emulated OPL chips"; +ADVSNDMNU_VLMODEL = "Volume model"; +ADVSNDMNU_OPNNUMCHIPS = "Number of emulated OPN chips"; + +// ADLMIDI's volume models +ADLVLMODEL_AUTO = "Auto (Use setup of bank)"; +ADLVLMODEL_GENERIC = "Generic"; +ADLVLMODEL_NATIVE = "OPL Native"; +ADLVLMODEL_DMX = "DMX"; +ADLVLMODEL_APOGEE = "Apogee"; +ADLVLMODEL_WIN9X = "Win9X-like"; // Module Replayer Options MODMNU_TITLE = "MODULE REPLAYER OPTIONS"; @@ -2607,8 +2618,8 @@ OB_MPLAZ_BOOM = "%o fell prey to %k's LAZ device."; OB_MPLAZ_SPLASH = "%o was lazzed by %k."; // Music names for Doom. These are needed in the string table only so that they can -// be replaced by Dehacked. -// Note that these names are not prefixed with 'd_' because that's how Dehacked patches +// be replaced by Dehacked. +// Note that these names are not prefixed with 'd_' because that's how Dehacked patches // expect them. MUSIC_E1M1 = "e1m1"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 73ee39e84..a93a752bf 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -65,7 +65,7 @@ LISTMENU "MainMenu" StaticPatch 278, 80, "FBULA0" Position 110, 56 } - + IfGame(Doom, Strife, Chex) { PatchItem "M_NGAME", "n", "PlayerclassMenu" @@ -87,7 +87,7 @@ LISTMENU "MainMenu" } PatchItem "M_QUITG", "q", "QuitMenu" } - + IfGame(Heretic, Hexen) { TextItem "$MNU_NEWGAME", "n", "PlayerclassMenu" @@ -399,7 +399,7 @@ ListMenu "PlayerMenu" MouseWindow 0, 220 PlayerDisplay 220, 80, "00 07 00", "40 53 40", 1, "PlayerDisplay" } - + ValueText "$PLYRMNU_TEAM", "Team" ValueText "$PLYRMNU_PLAYERCOLOR", "Color" Linespacing 10 @@ -581,7 +581,7 @@ OptionMenu "JoystickOptionsDefaults" protected StaticTextSwitchable "$JOYMNU_NOCON", "$JOYMNU_CONFIG", "ConfigureMessage" StaticTextSwitchable " ", "$JOYMNU_DISABLED1", "ConnectMessage1" StaticTextSwitchable " ", "$JOYMNU_DISABLED2", "ConnectMessage2" - + // The rest will be filled in by joystick code if devices get connected or disconnected } @@ -702,7 +702,7 @@ OptionValue GPUSwitch { 0.0, "$OPTVAL_DEFAULT" 1.0, "$OPTVAL_DEDICATED" - 2.0, "$OPTVAL_INTEGRATED" + 2.0, "$OPTVAL_INTEGRATED" } @@ -731,7 +731,7 @@ OptionMenu "SWROptions" protected OptionMenu "VideoOptions" protected { Title "$DSPLYMNU_TITLE" - + Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions" Submenu "$DSPLYMNU_SWOPT", "SWROptions" Submenu "$GLMNU_DYNLIGHT", "GLLightOptions" @@ -758,7 +758,7 @@ OptionMenu "VideoOptions" protected { Option "$DSPLYMNU_SHOWENDOOM", "showendoom", "Endoom" } - + Option "$DSPLYMNU_DRAWFUZZ", "r_drawfuzz", "Fuzziness" Option "$DSPLYMNU_OLDTRANS", "r_vanillatrans", "VanillaTrans" Slider "$DSPLYMNU_TRANSSOUL", "transsouls", 0.25, 1.0, 0.05, 2 @@ -791,7 +791,7 @@ OptionMenu "VideoOptions" protected // //------------------------------------------------------------------------------------------- -OptionValue DisplayTagsTypes +OptionValue DisplayTagsTypes { 0.0, "$OPTVAL_NONE" 1.0, "$OPTVAL_ITEMS" @@ -1144,44 +1144,44 @@ OptionMenu MapColorMenu protected Title "$MAPCOLORMNU_TITLE" SafeCommand "$MAPCOLORMNU_DEFAULTMAPCOLORS", "am_restorecolors" StaticText " " - ColorPicker "$MAPCOLORMNU_BACKCOLOR", "am_backcolor" - ColorPicker "$MAPCOLORMNU_YOURCOLOR", "am_yourcolor" - ColorPicker "$MAPCOLORMNU_WALLCOLOR", "am_wallcolor" - ColorPicker "$MAPCOLORMNU_FDWALLCOLOR", "am_fdwallcolor" - ColorPicker "$MAPCOLORMNU_CDWALLCOLOR", "am_cdwallcolor" - ColorPicker "$MAPCOLORMNU_EFWALLCOLOR", "am_efwallcolor" - ColorPicker "$MAPCOLORMNU_GRIDCOLOR", "am_gridcolor" - ColorPicker "$MAPCOLORMNU_XHAIRCOLOR", "am_xhaircolor" - ColorPicker "$MAPCOLORMNU_NOTSEENCOLOR", "am_notseencolor" - ColorPicker "$MAPCOLORMNU_LOCKEDCOLOR", "am_lockedcolor" - ColorPicker "$MAPCOLORMNU_INTRALEVELCOLOR", "am_intralevelcolor" - ColorPicker "$MAPCOLORMNU_INTERLEVELCOLOR", "am_interlevelcolor" - ColorPicker "$MAPCOLORMNU_SECRETSECTORCOLOR", "am_secretsectorcolor" - ColorPicker "$MAPCOLORMNU_UNEXPLOREDSECRETCOLOR", "am_unexploredsecretcolor" + ColorPicker "$MAPCOLORMNU_BACKCOLOR", "am_backcolor" + ColorPicker "$MAPCOLORMNU_YOURCOLOR", "am_yourcolor" + ColorPicker "$MAPCOLORMNU_WALLCOLOR", "am_wallcolor" + ColorPicker "$MAPCOLORMNU_FDWALLCOLOR", "am_fdwallcolor" + ColorPicker "$MAPCOLORMNU_CDWALLCOLOR", "am_cdwallcolor" + ColorPicker "$MAPCOLORMNU_EFWALLCOLOR", "am_efwallcolor" + ColorPicker "$MAPCOLORMNU_GRIDCOLOR", "am_gridcolor" + ColorPicker "$MAPCOLORMNU_XHAIRCOLOR", "am_xhaircolor" + ColorPicker "$MAPCOLORMNU_NOTSEENCOLOR", "am_notseencolor" + ColorPicker "$MAPCOLORMNU_LOCKEDCOLOR", "am_lockedcolor" + ColorPicker "$MAPCOLORMNU_INTRALEVELCOLOR", "am_intralevelcolor" + ColorPicker "$MAPCOLORMNU_INTERLEVELCOLOR", "am_interlevelcolor" + ColorPicker "$MAPCOLORMNU_SECRETSECTORCOLOR", "am_secretsectorcolor" + ColorPicker "$MAPCOLORMNU_UNEXPLOREDSECRETCOLOR", "am_unexploredsecretcolor" ColorPicker "$MAPCOLORMNU_SPECIALWALLCOLOR", "am_specialwallcolor" ColorPicker "$MAPCOLORMNU_PORTAL", "am_portalcolor" StaticText " " StaticText "$MAPCOLORMNU_CHEATMODE", 1 - ColorPicker "$MAPCOLORMNU_TSWALLCOLOR", "am_tswallcolor" - ColorPicker "$MAPCOLORMNU_SECRETWALLCOLOR", "am_secretwallcolor" - ColorPicker "$MAPCOLORMNU_THINGCOLOR", "am_thingcolor" - ColorPicker "$MAPCOLORMNU_MONSTERCOLOR", "am_thingcolor_monster" - ColorPicker "$MAPCOLORMNU_NONCOUNTINGMONSTERCOLOR", "am_thingcolor_ncmonster" - ColorPicker "$MAPCOLORMNU_FRIENDCOLOR", "am_thingcolor_friend" - ColorPicker "$MAPCOLORMNU_ITEMCOLOR", "am_thingcolor_item" - ColorPicker "$MAPCOLORMNU_COUNTITEMCOLOR", "am_thingcolor_citem" + ColorPicker "$MAPCOLORMNU_TSWALLCOLOR", "am_tswallcolor" + ColorPicker "$MAPCOLORMNU_SECRETWALLCOLOR", "am_secretwallcolor" + ColorPicker "$MAPCOLORMNU_THINGCOLOR", "am_thingcolor" + ColorPicker "$MAPCOLORMNU_MONSTERCOLOR", "am_thingcolor_monster" + ColorPicker "$MAPCOLORMNU_NONCOUNTINGMONSTERCOLOR", "am_thingcolor_ncmonster" + ColorPicker "$MAPCOLORMNU_FRIENDCOLOR", "am_thingcolor_friend" + ColorPicker "$MAPCOLORMNU_ITEMCOLOR", "am_thingcolor_item" + ColorPicker "$MAPCOLORMNU_COUNTITEMCOLOR", "am_thingcolor_citem" StaticText " " StaticText "$MAPCOLORMNU_OVERLAY", 1 - ColorPicker "$MAPCOLORMNU_YOURCOLOR", "am_ovyourcolor" - ColorPicker "$MAPCOLORMNU_WALLCOLOR", "am_ovwallcolor" - ColorPicker "$MAPCOLORMNU_FDWALLCOLOR", "am_ovfdwallcolor" - ColorPicker "$MAPCOLORMNU_CDWALLCOLOR", "am_ovcdwallcolor" - ColorPicker "$MAPCOLORMNU_EFWALLCOLOR", "am_ovefwallcolor" - ColorPicker "$MAPCOLORMNU_NOTSEENCOLOR", "am_ovunseencolor" + ColorPicker "$MAPCOLORMNU_YOURCOLOR", "am_ovyourcolor" + ColorPicker "$MAPCOLORMNU_WALLCOLOR", "am_ovwallcolor" + ColorPicker "$MAPCOLORMNU_FDWALLCOLOR", "am_ovfdwallcolor" + ColorPicker "$MAPCOLORMNU_CDWALLCOLOR", "am_ovcdwallcolor" + ColorPicker "$MAPCOLORMNU_EFWALLCOLOR", "am_ovefwallcolor" + ColorPicker "$MAPCOLORMNU_NOTSEENCOLOR", "am_ovunseencolor" ColorPicker "$MAPCOLORMNU_LOCKEDCOLOR", "am_ovlockedcolor" - ColorPicker "$MAPCOLORMNU_INTRALEVELCOLOR", "am_ovtelecolor" - ColorPicker "$MAPCOLORMNU_INTERLEVELCOLOR", "am_ovinterlevelcolor" - ColorPicker "$MAPCOLORMNU_SECRETSECTORCOLOR", "am_ovsecretsectorcolor" + ColorPicker "$MAPCOLORMNU_INTRALEVELCOLOR", "am_ovtelecolor" + ColorPicker "$MAPCOLORMNU_INTERLEVELCOLOR", "am_ovinterlevelcolor" + ColorPicker "$MAPCOLORMNU_SECRETSECTORCOLOR", "am_ovsecretsectorcolor" ColorPicker "$MAPCOLORMNU_SPECIALWALLCOLOR", "am_ovspecialwallcolor" ColorPicker "$MAPCOLORMNU_PORTAL", "am_ovportalcolor" StaticText " " @@ -1190,10 +1190,10 @@ OptionMenu MapColorMenu protected ColorPicker "$MAPCOLORMNU_SECRETWALLCOLOR", "am_ovsecretwallcolor" ColorPicker "$MAPCOLORMNU_THINGCOLOR", "am_ovthingcolor" ColorPicker "$MAPCOLORMNU_MONSTERCOLOR", "am_ovthingcolor_monster" - ColorPicker "$MAPCOLORMNU_NONCOUNTINGMONSTERCOLOR", "am_ovthingcolor_ncmonster" + ColorPicker "$MAPCOLORMNU_NONCOUNTINGMONSTERCOLOR", "am_ovthingcolor_ncmonster" ColorPicker "$MAPCOLORMNU_FRIENDCOLOR", "am_ovthingcolor_friend" - ColorPicker "$MAPCOLORMNU_ITEMCOLOR", "am_ovthingcolor_item" - ColorPicker "$MAPCOLORMNU_COUNTITEMCOLOR", "am_ovthingcolor_citem" + ColorPicker "$MAPCOLORMNU_ITEMCOLOR", "am_ovthingcolor_item" + ColorPicker "$MAPCOLORMNU_COUNTITEMCOLOR", "am_ovthingcolor_citem" } //------------------------------------------------------------------------------------------- @@ -1290,7 +1290,7 @@ OptionMenu ScoreboardOptions protected * Gameplay Options (dmflags) Menu * *=======================================*/ - + OptionValue SmartAim { 0.0, "$OPTVAL_OFF" @@ -1404,10 +1404,10 @@ OptionMenu "CompatibilityOptions" protected { Title "$CMPTMNU_TITLE" Option "$CMPTMNU_MODE", "compatmode", "CompatModes", "", 1 - + StaticText " " StaticText "$CMPTMNU_ACTORBEHAVIOR",1 - Option "$CMPTMNU_CORPSEGIBS", "compat_CORPSEGIBS", "YesNo" + Option "$CMPTMNU_CORPSEGIBS", "compat_CORPSEGIBS", "YesNo" Option "$CMPTMNU_NOBLOCKFRIENDS", "compat_NOBLOCKFRIENDS", "YesNo" Option "$CMPTMNU_LIMITPAIN", "compat_LIMITPAIN", "YesNo" Option "$CMPTMNU_MBFMONSTERMOVE", "compat_MBFMONSTERMOVE", "YesNo" @@ -1416,12 +1416,12 @@ OptionMenu "CompatibilityOptions" protected Option "$CMPTMNU_INVISIBILITY", "compat_INVISIBILITY", "YesNo" Option "$CMPTMNU_MINOTAUR", "compat_MINOTAUR", "YesNo" Option "$CMPTMNU_NOTOSSDROPS", "compat_NOTOSSDROPS", "YesNo" - + StaticText " " StaticText "$CMPTMNU_DEHACKEDBEHAVIOR",1 Option "$CMPTMNU_DEHHEALTH", "compat_DEHHEALTH", "YesNo" Option "$CMPTMNU_MUSHROOM", "compat_MUSHROOM", "YesNo" - + StaticText " " StaticText "$CMPTMNU_MAPACTIONBEHAVIOR",1 Option "$CMPTMNU_USEBLOCKING", "compat_USEBLOCKING", "YesNo" @@ -1435,7 +1435,7 @@ OptionMenu "CompatibilityOptions" protected Option "$CMPTMNU_MULTIEXIT", "compat_multiexit", "YesNo" Option "$CMPTMNU_TELEPORT", "compat_teleport", "YesNo" Option "$CMPTMNU_PUSHWINDOW", "compat_pushwindow", "YesNo" - + StaticText " " StaticText "$CMPTMNU_PHYSICSBEHAVIOR",1 Option "$CMPTMNU_NOPASSOVER", "compat_nopassover", "YesNo" @@ -1447,13 +1447,13 @@ OptionMenu "CompatibilityOptions" protected Option "$CMPTMNU_HITSCAN", "compat_HITSCAN", "YesNo" Option "$CMPTMNU_MISSILECLIP", "compat_MISSILECLIP", "YesNo" - + StaticText " " StaticText "$CMPTMNU_RENDERINGBEHAVIOR",1 Option "$CMPTMNU_POLYOBJ", "compat_POLYOBJ", "YesNo" Option "$CMPTMNU_MASKEDMIDTEX", "compat_MASKEDMIDTEX", "YesNo" Option "$CMPTMNU_SPRITESORT", "compat_SPRITESORT", "YesNo" - + StaticText " " StaticText "$CMPTMNU_SOUNDBEHAVIOR",1 Option "$CMPTMNU_SOUNDSLOTS", "compat_soundslots", "YesNo" @@ -1462,7 +1462,7 @@ OptionMenu "CompatibilityOptions" protected Option "$CMPTMNU_SECTORSOUNDS", "compat_SECTORSOUNDS", "YesNo" Option "$CMPTMNU_SOUNDCUTOFF", "compat_soundcutoff", "YesNo" Option "$CMPTMNU_SOUNDTARGET", "compat_SOUNDTARGET", "YesNo" - + Class "CompatibilityMenu" } @@ -1471,7 +1471,7 @@ OptionMenu "CompatibilityOptions" protected * Sound Options Menu * *=======================================*/ - + OptionValue SampleRates { 0, "$OPTVAL_DEFAULT" @@ -1746,7 +1746,7 @@ OptionMenu ModReplayerOptions protected * MIDI player * *=======================================*/ - + OptionValue TimidityReverb { 0, "$OPTVAL_OFF" @@ -1755,7 +1755,7 @@ OptionMenu ModReplayerOptions protected 3, "$ADVSNDMNU_FREEVERB" 4, "$ADVSNDMNU_GLOBAL_FREEVERB" } - + OptionMenu MidiPlayerOptions protected { Title "$SNDMNU_MIDIPLAYER" @@ -1765,6 +1765,7 @@ OptionMenu ModReplayerOptions protected Submenu "$ADVSNDMNU_WILDMIDI", "WildMidiOptions", 0, 1 Submenu "$ADVSNDMNU_OPLSYNTHESIS", "OPLOptions", 0, 1 Submenu "$ADVSNDMNU_ADLMIDI", "ADLOptions", 0, 1 + Submenu "$ADVSNDMNU_OPNMIDI", "OPNOptions", 0, 1 } OptionMenu FluidsynthOptions protected @@ -1777,7 +1778,7 @@ OptionMenu ModReplayerOptions protected Slider "$ADVSNDMNU_MIDIVOICES", "fluid_voices", 16, 4096, 16, 0 // other CVARs need to be revieved for usefulness } - + OptionMenu TimidityOptions protected { Title "$ADVSNDMNU_TIMIDITY" @@ -1796,7 +1797,7 @@ OptionMenu ModReplayerOptions protected Option "$ADVSNDMNU_DMXGUS", "midi_dmxgus", "OnOff" Option "$ADVSNDMNU_GUSMEMSIZE", "gus_memsize", "GusMemory" } - + OptionMenu WildMidiOptions protected { Title "$ADVSNDMNU_WILDMIDI" @@ -1804,19 +1805,37 @@ OptionMenu ModReplayerOptions protected Option "$ADVSNDMNU_REVERB", "wildmidi_reverb", "OnOff" Option "$ADVSNDMNU_ADVRESAMPLING", "wildmidi_enhanced_resampling", "OnOff" } - + OptionMenu OPLOptions protected { Title "$ADVSNDMNU_OPLSYNTHESIS" Option "$ADVSNDMNU_OPLCORES", "opl_core", "OplCores" Slider "$ADVSNDMNU_OPLNUMCHIPS", "opl_numchips", 1, 8, 1, 0 Option "$ADVSNDMNU_OPLFULLPAN", "opl_fullpan", "OnOff" -} + } + + OptionValue AdlVolumeModels + { + 0, "$ADLVLMODEL_AUTO" + 1, "$ADLVLMODEL_GENERIC" + 2, "$ADLVLMODEL_NATIVE" + 3, "$ADLVLMODEL_DMX" + 4, "$ADLVLMODEL_APOGEE" + 5, "$ADLVLMODEL_WIN9X" + } OptionMenu ADLOptions protected { Title "$ADVSNDMNU_ADLMIDI" - LabeledSubmenu "$ADVSNDMNU_OPLBANK", "adl_bank", "ADLBankMenu" + LabeledSubmenu "$ADVSNDMNU_OPLBANK", "adl_bank", "ADLBankMenu" + Slider "$ADVSNDMNU_ADLNUMCHIPS", "adl_chips_count", 1, 32, 1, 0 + Option "$ADVSNDMNU_VLMODEL", "adl_volume_model", "AdlVolumeModels" + } + + OptionMenu OPNOptions protected + { + Title "$ADVSNDMNU_OPNMIDI" + Slider "$ADVSNDMNU_OPNNUMCHIPS", "opn_chips_count", 1, 32, 1, 0 } /*======================================= @@ -1918,19 +1937,19 @@ OptionValue CropAspect OptionMenu VideoModeMenu protected { Title "$VIDMNU_TITLE" - + Option "$VIDMNU_FULLSCREEN", "fullscreen", "YesNo" - + IfOption(Mac) { Option "$VIDMNU_HIDPI", "vid_hidpi", "YesNo" } - + IfOption(Windows) { Option "$VIDMNU_BRDLSS", "win_borderless", "YesNo" } - + Option "$VIDMNU_ASPECTRATIO", "menu_screenratios", "Ratios" Option "$VIDMNU_FORCEASPECT", "vid_aspect", "ForceRatios" Option "$VIDMNU_CROPASPECT", "vid_cropaspect", "CropAspect" @@ -1971,7 +1990,7 @@ OptionMenu NetworkOptions protected StaticText "$NETMNU_HOSTOPTIONS", 1 Option "$NETMNU_EXTRATICS", "net_extratic", "ExtraTicMode" Option "$NETMNU_TICBALANCE", "net_ticbalance", "OnOff" - + } OptionValue ExtraTicMode @@ -2347,4 +2366,4 @@ OptionMenu "ReverbSave" protected StaticText "" StaticText "Environments to save" // Rest is filled in by code. -} \ No newline at end of file +} From d166ab95a99ed4807e03daccfa68780b15189b92 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 26 Mar 2018 19:44:41 +0200 Subject: [PATCH 04/50] Revert "- fixed: 3D floor that extend into the real sector's floor were not clipped properly." This reverts commit a33ad3c99eff7fcdc99967aee72b0ead5027e4c4. Turns out that this breaks legitimate maps. So I'd rather let that one broken map glitch than the good ones. --- src/gl/scene/gl_walls.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp index 75bb071cc..c78c23eff 100644 --- a/src/gl/scene/gl_walls.cpp +++ b/src/gl/scene/gl_walls.cpp @@ -1392,12 +1392,6 @@ void GLWall::DoFFloorBlocks(seg_t * seg, sector_t * frontsector, sector_t * back ff_topleft = topleft; ff_topright = topright; } - if (ff_bottomleft < bottomleft && ff_bottomright < bottomright) - { - // the new section extends into the floor. - ff_bottomleft = bottomleft; - ff_bottomright = bottomright; - } // do all inverse floors above the current one it there is a gap between the // last 3D floor and this one. From 7c333b1fd1a423aa4bff3bc2b0c03c72548fb904 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 26 Mar 2018 20:43:44 +0200 Subject: [PATCH 05/50] - changed the default settings for fluid_patchset, timidity_config and midi_config to point to the default sound font. wildmidi_config has not been changed because it cannot read .sf2 files. --- src/sound/timidity/timidity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/timidity/timidity.cpp b/src/sound/timidity/timidity.cpp index 104407e2a..ecc46c77f 100644 --- a/src/sound/timidity/timidity.cpp +++ b/src/sound/timidity/timidity.cpp @@ -36,7 +36,7 @@ #include "v_text.h" #include "timidity.h" -CUSTOM_CVAR(String, midi_config, CONFIG_FILE, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(String, midi_config, "gzdoom", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { Timidity::FreeAll(); if (currSong != nullptr && currSong->GetDeviceType() == MDEV_GUS) From 3c3c2f03e86e1f5239eaa7de025e8b6d801f271e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 26 Mar 2018 20:44:25 +0200 Subject: [PATCH 06/50] The missing parts of last commit. --- src/sound/mididevices/music_fluidsynth_mididevice.cpp | 2 +- src/sound/mididevices/music_timiditypp_mididevice.cpp | 2 +- src/sound/timidity/timidity.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp index 97282299f..9e3d9d430 100644 --- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp +++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp @@ -105,7 +105,7 @@ const char *BaseFileSearch(const char *file, const char *ext, bool lookfirstinpr CVAR(String, fluid_lib, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG) -CUSTOM_CVAR(String, fluid_patchset, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(String, fluid_patchset, "gzdoom", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (currSong != nullptr && currSong->GetDeviceType() == MDEV_FLUIDSYNTH) { diff --git a/src/sound/mididevices/music_timiditypp_mididevice.cpp b/src/sound/mididevices/music_timiditypp_mididevice.cpp index 40205840f..df91d1d44 100644 --- a/src/sound/mididevices/music_timiditypp_mididevice.cpp +++ b/src/sound/mididevices/music_timiditypp_mididevice.cpp @@ -78,7 +78,7 @@ protected: TimidityPlus::Instruments *TimidityPPMIDIDevice::instruments; // Config file to use -CUSTOM_CVAR(String, timidity_config, "timidity.cfg", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(String, timidity_config, "gzdoom", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (currSong != nullptr && currSong->GetDeviceType() == MDEV_TIMIDITY) { diff --git a/src/sound/timidity/timidity.h b/src/sound/timidity/timidity.h index f297f35bb..385a62896 100644 --- a/src/sound/timidity/timidity.h +++ b/src/sound/timidity/timidity.h @@ -86,9 +86,6 @@ config.h #define MAX_AMPLIFICATION 800 -/* The TiMiditiy configuration file */ -#define CONFIG_FILE "timidity.cfg" - typedef float sample_t; typedef float final_volume_t; #define FINAL_VOLUME(v) (v) From 19b701728dd3d4040c8d0740a1a5353614a9310d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 26 Mar 2018 21:23:34 +0200 Subject: [PATCH 07/50] Typo fix in linetrace flags checking. --- src/p_map.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index 50397d852..e9ba84132 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -4888,8 +4888,8 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance, ActorFlags aflags = (flags & TRF_ALLACTORS) ? ActorFlags::FromInt(0xFFFFFFFF) : MF_SHOOTABLE; int lflags = 0; - if ( !(lflags & TRF_THRUBLOCK) ) lflags |= ML_BLOCKEVERYTHING; - if ( !(lflags & TRF_THRUHITSCAN) ) lflags |= ML_BLOCKHITSCAN; + if ( !(flags & TRF_THRUBLOCK) ) lflags |= ML_BLOCKEVERYTHING; + if ( !(flags & TRF_THRUHITSCAN) ) lflags |= ML_BLOCKHITSCAN; int tflags = TRACE_ReportPortals; if ( flags & TRF_NOSKY ) tflags |= TRACE_NoSky; From 934441f9a2840f572b62078f0467199082fcb65f Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 27 Mar 2018 03:21:32 +0300 Subject: [PATCH 08/50] ADL&OPL: Added a fallback for a blank instruments in GS/XG banks --- src/sound/adlmidi/adlmidi_load.cpp | 4 +- src/sound/adlmidi/adlmidi_midiplay.cpp | 55 +++++++++++++++++--------- src/sound/opnmidi/opnmidi_load.cpp | 5 ++- src/sound/opnmidi/opnmidi_midiplay.cpp | 49 ++++++++++++++++------- 4 files changed, 78 insertions(+), 35 deletions(-) diff --git a/src/sound/adlmidi/adlmidi_load.cpp b/src/sound/adlmidi/adlmidi_load.cpp index 03206bcd6..00a4ce3de 100644 --- a/src/sound/adlmidi/adlmidi_load.cpp +++ b/src/sound/adlmidi/adlmidi_load.cpp @@ -103,7 +103,8 @@ enum WOPL_InstrumentFlags { WOPL_Flags_NONE = 0, WOPL_Flag_Enable4OP = 0x01, - WOPL_Flag_Pseudo4OP = 0x02 + WOPL_Flag_Pseudo4OP = 0x02, + WOPL_Flag_NoSound = 0x04, }; struct WOPL_Inst @@ -151,6 +152,7 @@ static bool readInstrument(MIDIplay::fileReader &file, WOPL_Inst &ins, uint16_t uint8_t flags = idata[39]; ins.adlins.flags = (flags & WOPL_Flag_Enable4OP) && (flags & WOPL_Flag_Pseudo4OP) ? adlinsdata::Flag_Pseudo4op : 0; + ins.adlins.flags|= (flags & WOPL_Flag_NoSound) ? adlinsdata::Flag_NoSound : 0; ins.fourOps = (flags & WOPL_Flag_Enable4OP) || (flags & WOPL_Flag_Pseudo4OP); ins.op[0].feedconn = (idata[40]); diff --git a/src/sound/adlmidi/adlmidi_midiplay.cpp b/src/sound/adlmidi/adlmidi_midiplay.cpp index 65e7af5ef..91270abf9 100644 --- a/src/sound/adlmidi/adlmidi_midiplay.cpp +++ b/src/sound/adlmidi/adlmidi_midiplay.cpp @@ -319,7 +319,7 @@ bool MIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::sprintf(error, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -347,7 +347,7 @@ bool MIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::sprintf(error, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -1031,7 +1031,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -1046,7 +1046,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) { if(!caugh_missing_banks_percussion.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_percussion.insert(bank); } } @@ -1060,29 +1060,48 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) if(midiins == 48 || midiins == 50) vol /= 4; // HACK */ //if(midiins == 56) vol = vol*6/10; // HACK - //int meta = banks[opl.AdlBank][midiins]; - const size_t meta = opl.GetAdlMetaNumber(midiins); - const adlinsdata &ains = opl.GetAdlMetaIns(meta); + + size_t meta = opl.GetAdlMetaNumber(midiins); + const adlinsdata *ains = &opl.GetAdlMetaIns(meta); int16_t tone = note; - if(ains.tone) + if(!isPercussion && !isXgPercussion && (bank > 0)) // For non-zero banks + { + if(ains->flags & adlinsdata::Flag_NoSound) + { + if(hooks.onDebugMessage) + { + if(!caugh_missing_instruments.count(static_cast(midiins))) + { + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Caugh a blank instrument %i (offset %i) in the MIDI bank %u", channel, Ch[channel].patch, midiins, bank); + caugh_missing_instruments.insert(static_cast(midiins)); + } + } + bank = 0; + midiins = Ch[channel].patch; + meta = opl.GetAdlMetaNumber(midiins); + ains = &opl.GetAdlMetaIns(meta); + } + } + + if(ains->tone) { /*if(ains.tone < 20) tone += ains.tone; else*/ - if(ains.tone < 128) - tone = ains.tone; + if(ains->tone < 128) + tone = ains->tone; else - tone -= ains.tone - 128; + tone -= ains->tone - 128; } //uint16_t i[2] = { ains.adlno1, ains.adlno2 }; - bool pseudo_4op = ains.flags & adlinsdata::Flag_Pseudo4op; + bool pseudo_4op = ains->flags & adlinsdata::Flag_Pseudo4op; MIDIchannel::NoteInfo::Phys voices[2] = { - {ains.adlno1, false}, - {ains.adlno2, pseudo_4op} + {ains->adlno1, false}, + {ains->adlno2, pseudo_4op} }; if((opl.AdlPercussionMode == 1) && PercussionMap[midiins & 0xFF]) @@ -1090,7 +1109,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) if(hooks.onDebugMessage) { - if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains.flags & adlinsdata::Flag_NoSound)) + if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains->flags & adlinsdata::Flag_NoSound)) { hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing instrument %i", channel, midiins); caugh_missing_instruments.insert(static_cast(midiins)); @@ -2624,12 +2643,12 @@ ADLMIDI_EXPORT void AdlInstrumentTester::NextAdl(int offset) if(ains.tone) { /*if(ains.tone < 20) - std::sprintf(ToneIndication, "+%-2d", ains.tone); + std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); else*/ if(ains.tone < 128) - std::sprintf(ToneIndication, "=%-2d", ains.tone); + std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); else - std::sprintf(ToneIndication, "-%-2d", ains.tone - 128); + std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); } std::printf("%s%s%s%u\t", ToneIndication, diff --git a/src/sound/opnmidi/opnmidi_load.cpp b/src/sound/opnmidi/opnmidi_load.cpp index 8e87cabc8..15d0a5d35 100644 --- a/src/sound/opnmidi/opnmidi_load.cpp +++ b/src/sound/opnmidi/opnmidi_load.cpp @@ -280,10 +280,14 @@ bool OPNMIDIplay::LoadBank(OPNMIDIplay::fileReader &fr) size_t off = 37 + op * 7; std::memcpy(data.OPS[op].data, idata + off, 7); } + + meta.flags = 0; if(version >= 2) { meta.ms_sound_kon = toUint16BE(idata + 65); meta.ms_sound_koff = toUint16BE(idata + 67); + if((meta.ms_sound_kon == 0) && (meta.ms_sound_koff == 0)) + meta.flags |= opnInstMeta::Flag_NoSound; } else { @@ -295,7 +299,6 @@ bool OPNMIDIplay::LoadBank(OPNMIDIplay::fileReader &fr) meta.opnno2 = uint16_t(opn.dynamic_instruments.size()); /* Junk, delete later */ - meta.flags = 0; meta.fine_tune = 0.0; /* Junk, delete later */ diff --git a/src/sound/opnmidi/opnmidi_midiplay.cpp b/src/sound/opnmidi/opnmidi_midiplay.cpp index 630df1c77..58c4c350a 100644 --- a/src/sound/opnmidi/opnmidi_midiplay.cpp +++ b/src/sound/opnmidi/opnmidi_midiplay.cpp @@ -280,7 +280,7 @@ bool OPNMIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::sprintf(error, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -308,7 +308,7 @@ bool OPNMIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::sprintf(error, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -981,7 +981,7 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -996,7 +996,7 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -1011,28 +1011,47 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit */ //if(midiins == 56) vol = vol*6/10; // HACK - const size_t meta = opn.GetAdlMetaNumber(midiins); - const opnInstMeta &ains = opn.GetAdlMetaIns(meta); + size_t meta = opn.GetAdlMetaNumber(midiins); + const opnInstMeta *ains = &opn.GetAdlMetaIns(meta); int16_t tone = note; - if(ains.tone) + if(!isPercussion && !isXgPercussion && (bank > 0)) // For non-zero banks + { + if(ains->flags & opnInstMeta::Flag_NoSound) + { + if(hooks.onDebugMessage) + { + if(!caugh_missing_instruments.count(static_cast(midiins))) + { + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Caugh a blank instrument %i (offset %i) in the MIDI bank %u", channel, Ch[channel].patch, midiins, bank); + caugh_missing_instruments.insert(static_cast(midiins)); + } + } + bank = 0; + midiins = Ch[channel].patch; + meta = opn.GetAdlMetaNumber(midiins); + ains = &opn.GetAdlMetaIns(meta); + } + } + + if(ains->tone) { /*if(ains.tone < 20) tone += ains.tone; else*/ - if(ains.tone < 128) - tone = ains.tone; + if(ains->tone < 128) + tone = ains->tone; else - tone -= ains.tone - 128; + tone -= ains->tone - 128; } - uint16_t i[2] = { ains.opnno1, ains.opnno2 }; + uint16_t i[2] = { ains->opnno1, ains->opnno2 }; //bool pseudo_4op = ains.flags & opnInstMeta::Flag_Pseudo8op; //if((opn.AdlPercussionMode == 1) && PercussionMap[midiins & 0xFF]) i[1] = i[0]; if(hooks.onDebugMessage) { - if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains.flags & opnInstMeta::Flag_NoSound)) + if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains->flags & opnInstMeta::Flag_NoSound)) { hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing instrument %i", channel, midiins); caugh_missing_instruments.insert(static_cast(midiins)); @@ -2548,12 +2567,12 @@ retry_arpeggio: // if(ains.tone) // { // /*if(ains.tone < 20) -// std::sprintf(ToneIndication, "+%-2d", ains.tone); +// std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); // else*/ // if(ains.tone < 128) -// std::sprintf(ToneIndication, "=%-2d", ains.tone); +// std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); // else -// std::sprintf(ToneIndication, "-%-2d", ains.tone - 128); +// std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); // } // std::printf("%s%s%s%u\t", // ToneIndication, From 38156b9243ecc3fd4820408fb0c18fa04adc2b41 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 27 Mar 2018 03:21:32 +0300 Subject: [PATCH 09/50] ADL&OPL: Added a fallback for a blank instruments in GS/XG banks --- src/sound/adlmidi/adlmidi_load.cpp | 4 +- src/sound/adlmidi/adlmidi_midiplay.cpp | 55 +++++++++++++++++--------- src/sound/opnmidi/opnmidi_load.cpp | 5 ++- src/sound/opnmidi/opnmidi_midiplay.cpp | 49 ++++++++++++++++------- 4 files changed, 78 insertions(+), 35 deletions(-) diff --git a/src/sound/adlmidi/adlmidi_load.cpp b/src/sound/adlmidi/adlmidi_load.cpp index 03206bcd6..00a4ce3de 100644 --- a/src/sound/adlmidi/adlmidi_load.cpp +++ b/src/sound/adlmidi/adlmidi_load.cpp @@ -103,7 +103,8 @@ enum WOPL_InstrumentFlags { WOPL_Flags_NONE = 0, WOPL_Flag_Enable4OP = 0x01, - WOPL_Flag_Pseudo4OP = 0x02 + WOPL_Flag_Pseudo4OP = 0x02, + WOPL_Flag_NoSound = 0x04, }; struct WOPL_Inst @@ -151,6 +152,7 @@ static bool readInstrument(MIDIplay::fileReader &file, WOPL_Inst &ins, uint16_t uint8_t flags = idata[39]; ins.adlins.flags = (flags & WOPL_Flag_Enable4OP) && (flags & WOPL_Flag_Pseudo4OP) ? adlinsdata::Flag_Pseudo4op : 0; + ins.adlins.flags|= (flags & WOPL_Flag_NoSound) ? adlinsdata::Flag_NoSound : 0; ins.fourOps = (flags & WOPL_Flag_Enable4OP) || (flags & WOPL_Flag_Pseudo4OP); ins.op[0].feedconn = (idata[40]); diff --git a/src/sound/adlmidi/adlmidi_midiplay.cpp b/src/sound/adlmidi/adlmidi_midiplay.cpp index 65e7af5ef..91270abf9 100644 --- a/src/sound/adlmidi/adlmidi_midiplay.cpp +++ b/src/sound/adlmidi/adlmidi_midiplay.cpp @@ -319,7 +319,7 @@ bool MIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::sprintf(error, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -347,7 +347,7 @@ bool MIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::sprintf(error, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -1031,7 +1031,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -1046,7 +1046,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) { if(!caugh_missing_banks_percussion.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_percussion.insert(bank); } } @@ -1060,29 +1060,48 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) if(midiins == 48 || midiins == 50) vol /= 4; // HACK */ //if(midiins == 56) vol = vol*6/10; // HACK - //int meta = banks[opl.AdlBank][midiins]; - const size_t meta = opl.GetAdlMetaNumber(midiins); - const adlinsdata &ains = opl.GetAdlMetaIns(meta); + + size_t meta = opl.GetAdlMetaNumber(midiins); + const adlinsdata *ains = &opl.GetAdlMetaIns(meta); int16_t tone = note; - if(ains.tone) + if(!isPercussion && !isXgPercussion && (bank > 0)) // For non-zero banks + { + if(ains->flags & adlinsdata::Flag_NoSound) + { + if(hooks.onDebugMessage) + { + if(!caugh_missing_instruments.count(static_cast(midiins))) + { + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Caugh a blank instrument %i (offset %i) in the MIDI bank %u", channel, Ch[channel].patch, midiins, bank); + caugh_missing_instruments.insert(static_cast(midiins)); + } + } + bank = 0; + midiins = Ch[channel].patch; + meta = opl.GetAdlMetaNumber(midiins); + ains = &opl.GetAdlMetaIns(meta); + } + } + + if(ains->tone) { /*if(ains.tone < 20) tone += ains.tone; else*/ - if(ains.tone < 128) - tone = ains.tone; + if(ains->tone < 128) + tone = ains->tone; else - tone -= ains.tone - 128; + tone -= ains->tone - 128; } //uint16_t i[2] = { ains.adlno1, ains.adlno2 }; - bool pseudo_4op = ains.flags & adlinsdata::Flag_Pseudo4op; + bool pseudo_4op = ains->flags & adlinsdata::Flag_Pseudo4op; MIDIchannel::NoteInfo::Phys voices[2] = { - {ains.adlno1, false}, - {ains.adlno2, pseudo_4op} + {ains->adlno1, false}, + {ains->adlno2, pseudo_4op} }; if((opl.AdlPercussionMode == 1) && PercussionMap[midiins & 0xFF]) @@ -1090,7 +1109,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) if(hooks.onDebugMessage) { - if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains.flags & adlinsdata::Flag_NoSound)) + if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains->flags & adlinsdata::Flag_NoSound)) { hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing instrument %i", channel, midiins); caugh_missing_instruments.insert(static_cast(midiins)); @@ -2624,12 +2643,12 @@ ADLMIDI_EXPORT void AdlInstrumentTester::NextAdl(int offset) if(ains.tone) { /*if(ains.tone < 20) - std::sprintf(ToneIndication, "+%-2d", ains.tone); + std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); else*/ if(ains.tone < 128) - std::sprintf(ToneIndication, "=%-2d", ains.tone); + std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); else - std::sprintf(ToneIndication, "-%-2d", ains.tone - 128); + std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); } std::printf("%s%s%s%u\t", ToneIndication, diff --git a/src/sound/opnmidi/opnmidi_load.cpp b/src/sound/opnmidi/opnmidi_load.cpp index 8e87cabc8..15d0a5d35 100644 --- a/src/sound/opnmidi/opnmidi_load.cpp +++ b/src/sound/opnmidi/opnmidi_load.cpp @@ -280,10 +280,14 @@ bool OPNMIDIplay::LoadBank(OPNMIDIplay::fileReader &fr) size_t off = 37 + op * 7; std::memcpy(data.OPS[op].data, idata + off, 7); } + + meta.flags = 0; if(version >= 2) { meta.ms_sound_kon = toUint16BE(idata + 65); meta.ms_sound_koff = toUint16BE(idata + 67); + if((meta.ms_sound_kon == 0) && (meta.ms_sound_koff == 0)) + meta.flags |= opnInstMeta::Flag_NoSound; } else { @@ -295,7 +299,6 @@ bool OPNMIDIplay::LoadBank(OPNMIDIplay::fileReader &fr) meta.opnno2 = uint16_t(opn.dynamic_instruments.size()); /* Junk, delete later */ - meta.flags = 0; meta.fine_tune = 0.0; /* Junk, delete later */ diff --git a/src/sound/opnmidi/opnmidi_midiplay.cpp b/src/sound/opnmidi/opnmidi_midiplay.cpp index 630df1c77..58c4c350a 100644 --- a/src/sound/opnmidi/opnmidi_midiplay.cpp +++ b/src/sound/opnmidi/opnmidi_midiplay.cpp @@ -280,7 +280,7 @@ bool OPNMIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::sprintf(error, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -308,7 +308,7 @@ bool OPNMIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::sprintf(error, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -981,7 +981,7 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing percussion MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -996,7 +996,7 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit { if(!caugh_missing_banks_melodic.count(bank)) { - hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic bank %i (patch %i)", channel, bank, midiins); + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing melodic MIDI bank %i (patch %i)", channel, bank, midiins); caugh_missing_banks_melodic.insert(bank); } } @@ -1011,28 +1011,47 @@ bool OPNMIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocit */ //if(midiins == 56) vol = vol*6/10; // HACK - const size_t meta = opn.GetAdlMetaNumber(midiins); - const opnInstMeta &ains = opn.GetAdlMetaIns(meta); + size_t meta = opn.GetAdlMetaNumber(midiins); + const opnInstMeta *ains = &opn.GetAdlMetaIns(meta); int16_t tone = note; - if(ains.tone) + if(!isPercussion && !isXgPercussion && (bank > 0)) // For non-zero banks + { + if(ains->flags & opnInstMeta::Flag_NoSound) + { + if(hooks.onDebugMessage) + { + if(!caugh_missing_instruments.count(static_cast(midiins))) + { + hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Caugh a blank instrument %i (offset %i) in the MIDI bank %u", channel, Ch[channel].patch, midiins, bank); + caugh_missing_instruments.insert(static_cast(midiins)); + } + } + bank = 0; + midiins = Ch[channel].patch; + meta = opn.GetAdlMetaNumber(midiins); + ains = &opn.GetAdlMetaIns(meta); + } + } + + if(ains->tone) { /*if(ains.tone < 20) tone += ains.tone; else*/ - if(ains.tone < 128) - tone = ains.tone; + if(ains->tone < 128) + tone = ains->tone; else - tone -= ains.tone - 128; + tone -= ains->tone - 128; } - uint16_t i[2] = { ains.opnno1, ains.opnno2 }; + uint16_t i[2] = { ains->opnno1, ains->opnno2 }; //bool pseudo_4op = ains.flags & opnInstMeta::Flag_Pseudo8op; //if((opn.AdlPercussionMode == 1) && PercussionMap[midiins & 0xFF]) i[1] = i[0]; if(hooks.onDebugMessage) { - if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains.flags & opnInstMeta::Flag_NoSound)) + if(!caugh_missing_instruments.count(static_cast(midiins)) && (ains->flags & opnInstMeta::Flag_NoSound)) { hooks.onDebugMessage(hooks.onDebugMessage_userData, "[%i] Playing missing instrument %i", channel, midiins); caugh_missing_instruments.insert(static_cast(midiins)); @@ -2548,12 +2567,12 @@ retry_arpeggio: // if(ains.tone) // { // /*if(ains.tone < 20) -// std::sprintf(ToneIndication, "+%-2d", ains.tone); +// std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); // else*/ // if(ains.tone < 128) -// std::sprintf(ToneIndication, "=%-2d", ains.tone); +// std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); // else -// std::sprintf(ToneIndication, "-%-2d", ains.tone - 128); +// std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); // } // std::printf("%s%s%s%u\t", // ToneIndication, From fdd93d704d3293ea9c28b81f5a365f5773fd22e2 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 28 Mar 2018 15:06:30 +0300 Subject: [PATCH 10/50] Merged list of video modes for Cocoa and SDL backends https://forum.zdoom.org/viewtopic.php?t=59990 --- src/posix/cocoa/i_video.mm | 75 +------------------------ src/posix/sdl/sdlglvideo.cpp | 73 ++---------------------- src/posix/videomodes.h | 105 +++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 143 deletions(-) create mode 100644 src/posix/videomodes.h diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index c963e50b2..caf5292e4 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -55,6 +55,7 @@ #include "v_text.h" #include "v_video.h" #include "version.h" +#include "videomodes.h" #include "gl/system/gl_system.h" #include "gl/data/gl_vertexbuffer.h" @@ -402,80 +403,6 @@ extern id appCtrl; namespace { -const struct -{ - uint16_t width; - uint16_t height; -} -VideoModes[] = -{ - { 320, 200 }, - { 320, 240 }, - { 400, 225 }, // 16:9 - { 400, 300 }, - { 480, 270 }, // 16:9 - { 480, 360 }, - { 512, 288 }, // 16:9 - { 512, 384 }, - { 640, 360 }, // 16:9 - { 640, 400 }, - { 640, 480 }, - { 720, 480 }, // 16:10 - { 720, 540 }, - { 800, 450 }, // 16:9 - { 800, 480 }, - { 800, 500 }, // 16:10 - { 800, 600 }, - { 848, 480 }, // 16:9 - { 960, 600 }, // 16:10 - { 960, 720 }, - { 1024, 576 }, // 16:9 - { 1024, 600 }, // 17:10 - { 1024, 640 }, // 16:10 - { 1024, 768 }, - { 1088, 612 }, // 16:9 - { 1152, 648 }, // 16:9 - { 1152, 720 }, // 16:10 - { 1152, 864 }, - { 1280, 540 }, // 21:9 - { 1280, 720 }, // 16:9 - { 1280, 854 }, - { 1280, 800 }, // 16:10 - { 1280, 960 }, - { 1280, 1024 }, // 5:4 - { 1360, 768 }, // 16:9 - { 1366, 768 }, - { 1400, 787 }, // 16:9 - { 1400, 875 }, // 16:10 - { 1400, 1050 }, - { 1440, 900 }, - { 1440, 960 }, - { 1440, 1080 }, - { 1600, 900 }, // 16:9 - { 1600, 1000 }, // 16:10 - { 1600, 1200 }, - { 1680, 1050 }, // 16:10 - { 1920, 1080 }, - { 1920, 1200 }, - { 2048, 1152 }, // 16:9, iMac Retina 4K 21.5", HiDPI off - { 2048, 1536 }, - { 2304, 1440 }, // 16:10, MacBook Retina 12" - { 2560, 1080 }, // 21:9 - { 2560, 1440 }, - { 2560, 1600 }, - { 2560, 2048 }, - { 2880, 1800 }, // 16:10, MacBook Pro Retina 15" - { 3200, 1800 }, - { 3440, 1440 }, // 21:9 - { 3840, 2160 }, - { 3840, 2400 }, - { 4096, 2160 }, - { 4096, 2304 }, // 16:9, iMac Retina 4K 21.5" - { 5120, 2160 }, // 21:9 - { 5120, 2880 } // 16:9, iMac Retina 5K 27" -}; - - cycle_t BlitCycles; cycle_t FlipCycles; diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 5b48c1c4c..bb8b40dec 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -45,6 +45,7 @@ #include "version.h" #include "c_console.h" +#include "videomodes.h" #include "sdlglvideo.h" #include "sdlvideo.h" #include "gl/system/gl_system.h" @@ -63,11 +64,6 @@ // TYPES ------------------------------------------------------------------- -struct MiniModeInfo -{ - uint16_t Width, Height; -}; - // PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- // PRIVATE FUNCTION PROTOTYPES --------------------------------------------- @@ -114,67 +110,6 @@ CUSTOM_CVAR(Bool, gl_es, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCA // PRIVATE DATA DEFINITIONS ------------------------------------------------ -// Dummy screen sizes to pass when windowed -static MiniModeInfo WinModes[] = -{ - { 320, 200 }, - { 320, 240 }, - { 400, 225 }, // 16:9 - { 400, 300 }, - { 480, 270 }, // 16:9 - { 480, 360 }, - { 512, 288 }, // 16:9 - { 512, 384 }, - { 640, 360 }, // 16:9 - { 640, 400 }, - { 640, 480 }, - { 720, 480 }, // 16:10 - { 720, 540 }, - { 800, 450 }, // 16:9 - { 800, 480 }, - { 800, 500 }, // 16:10 - { 800, 600 }, - { 848, 480 }, // 16:9 - { 960, 600 }, // 16:10 - { 960, 720 }, - { 1024, 576 }, // 16:9 - { 1024, 600 }, // 17:10 - { 1024, 640 }, // 16:10 - { 1024, 768 }, - { 1088, 612 }, // 16:9 - { 1152, 648 }, // 16:9 - { 1152, 720 }, // 16:10 - { 1152, 864 }, - { 1280, 720 }, // 16:9 - { 1280, 854 }, - { 1280, 800 }, // 16:10 - { 1280, 960 }, - { 1280, 1024 }, // 5:4 - { 1360, 768 }, // 16:9 - { 1366, 768 }, - { 1400, 787 }, // 16:9 - { 1400, 875 }, // 16:10 - { 1400, 1050 }, - { 1440, 900 }, - { 1440, 960 }, - { 1440, 1080 }, - { 1600, 900 }, // 16:9 - { 1600, 1000 }, // 16:10 - { 1600, 1200 }, - { 1920, 1080 }, - { 1920, 1200 }, - { 2048, 1536 }, - { 2560, 1440 }, - { 2560, 1600 }, - { 2560, 2048 }, - { 2880, 1800 }, - { 3200, 1800 }, - { 3840, 2160 }, - { 3840, 2400 }, - { 4096, 2160 }, - { 5120, 2880 } -}; - // CODE -------------------------------------------------------------------- SDLGLVideo::SDLGLVideo (int parm) @@ -202,10 +137,10 @@ bool SDLGLVideo::NextMode (int *width, int *height, bool *letterbox) if (IteratorBits != 8) return false; - if ((unsigned)IteratorMode < sizeof(WinModes)/sizeof(WinModes[0])) + if ((unsigned)IteratorMode < sizeof(VideoModes)/sizeof(VideoModes[0])) { - *width = WinModes[IteratorMode].Width; - *height = WinModes[IteratorMode].Height; + *width = VideoModes[IteratorMode].width; + *height = VideoModes[IteratorMode].height; ++IteratorMode; return true; } diff --git a/src/posix/videomodes.h b/src/posix/videomodes.h new file mode 100644 index 000000000..b9df20801 --- /dev/null +++ b/src/posix/videomodes.h @@ -0,0 +1,105 @@ +/* + ** videomodes.h + ** + **--------------------------------------------------------------------------- + ** Copyright 2018 Alexey Lysiuk + ** All rights reserved. + ** + ** Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions + ** are met: + ** + ** 1. Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** 2. Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in the + ** documentation and/or other materials provided with the distribution. + ** 3. The name of the author may not be used to endorse or promote products + ** derived from this software without specific prior written permission. + ** + ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + ** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + ** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + ** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + ** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + **--------------------------------------------------------------------------- + ** + */ + +static const struct +{ + uint16_t width; + uint16_t height; +} +VideoModes[] = +{ + { 320, 200 }, + { 320, 240 }, + { 400, 225 }, // 16:9 + { 400, 300 }, + { 480, 270 }, // 16:9 + { 480, 360 }, + { 512, 288 }, // 16:9 + { 512, 384 }, + { 640, 360 }, // 16:9 + { 640, 400 }, + { 640, 480 }, + { 720, 480 }, // 16:10 + { 720, 540 }, + { 800, 450 }, // 16:9 + { 800, 480 }, + { 800, 500 }, // 16:10 + { 800, 600 }, + { 848, 480 }, // 16:9 + { 960, 600 }, // 16:10 + { 960, 720 }, + { 1024, 576 }, // 16:9 + { 1024, 600 }, // 17:10 + { 1024, 640 }, // 16:10 + { 1024, 768 }, + { 1088, 612 }, // 16:9 + { 1152, 648 }, // 16:9 + { 1152, 720 }, // 16:10 + { 1152, 864 }, + { 1280, 540 }, // 21:9 + { 1280, 720 }, // 16:9 + { 1280, 854 }, + { 1280, 800 }, // 16:10 + { 1280, 960 }, + { 1280, 1024 }, // 5:4 + { 1360, 768 }, // 16:9 + { 1366, 768 }, + { 1400, 787 }, // 16:9 + { 1400, 875 }, // 16:10 + { 1400, 1050 }, + { 1440, 900 }, + { 1440, 960 }, + { 1440, 1080 }, + { 1600, 900 }, // 16:9 + { 1600, 1000 }, // 16:10 + { 1600, 1200 }, + { 1680, 1050 }, // 16:10 + { 1920, 1080 }, + { 1920, 1200 }, + { 2048, 1152 }, // 16:9, iMac Retina 4K 21.5", HiDPI off + { 2048, 1536 }, + { 2304, 1440 }, // 16:10, MacBook Retina 12" + { 2560, 1080 }, // 21:9 + { 2560, 1440 }, + { 2560, 1600 }, + { 2560, 2048 }, + { 2880, 1800 }, // 16:10, MacBook Pro Retina 15" + { 3200, 1800 }, + { 3440, 1440 }, // 21:9 + { 3840, 2160 }, + { 3840, 2400 }, + { 4096, 2160 }, + { 4096, 2304 }, // 16:9, iMac Retina 4K 21.5" + { 5120, 2160 }, // 21:9 + { 5120, 2880 } // 16:9, iMac Retina 5K 27" +}; From 99e24efc2c29aa41816ebda928132e4883f3eac2 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 28 Mar 2018 20:33:02 +0300 Subject: [PATCH 11/50] ADLMIDI: Remove std:: from all snprintf-s --- src/sound/adlmidi/adlmidi.cpp | 4 ++-- src/sound/adlmidi/adlmidi_midiplay.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sound/adlmidi/adlmidi.cpp b/src/sound/adlmidi/adlmidi.cpp index 586cb901e..db97447a2 100644 --- a/src/sound/adlmidi/adlmidi.cpp +++ b/src/sound/adlmidi/adlmidi.cpp @@ -108,7 +108,7 @@ ADLMIDI_EXPORT int adl_setBank(ADL_MIDIPlayer *device, int bank) if(static_cast(bankno) >= NumBanks) { char errBuf[150]; - std::snprintf(errBuf, 150, "Embedded bank number may only be 0..%u!\n", (NumBanks - 1)); + snprintf(errBuf, 150, "Embedded bank number may only be 0..%u!\n", (NumBanks - 1)); play->setErrorString(errBuf); return -1; } @@ -139,7 +139,7 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4) if((unsigned int)ops4 > 6 * play->m_setup.NumCards) { char errBuff[250]; - std::snprintf(errBuff, 250, "number of four-op channels may only be 0..%u when %u OPL3 cards are used.\n", (6 * (play->m_setup.NumCards)), play->m_setup.NumCards); + snprintf(errBuff, 250, "number of four-op channels may only be 0..%u when %u OPL3 cards are used.\n", (6 * (play->m_setup.NumCards)), play->m_setup.NumCards); play->setErrorString(errBuff); return -1; } diff --git a/src/sound/adlmidi/adlmidi_midiplay.cpp b/src/sound/adlmidi/adlmidi_midiplay.cpp index 91270abf9..13e1008c0 100644 --- a/src/sound/adlmidi/adlmidi_midiplay.cpp +++ b/src/sound/adlmidi/adlmidi_midiplay.cpp @@ -319,7 +319,7 @@ bool MIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -347,7 +347,7 @@ bool MIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -2643,12 +2643,12 @@ ADLMIDI_EXPORT void AdlInstrumentTester::NextAdl(int offset) if(ains.tone) { /*if(ains.tone < 20) - std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); + snprintf(ToneIndication, 8, "+%-2d", ains.tone); else*/ if(ains.tone < 128) - std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); + snprintf(ToneIndication, 8, "=%-2d", ains.tone); else - std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); + snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); } std::printf("%s%s%s%u\t", ToneIndication, From 6a497a0b92c6104f72ba229f9c4095bcf3c2a033 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 28 Mar 2018 20:34:28 +0300 Subject: [PATCH 12/50] ADLMIDI: Update latest update of DMXOPL3 bank by @sneakernets And a small polishing of bank names to keep the informative, but much shorter --- src/sound/adlmidi/adldata.cpp | 546 +++++++++++++++++----------------- 1 file changed, 273 insertions(+), 273 deletions(-) diff --git a/src/sound/adlmidi/adldata.cpp b/src/sound/adlmidi/adldata.cpp index f17d0c839..1556f4d9c 100644 --- a/src/sound/adlmidi/adldata.cpp +++ b/src/sound/adlmidi/adldata.cpp @@ -4,7 +4,7 @@ * FROM A NUMBER OF SOURCES, MOSTLY PC GAMES. * PREPROCESSED, CONVERTED, AND POSTPROCESSED OFF-SCREEN. */ -const adldata adl[4425] = +const adldata adl[4423] = { // ,---------+-------- Wave select settings // | ,-------ч-+------ Sustain/release rates // | | ,-----ч-ч-+---- Attack/decay rates @@ -4116,7 +4116,7 @@ const adldata adl[4425] = { 0x332F985,0x0A5D684, 0x05,0x40, 0xE, +0 }, { 0x0FFF00B,0x2FF220C, 0x00,0x00, 0xE, +0 }, { 0x223A133,0x4F4F131, 0xD6,0x09, 0x6, +0 }, - { 0x223B132,0x0F4F131, 0xD3,0x0A, 0x6, +0 }, + { 0x023B131,0x0F4F131, 0xD3,0x0A, 0x6, +0 }, { 0x433F133,0x0F4F131, 0xD6,0x09, 0x8, +0 }, { 0x2F3F132,0x4F6F131, 0xD3,0x0A, 0x6, +0 }, { 0x2A4A112,0x4B5F211, 0xD2,0x05, 0x4, +0 }, @@ -4135,10 +4135,10 @@ const adldata adl[4425] = { 0x587F617,0x0E4F231, 0x54,0x08, 0x9, +0 }, { 0x0A5F33F,0x0F2C312, 0xA1,0x06, 0xC, -12 }, { 0x0A5F43F,0x0F2F392, 0xD5,0x07, 0x0, -12 }, - { 0x461A417,0x0017C11, 0xAA,0x08, 0x7, +0 }, - { 0x061A416,0x0018911, 0xA7,0x07, 0x7, +0 }, - { 0x0F6F2B2,0x0F6F281, 0xE5,0x00, 0xF, +0 }, - { 0x0F6F2A4,0x007F08F, 0x40,0x00, 0x1, +0 }, + { 0x462A417,0x0027A11, 0x9C,0x08, 0x9, +0 }, + { 0x062A416,0x0028811, 0x99,0x07, 0x9, +0 }, + { 0x0F6F2B2,0x0F6F281, 0xE8,0x05, 0xF, +0 }, + { 0x0F6F2A4,0x007F08F, 0x45,0x05, 0x1, +0 }, { 0x0F6F618,0x0F7E500, 0x63,0x80, 0x6, +12 }, { 0x5A6F40E,0x007D804, 0x5B,0x80, 0x0, +0 }, { 0x2F6F71A,0x0F5F413, 0x1F,0x03, 0x4, -19 }, @@ -4162,8 +4162,8 @@ const adldata adl[4425] = { 0x105FF2C,0x01A6222, 0x9D,0x12, 0x8, +0 }, { 0x107F021,0x2055232, 0x92,0x07, 0x8, +0 }, { 0x107F021,0x2055232, 0x92,0x07, 0x0, +0 }, - { 0x274A613,0x4B8F401, 0xDD,0x05, 0x6, +0 }, - { 0x2249134,0x2B8D301, 0x5E,0x05, 0xA, -12 }, + { 0x574A613,0x4B8F401, 0x9D,0x0D, 0x6, +0 }, + { 0x2249134,0x2B8D301, 0x61,0x05, 0xA, -12 }, { 0x5E5F133,0x1E4F211, 0x99,0x07, 0x6, +0 }, { 0x1E5F133,0x5E4F211, 0x9E,0x0B, 0x0, +0 }, { 0x21FF021,0x088F211, 0xA5,0x80, 0xA, +12 }, @@ -4178,8 +4178,8 @@ const adldata adl[4425] = { 0x0F78140,0x3F7F040, 0x40,0x05, 0xC, +14 }, { 0x6F78AE8,0x649B1F4, 0x03,0x0A, 0xA, +0 }, { 0x6F78AE8,0x649B1F4, 0x43,0x4B, 0xA, +0 }, - { 0x0209221,0x0E6C131, 0x97,0x05, 0x0, +0 }, - { 0x0608521,0x0E6A131, 0xD4,0x05, 0x4, +0 }, + { 0x0609533,0x4E5C131, 0x63,0x05, 0x0, +0 }, + { 0x0608521,0x0E4A131, 0xD4,0x05, 0x4, +0 }, { 0x0F9F030,0x0F8F131, 0x9D,0x05, 0xA, +12 }, { 0x7F0F017,0x7F9B700, 0x00,0x0F, 0xA, +12 }, { 0x026AA21,0x0D7F132, 0xCF,0x84, 0xA, +0 }, @@ -4191,7 +4191,8 @@ const adldata adl[4425] = { 0x2E69515,0x1B6B211, 0x17,0x08, 0x0, +0 }, { 0x077FA21,0x06AC332, 0x07,0x0D, 0x0, +0 }, { 0x0F5F430,0x0F6F330, 0x0E,0x00, 0xA, +12 }, - { 0x1468331,0x017D232, 0x15,0x00, 0xA, +0 }, + { 0x139A331,0x0F8F133, 0x93,0x08, 0xC, +0 }, + { 0x139A331,0x0F8F133, 0x93,0x08, 0xA, +0 }, { 0x2257020,0x4266161, 0x95,0x05, 0xA, +0 }, { 0x1257021,0x0266141, 0x99,0x07, 0x8, +0 }, { 0x2426070,0x2154130, 0x4F,0x00, 0xA, +0 }, @@ -4200,12 +4201,12 @@ const adldata adl[4425] = { 0x521F571,0x4166022, 0x90,0x09, 0x6, +0 }, { 0x52151F0,0x4156021, 0x97,0x0D, 0x4, +12 }, { 0x223F8F2,0x4055421, 0x99,0x8A, 0xC, +0 }, - { 0x0A05211,0x0E4C411, 0x9F,0x03, 0xA, +0 }, - { 0x1C79612,0x0E45411, 0xD9,0x03, 0x4, +0 }, + { 0x4A35211,0x0E4C411, 0x9C,0x08, 0x6, +0 }, + { 0x2C79613,0x4E45411, 0xD7,0x08, 0xA, +0 }, { 0x023E133,0x0F2F131, 0xA2,0x09, 0xE, +0 }, { 0x023F132,0x0F2F131, 0x24,0x0A, 0xE, +0 }, - { 0x4C3C413,0x0B4D214, 0x9B,0x48, 0xA, -24 }, - { 0x5BAF900,0x0B4F211, 0x87,0x48, 0x6, +0 }, + { 0x5C3C404,0x1B4B519, 0xA1,0x00, 0xC, -31 }, + { 0x17A9913,0x0B4F213, 0x0F,0x00, 0x8, -19 }, { 0x223F832,0x4055421, 0x99,0x8A, 0xC, +0 }, { 0x433CB32,0x5057561, 0x9B,0x8A, 0xA, +0 }, { 0x1029033,0x4044561, 0x5B,0x85, 0x4, +0 }, @@ -4225,7 +4226,7 @@ const adldata adl[4425] = { 0x0235271,0x0198161, 0x1E,0x08, 0xE, +0 }, { 0x0235361,0x0196161, 0x1D,0x03, 0xE, +0 }, { 0x0155331,0x0378261, 0x94,0x00, 0xA, +0 }, - { 0x118537A,0x5177432, 0x21,0x00, 0x4, -12 }, + { 0x118543A,0x5177472, 0x1E,0x00, 0x4, -12 }, { 0x0364121,0x02B7221, 0x21,0x08, 0xC, +0 }, { 0x026F021,0x0056121, 0x26,0x03, 0xC, +0 }, { 0x0578321,0x117C021, 0x19,0x03, 0xC, +0 }, @@ -4233,21 +4234,22 @@ const adldata adl[4425] = { 0x036F121,0x337F121, 0x92,0x08, 0xE, +0 }, { 0x0368121,0x037F121, 0x92,0x08, 0xE, +0 }, { 0x0A66121,0x0976121, 0x9B,0x08, 0xE, +0 }, - { 0x0F37011,0x1F65052, 0x51,0x04, 0xA, +0 }, - { 0x1067021,0x1165231, 0x8A,0x00, 0x6, +0 }, + { 0x5237731,0x1F65012, 0x4B,0x00, 0xA, +0 }, + { 0x0137732,0x0F65011, 0xC7,0x0A, 0xA, +0 }, + { 0x1067021,0x1165231, 0x46,0x00, 0x6, +0 }, { 0x00B9820,0x10B5330, 0x8E,0x00, 0xA, +12 }, { 0x10B8020,0x11B6330, 0x87,0x00, 0x8, +12 }, - { 0x0235031,0x0076C64, 0x58,0x08, 0xA, +0 }, - { 0x055D531,0x0076C72, 0x17,0x0D, 0x6, +0 }, - { 0x2077830,0x2076331, 0x94,0x00, 0xA, +0 }, + { 0x1235031,0x0077C24, 0xC0,0x08, 0x2, +0 }, + { 0x045D933,0x4076C35, 0xD0,0x26, 0x4, +0 }, + { 0x2077830,0x2076331, 0x9F,0x00, 0xA, +0 }, { 0x0199031,0x01B6134, 0x95,0x80, 0xA, +0 }, { 0x0177532,0x0174531, 0x93,0x03, 0xC, +0 }, { 0x0277530,0x0174536, 0x14,0x9C, 0xE, +12 }, { 0x08D6EF1,0x02A3571, 0xC0,0x00, 0xE, +0 }, { 0x08860A1,0x01A6561, 0x5C,0x00, 0x8, +0 }, { 0x2176522,0x0277421, 0x5A,0x00, 0x6, +0 }, - { 0x1274472,0x01745B1, 0x8D,0x05, 0x4, +0 }, - { 0x2F0F051,0x09A7801, 0x03,0x12, 0xA, +0 }, + { 0x1267532,0x0166531, 0x8D,0x05, 0x4, +0 }, + { 0x2F0F011,0x0987801, 0x03,0x17, 0xA, +0 }, { 0x00457F2,0x0375761, 0xA8,0x00, 0xE, +0 }, { 0x2545C73,0x0776821, 0x00,0x0D, 0xE, +0 }, { 0x5543737,0x25D67A1, 0x28,0x00, 0x8, +0 }, @@ -4260,23 +4262,23 @@ const adldata adl[4425] = { 0x3AB8120,0x308F130, 0x9E,0x06, 0x0, +0 }, { 0x13357F1,0x00767E1, 0x21,0x00, 0xA, +0 }, { 0x43357F2,0x00767E1, 0x28,0x00, 0x0, +0 }, - { 0x2444830,0x43D67A1, 0x22,0x00, 0x8, +0 }, - { 0x534B821,0x13D87A1, 0x1F,0x00, 0xA, +0 }, + { 0x2444830,0x21D67A1, 0x22,0x00, 0x8, +0 }, + { 0x534B821,0x02D87A1, 0x1F,0x00, 0xA, +0 }, { 0x32B7420,0x12BF134, 0x46,0x00, 0x8, +0 }, { 0x5029072,0x0069061, 0x96,0x0C, 0x8, +0 }, { 0x1019031,0x0069061, 0x1A,0x0C, 0x6, +0 }, - { 0x245C224,0x2550133, 0x83,0x80, 0x9, -36 }, - { 0x2459224,0x2556133, 0x83,0x80, 0x9, -36 }, - { 0x132ED10,0x3E7D010, 0x87,0x08, 0x6, +12 }, - { 0x132ED30,0x3E7D010, 0x87,0x0D, 0x6, +12 }, - { 0x2946374,0x005A0A1, 0xA5,0x05, 0x2, +0 }, - { 0x2055F02,0x004FFE1, 0xA8,0x05, 0x0, +0 }, - { 0x0031131,0x0054361, 0xD4,0x00, 0x4, +0 }, - { 0x20311B0,0x00543E1, 0xD9,0x00, 0x4, +0 }, + { 0x245C224,0x2550133, 0x81,0x80, 0xB, -36 }, + { 0x2459224,0x2556133, 0x81,0x80, 0xB, -36 }, + { 0x132ED10,0x3E7D010, 0x87,0x0D, 0x6, +12 }, + { 0x132ED30,0x3E7D010, 0x87,0x12, 0x6, +12 }, + { 0x033513A,0x013C121, 0xA4,0x06, 0x2, +0 }, + { 0x273F325,0x0228231, 0x20,0x06, 0x4, +0 }, + { 0x0031131,0x0054361, 0xD4,0x08, 0x4, +0 }, + { 0x20311B0,0x00543E1, 0xD9,0x08, 0x4, +0 }, { 0x245A121,0x126A121, 0x98,0x05, 0xC, +0 }, { 0x255A421,0x126A121, 0x98,0x05, 0xC, +0 }, - { 0x20470E0,0x1148161, 0x59,0x03, 0x2, +0 }, - { 0x10460E1,0x2148161, 0x5F,0x83, 0x6, +0 }, + { 0x50470E1,0x1148161, 0x59,0x03, 0x2, +0 }, + { 0x10460E2,0x4148161, 0x5F,0x83, 0x6, +0 }, { 0x0336186,0x05452E1, 0xA7,0x00, 0x6, +0 }, { 0x13351A6,0x05452E1, 0xA7,0x00, 0x0, +0 }, { 0x2529084,0x1534341, 0x9D,0x80, 0xC, +0 }, @@ -4290,8 +4292,8 @@ const adldata adl[4425] = { 0x2322122,0x0133221, 0x8C,0x92, 0x6, +0 }, { 0x4033121,0x0132122, 0x93,0x48, 0x4, +7 }, { 0x074F624,0x0249303, 0xC0,0x0D, 0x0, +0 }, - { 0x3D2C092,0x1D2D131, 0x8E,0x03, 0x0, +0 }, - { 0x0D2D091,0x1D23132, 0x8E,0x03, 0x0, +0 }, + { 0x3D2C092,0x1D2D131, 0x8E,0x09, 0x0, +0 }, + { 0x0D2D091,0x1D23132, 0x8E,0x09, 0x0, +0 }, { 0x5F29054,0x0F2C241, 0x99,0x06, 0xE, +0 }, { 0x1F19011,0x0F2C241, 0x1A,0x06, 0x6, +0 }, { 0x05233E1,0x0131371, 0x1A,0x88, 0x7, +0 }, @@ -4306,7 +4308,7 @@ const adldata adl[4425] = { 0x3F0F014,0x6F7F611, 0x40,0x43, 0xA, +0 }, { 0x033F201,0x373F402, 0xD1,0x8A, 0x0, +0 }, { 0x6A7F907,0x229A904, 0x1A,0x00, 0xA, -12 }, - { 0x332F320,0x6E49423, 0x0E,0x08, 0x8, +0 }, + { 0x5E2F321,0x6E4F523, 0x1B,0x08, 0x8, +0 }, { 0x455F71C,0x0D68501, 0xA3,0x08, 0x6, +0 }, { 0x055F718,0x0D6E501, 0x23,0x08, 0x0, +0 }, { 0x1397931,0x2099B22, 0x80,0x00, 0x6, +0 }, @@ -4326,7 +4328,7 @@ const adldata adl[4425] = { 0x250F610,0x0E7F510, 0x00,0xC8, 0x6, +0 }, { 0x2114109,0x51D2101, 0x05,0x80, 0xA, +0 }, { 0x2114108,0x31D2101, 0x05,0x80, 0xA, +12 }, - { 0x4543311,0x357451A, 0x19,0x03, 0xE, -14 }, + { 0x0534313,0x7574A1F, 0x20,0x03, 0xE, -14 }, { 0x00437D2,0x0343471, 0xA1,0x07, 0xC, +0 }, { 0x0F0F00C,0x0F66700, 0x00,0xCD, 0xE, +0 }, { 0x200C327,0x6021300, 0x80,0x12, 0xE, -23 }, @@ -4355,29 +4357,22 @@ const adldata adl[4425] = { 0x2F7F602,0x0F8F802, 0x00,0x88, 0xE, +12 }, { 0x05476C1,0x30892C5, 0x80,0x08, 0x0, +0 }, { 0x05477C1,0x30892C5, 0x00,0x08, 0xA, -2 }, - { 0x007C604,0x007C604, 0x08,0x08, 0x1, +0 }, - { 0x201F302,0x057AB09, 0x03,0x07, 0xC, +12 }, + { 0x005C604,0x005C604, 0x08,0x00, 0x1, +0 }, + { 0x509F902,0x057AB07, 0x03,0x07, 0xC, +12 }, { 0x254F307,0x307F905, 0x04,0x08, 0x6, -5 }, { 0x254F307,0x207F905, 0x04,0x08, 0x8, +0 }, - { 0x006C604,0x007C604, 0x08,0x08, 0x1, +0 }, - { 0x201F312,0x057AB09, 0x03,0x07, 0xC, +12 }, + { 0x509F912,0x057AB07, 0x03,0x07, 0xC, +12 }, { 0x254D307,0x3288905, 0x04,0x03, 0xA, -5 }, - { 0x0015500,0x007C716, 0x0C,0x00, 0x0, +0 }, - { 0x201F312,0x057AB09, 0x00,0x07, 0xC, +12 }, - { 0x0015500,0x007C719, 0x0C,0x00, 0x0, +0 }, - { 0x001F312,0x047BB05, 0x03,0x07, 0xC, +12 }, - { 0x0015500,0x007C71B, 0x0C,0x00, 0x0, +0 }, - { 0x201F312,0x047BB09, 0x03,0x07, 0xC, +12 }, - { 0x0015500,0x007C71F, 0x0C,0x00, 0x0, +0 }, - { 0x210F509,0x305FE03, 0x8A,0x85, 0xE, +12 }, - { 0x200F508,0x305FE03, 0xC7,0x85, 0xC, +12 }, - { 0x2E1F119,0x3F3F11B, 0x04,0x0D, 0x8, +0 }, + { 0x509F902,0x057AB07, 0x03,0x07, 0x0, +12 }, + { 0x210F509,0x605FE05, 0x8A,0x8A, 0xE, +12 }, + { 0x400F509,0x605FE05, 0x07,0x8A, 0xA, +12 }, + { 0x2E1F11E,0x3F3F318, 0x04,0x00, 0x8, +0 }, { 0x2777603,0x3679601, 0x87,0x08, 0x6, +12 }, { 0x277C643,0x3679601, 0x87,0x08, 0xE, +12 }, { 0x366F905,0x099F701, 0x00,0x00, 0xC, +12 }, { 0x431A000,0x085B41A, 0x81,0x05, 0xA, +12 }, { 0x459F640,0x185B418, 0x00,0x20, 0xB, +12 }, - { 0x212FD04,0x305FD03, 0x01,0x00, 0x8, +12 }, + { 0x212FD08,0x305FD03, 0x01,0x03, 0x8, +12 }, { 0x2A8F9E3,0x0779643, 0x1E,0x08, 0x2, +6 }, { 0x0A5F7E8,0x0D89949, 0xDE,0x00, 0x0, +0 }, { 0x2A8F9E3,0x0779643, 0x1E,0x00, 0xE, +12 }, @@ -4394,8 +4389,11 @@ const adldata adl[4425] = { 0x367FE05,0x678F701, 0x09,0x08, 0x8, +12 }, { 0x367FD10,0x078F901, 0x00,0x0D, 0x8, +11 }, { 0x098600F,0x3FC8590, 0x08,0xC0, 0xE, +12 }, - { 0x009F020,0x37DA588, 0x07,0x00, 0xA, +12 }, - { 0x00FC020,0x32DA5A8, 0x07,0x00, 0xA, +12 }, + { 0x009F020,0x27DA788, 0x25,0x00, 0x0, +12 }, + { 0x00FC020,0x22DA388, 0x25,0x00, 0xA, +12 }, + { 0x0F00000,0x0F00000, 0x3F,0x3F, 0xC, +0 }, + { 0x000F020,0x40A8A00, 0x0A,0x00, 0xE, +0 }, + { 0x70F5F20,0x70F4F00, 0x00,0x00, 0x2, -12 }, { 0x0D1F815,0x078F512, 0x44,0x00, 0x8, +12 }, { 0x2D1F213,0x098F614, 0x9D,0x00, 0x0, +0 }, { 0x2D1F213,0x098F614, 0x9D,0x21, 0x0, -2 }, @@ -4442,7 +4440,7 @@ const adldata adl[4425] = { 0x04CA700,0x04FC600, 0x00,0x2B, 0x0, -12 }, { 0x0B5F704,0x002010C, 0x00,0x00, 0x8, +21 }, }; -const struct adlinsdata adlins[4547] = +const struct adlinsdata adlins[4549] = { { 0, 0, 0, 0, 1660, 1660,0.000000 }, { 1, 1, 0, 0, 1746, 1746,0.000000 }, @@ -8783,7 +8781,7 @@ const struct adlinsdata adlins[4547] = {3547,3547,109, 0, 1780, 1780,0.000000 }, {4097,4097, 79, 0, 126, 126,0.000000 }, {4098,4098, 0, 0, 3413, 3413,0.000000 }, - {4099,4100, 0, 1, 2040, 2040,0.031250 }, + {4099,4100, 0, 1, 1613, 1613,0.031250 }, {4101,4102, 0, 1, 2146, 2146,0.031250 }, {4103,4104, 0, 1, 1646, 1646,0.046875 }, {4105,4106, 0, 1, 1900, 1900,0.156250 }, @@ -8793,7 +8791,7 @@ const struct adlinsdata adlins[4547] = {4113,4114, 0, 1, 1740, 1740,0.000000 }, {4115,4116, 0, 1, 993, 993,0.000025 }, {4117,4118, 0, 1, 886, 886,0.000000 }, - {4119,4120, 0, 1, 1900, 1900,0.046875 }, + {4119,4120, 0, 1, 1153, 1153,0.046875 }, {4121,4122, 0, 1, 1420, 1420,0.000000 }, {4123,4124, 0, 1, 193, 193,0.000000 }, {4125,4126, 0, 1, 406, 406,0.000000 }, @@ -8807,7 +8805,7 @@ const struct adlinsdata adlins[4547] = {4140,4141, 0, 1, 40000, 46,0.140625 }, {4142,4143, 0, 1, 40000, 6,0.000000 }, {4144,4145, 0, 1, 40000, 153,0.109375 }, - {4146,4147, 0, 1, 600, 600,0.000000 }, + {4146,4147, 0, 1, 920, 920,0.000000 }, {4148,4149, 0, 1, 653, 653,0.000025 }, {4150,4151, 0, 1, 633, 633,0.000000 }, {4152,4153, 0, 1, 893, 893,0.046875 }, @@ -8815,182 +8813,184 @@ const struct adlinsdata adlins[4547] = {4156,4157, 0, 1, 40000, 60,-1.906250 }, {4158,4159, 0, 1, 40000, 60,-1.906250 }, {4160,4161, 0, 1, 2033, 2033,0.234375 }, - {4162,4163, 0, 1, 1600, 1600,0.031250 }, + {4162,4163, 0, 1, 1900, 1900,0.031250 }, {4164,4165, 0, 1, 1453, 1453,0.000000 }, {4166,4167, 0, 1, 2186, 2186,0.000000 }, {4168,4169, 0, 1, 1933, 1933,0.046875 }, {4170,4171, 0, 1, 633, 633,0.000000 }, {4172,4173, 0, 1, 486, 486,0.000000 }, {4174,4174, 0, 0, 313, 313,0.000000 }, - {4175,4175, 0, 1, 40000, 33,0.156250 }, - {4176,4177, 0, 1, 2040, 13,0.000000 }, - {4178,4178, 0, 0, 40000, 66,0.000000 }, - {4179,4180, 0, 1, 40000, 60,0.000025 }, - {4181,4181, 0, 0, 40000, 133,0.000000 }, - {4182,4183, 0, 1, 40000, 173,0.078125 }, - {4184,4185, 0, 1, 320, 320,0.156250 }, - {4186,4187, 0, 1, 1813, 1813,0.031250 }, - {4188,4189, 0, 1, 1740, 1740,0.031250 }, - {4190,4191, 0, 1, 40000, 213,0.062500 }, - {4192,4193, 0, 1, 40000, 500,-0.062500 }, - {4194,4194, 0, 1, 40000, 326,0.109375 }, - {4195,4195, 0, 1, 40000, 406,0.109375 }, - {4196,4197, 0, 1, 40000, 280,0.140625 }, - {4198,4199, 0, 1, 40000, 53,0.140625 }, - {4200,4201, 0, 1, 40000, 286,0.156250 }, - {4202,4203, 0, 1, 206, 206,0.125000 }, - {4204,4205, 0, 1, 40000, 26,0.000000 }, - {4206,4207, 0, 1, 40000, 20,0.031250 }, - {4208,4208, 0, 0, 40000, 6,0.000000 }, - {4209,4209, 0, 0, 40000, 20,0.000000 }, - {4210,4211, 0, 1, 40000, 160,0.031250 }, - {4212,4213, 0, 1, 40000, 73,0.062500 }, - {4214,4215, 0, 1, 2526, 2526,0.093750 }, - {4216,4216, 0, 1, 5153, 5153,0.125000 }, - {4217,4217, 0, 0, 40000, 66,0.000000 }, - {4218,4218, 0, 0, 40000, 40,0.000000 }, - {4219,4219, 0, 0, 40000, 0,0.000000 }, - {4220,4220, 0, 0, 40000, 0,0.000000 }, - {4221,4222, 0, 1, 40000, 60,0.000000 }, - {4223,4223, 0, 0, 40000, 33,0.000000 }, - {4224,4224, 0, 0, 40000, 6,0.000000 }, - {4225,4226, 0, 1, 40000, 40,0.000000 }, - {4227,4227, 0, 0, 40000, 0,0.000000 }, - {4228,4228, 0, 0, 40000, 6,0.000000 }, - {4229,4229, 0, 0, 40000, 33,0.000000 }, - {4230,4231, 0, 1, 40000, 33,0.031250 }, - {4232,4233, 0, 1, 40000, 20,0.046875 }, - {4234,4235, 0, 1, 420, 420,0.031250 }, - {4236,4236, 0, 0, 40000, 106,0.000000 }, - {4237,4237, 0, 0, 40000, 6,0.000000 }, - {4238,4239, 0, 1, 40000, 6,0.125000 }, - {4240,4241, 0, 1, 40000, 13,0.109375 }, - {4242,4243, 0, 1, 40000, 53,0.109375 }, - {4244,4245, 0, 1, 120, 0,-0.031250 }, - {4246,4246, 0, 0, 40000, 6,0.000000 }, - {4247,4248, 0, 1, 40000, 133,0.156250 }, - {4249,4250, 0, 1, 3886, 3886,0.125000 }, - {4251,4252, 0, 1, 40000, 26,0.031250 }, - {4253,4254, 0, 1, 40000, 320,0.078125 }, - {4255,4256, 0, 1, 846, 66,0.109375 }, - {4257,4258, 0, 1, 1293, 80,0.078125 }, - {4259,4260, 0, 1, 40000, 193,0.156250 }, - {4261,4262, 0, 1, 2040, 2040,0.109375 }, - {4263,4264, 0, 1, 1360, 1360,0.062500 }, - {4265,4266, 0, 1, 40000, 433,0.093750 }, - {4267,4268, 0, 1, 40000, 533,0.109375 }, - {4269,4270, 0, 1, 826, 826,0.093750 }, - {4271,4272, 0, 1, 40000, 926,0.125000 }, - {4273,4273, 0, 1, 886, 886,0.109375 }, - {4274,4275, 0, 1, 2186, 2186,-0.046875 }, - {4276,4277, 0, 1, 1486, 1486,0.125000 }, - {4278,4279, 0, 1, 40000, 393,-0.078125 }, - {4280,4281, 0, 1, 40000, 1166,0.140625 }, - {4282,4283, 0, 1, 360, 360,0.078125 }, - {4284,4285, 0, 1, 1693, 1693,0.031250 }, - {4286,4287, 0, 1, 760, 760,0.000000 }, - {4288,4289, 0, 1, 126, 126,0.031250 }, - {4290,4290, 0, 0, 633, 633,0.000000 }, - {4291,4292, 0, 1, 280, 280,0.000000 }, - {4293,4294, 0, 1, 40000, 26,0.062500 }, - {4295,4295, 0, 0, 40000, 66,0.000000 }, - {4296,4296, 0, 0, 40000, 53,0.000000 }, - {4297,4297, 0, 0, 1940, 1940,0.000000 }, - {4298,4298, 0, 0, 86, 86,0.000000 }, - {4299,4300, 0, 1, 280, 280,0.031250 }, - {4301,4301, 0, 0, 40, 40,0.000000 }, - {4302,4303, 0, 1, 53, 53,0.000000 }, - {4304,4305, 0, 1, 140, 140,0.000000 }, - {4306,4307, 0, 1, 26, 26,0.000000 }, - {4308,4309, 0, 1, 2153, 2153,0.109375 }, - {4310,4310, 0, 0, 600, 600,0.000000 }, - {4311,4312, 0, 1, 993, 26,0.000000 }, - {4313,4314, 0, 1, 5613, 5613,0.000000 }, - {4315,4315, 0, 0, 220, 220,0.000000 }, - {4316,4317, 0, 1, 10306, 526,0.000000 }, - {4318,4319, 0, 1, 1486, 13,0.000000 }, - {4320,4321, 0, 1, 40000, 660,0.000000 }, - {4322,4322, 0, 0, 120, 120,0.000000 }, - {4323,4323, 34, 0, 40, 40,0.000000 }, - {4324,4324, 28, 0, 73, 73,0.000000 }, - {4325,4326, 39, 1, 233, 233,0.000000 }, - {4325,4326, 33, 1, 193, 193,0.000000 }, - {4327,4328, 63, 1, 33, 33,0.000000 }, - {4329,4329, 15, 0, 13, 13,0.000000 }, - {4330,4330, 36, 0, 13, 13,0.000000 }, - {4330,4331, 36, 1, 133, 133,0.406250 }, - {4332,4333, 25, 1, 13, 13,0.000000 }, - {4334,4333, 25, 1, 33, 33,0.000000 }, - {4335,4336, 61, 1, 40, 40,0.000000 }, - {4337,4338, 37, 1, 53, 53,0.000000 }, - {4339,4340, 15, 1, 80, 80,0.000000 }, - {4341,4342, 48, 1, 73, 73,-1.906250 }, - {4343,4344, 19, 1, 120, 120,0.000000 }, - {4345,4345, 48, 0, 53, 53,0.000000 }, - {4346,4347, 15, 1, 33, 33,0.000000 }, - {4348,4349, 12, 1, 33, 33,0.000000 }, - {4350,4351, 12, 1, 33, 33,0.000000 }, - {4352,4351, 10, 1, 40, 40,0.000000 }, - {4353,4354, 60, 1, 286, 286,0.062500 }, - {4355,4355, 62, 0, 1726, 1726,0.000000 }, - {4356,4357, 80, 1, 106, 106,0.125000 }, - {4358,4358, 58, 0, 73, 73,0.000000 }, - {4359,4360, 31, 1, 313, 313,0.000000 }, - {4361,4361, 61, 0, 206, 206,0.000000 }, - {4362,4363, 41, 1, 100, 100,0.000000 }, - {4364,4365, 35, 1, 160, 160,0.000000 }, - {4366,4367, 29, 1, 40, 40,0.000000 }, - {4368,4369, 41, 1, 166, 166,0.000000 }, - {4368,4369, 37, 1, 160, 160,0.000000 }, - {4370,4371, 54, 1, 80, 80,0.000000 }, - {4370,4372, 48, 1, 80, 80,0.000000 }, - {4373,4374, 77, 1, 53, 53,0.000000 }, - {4375,4376, 72, 1, 46, 46,0.000000 }, - {4377,4377, 40, 0, 140, 140,0.000000 }, - {4378,4378, 45, 0, 313, 313,0.000000 }, - {4379,4379, 42, 0, 40000, 0,0.000000 }, - {4380,4380, 73, 0, 60, 60,0.000000 }, - {4381,4382, 68, 1, 40, 40,0.000000 }, - {4383,4384, 18, 1, 60, 60,0.000000 }, - {4385,4386, 18, 1, 106, 106,0.000000 }, - {4387,4387, 90, 0, 80, 80,0.000000 }, - {4388,4388, 90, 0, 306, 306,0.000000 }, - {4389,4390, 64, 1, 233, 233,0.031250 }, - {4391,4392, 80, 1, 140, 140,0.031250 }, - {4393,4394, 64, 1, 606, 606,0.000000 }, - {4395,4395, 67, 0, 20, 20,0.000000 }, - {4396,4397, 50, 1, 53, 53,0.000000 }, - {4398,4398, 36, 0, 66, 66,0.000000 }, - {4399,4399, 0, 0, 40000, 20,0.000000 }, - {4400,4400, 0, 0, 40000, 0,0.000000 }, - {4401,4401, 0, 0, 360, 360,0.000000 }, - {4402,4402, 0, 0, 586, 586,0.000000 }, + {4175,4176, 0, 1, 2533, 2533,0.078125 }, + {4177,4178, 0, 1, 2040, 13,0.000000 }, + {4179,4179, 0, 0, 40000, 66,0.000000 }, + {4180,4181, 0, 1, 40000, 60,0.000025 }, + {4182,4182, 0, 0, 40000, 133,0.000000 }, + {4183,4184, 0, 1, 40000, 173,0.078125 }, + {4185,4186, 0, 1, 333, 333,0.109375 }, + {4187,4188, 0, 1, 1813, 1813,0.031250 }, + {4189,4190, 0, 1, 1473, 1473,0.031250 }, + {4191,4192, 0, 1, 40000, 213,0.062500 }, + {4193,4194, 0, 1, 40000, 500,-0.062500 }, + {4195,4195, 0, 1, 40000, 326,0.109375 }, + {4196,4196, 0, 1, 40000, 406,0.109375 }, + {4197,4198, 0, 1, 40000, 280,0.140625 }, + {4199,4200, 0, 1, 40000, 53,0.140625 }, + {4201,4202, 0, 1, 40000, 286,0.156250 }, + {4203,4204, 0, 1, 206, 206,0.125000 }, + {4205,4206, 0, 1, 40000, 26,0.000000 }, + {4207,4208, 0, 1, 40000, 20,0.031250 }, + {4209,4209, 0, 0, 40000, 6,0.000000 }, + {4210,4210, 0, 0, 40000, 20,0.000000 }, + {4211,4212, 0, 1, 40000, 160,0.031250 }, + {4213,4214, 0, 1, 40000, 73,0.062500 }, + {4215,4216, 0, 1, 2526, 2526,0.093750 }, + {4217,4217, 0, 1, 5153, 5153,0.125000 }, + {4218,4219, 0, 1, 40000, 73,0.000000 }, + {4220,4220, 0, 0, 40000, 60,0.000000 }, + {4221,4221, 0, 0, 40000, 0,0.000000 }, + {4222,4222, 0, 0, 40000, 0,0.000000 }, + {4223,4224, 0, 1, 40000, 73,0.000000 }, + {4225,4225, 0, 0, 40000, 33,0.000000 }, + {4226,4226, 0, 0, 40000, 6,0.000000 }, + {4227,4228, 0, 1, 40000, 40,0.000000 }, + {4229,4229, 0, 0, 40000, 0,0.000000 }, + {4230,4230, 0, 0, 40000, 6,0.000000 }, + {4231,4231, 0, 0, 40000, 33,0.000000 }, + {4232,4233, 0, 1, 40000, 53,0.031250 }, + {4234,4235, 0, 1, 40000, 20,0.046875 }, + {4236,4237, 0, 1, 420, 420,0.031250 }, + {4238,4238, 0, 0, 40000, 106,0.000000 }, + {4239,4239, 0, 0, 40000, 6,0.000000 }, + {4240,4241, 0, 1, 40000, 6,0.125000 }, + {4242,4243, 0, 1, 40000, 13,0.109375 }, + {4244,4245, 0, 1, 40000, 53,0.109375 }, + {4246,4247, 0, 1, 226, 6,-0.031250 }, + {4248,4248, 0, 0, 40000, 6,0.000000 }, + {4249,4250, 0, 1, 40000, 133,0.156250 }, + {4251,4252, 0, 1, 4186, 13,0.125000 }, + {4253,4254, 0, 1, 40000, 26,0.031250 }, + {4255,4256, 0, 1, 40000, 660,0.078125 }, + {4257,4258, 0, 1, 846, 66,0.109375 }, + {4259,4260, 0, 1, 1293, 80,0.078125 }, + {4261,4262, 0, 1, 40000, 300,0.140625 }, + {4263,4264, 0, 1, 2040, 2040,0.109375 }, + {4265,4266, 0, 1, 1360, 1360,0.062500 }, + {4267,4268, 0, 1, 40000, 433,0.093750 }, + {4269,4270, 0, 1, 40000, 533,0.109375 }, + {4271,4272, 0, 1, 826, 826,0.093750 }, + {4273,4274, 0, 1, 40000, 926,0.125000 }, + {4275,4275, 0, 1, 886, 886,0.109375 }, + {4276,4277, 0, 1, 2186, 2186,-0.046875 }, + {4278,4279, 0, 1, 1486, 1486,0.125000 }, + {4280,4281, 0, 1, 40000, 393,-0.078125 }, + {4282,4283, 0, 1, 40000, 1166,0.140625 }, + {4284,4285, 0, 1, 360, 360,0.078125 }, + {4286,4287, 0, 1, 1693, 1693,0.031250 }, + {4288,4289, 0, 1, 760, 760,0.000000 }, + {4290,4291, 0, 1, 126, 126,0.031250 }, + {4292,4292, 0, 0, 300, 300,0.000000 }, + {4293,4294, 0, 1, 280, 280,0.000000 }, + {4295,4296, 0, 1, 40000, 26,0.062500 }, + {4297,4297, 0, 0, 40000, 66,0.000000 }, + {4298,4298, 0, 0, 40000, 53,0.000000 }, + {4299,4299, 0, 0, 1940, 1940,0.000000 }, + {4300,4300, 0, 0, 86, 86,0.000000 }, + {4301,4302, 0, 1, 280, 280,0.031250 }, + {4303,4303, 0, 0, 40, 40,0.000000 }, + {4304,4305, 0, 1, 53, 53,0.000000 }, + {4306,4307, 0, 1, 140, 140,0.000000 }, + {4308,4309, 0, 1, 26, 26,0.000000 }, + {4310,4311, 0, 1, 2153, 2153,0.109375 }, + {4312,4312, 0, 0, 293, 293,0.000000 }, + {4313,4314, 0, 1, 993, 26,0.000000 }, + {4315,4316, 0, 1, 5613, 5613,0.000000 }, + {4317,4317, 0, 0, 220, 220,0.000000 }, + {4318,4319, 0, 1, 10306, 526,0.000000 }, + {4320,4321, 0, 1, 1486, 13,0.000000 }, + {4322,4323, 0, 1, 40000, 660,0.000000 }, + {4324,4324, 0, 0, 120, 120,0.000000 }, + {4325,4325, 34, 0, 40, 40,0.000000 }, + {4326,4326, 28, 0, 73, 73,0.000000 }, + {4327,4328, 39, 1, 233, 233,0.000000 }, + {4327,4328, 33, 1, 193, 193,0.000000 }, + {4329,4330, 63, 1, 33, 33,0.000000 }, + {4331,4331, 15, 0, 13, 13,0.000000 }, + {4332,4332, 36, 0, 13, 13,0.000000 }, + {4332,4333, 36, 1, 133, 133,0.406250 }, + {4334,4335, 25, 1, 13, 13,0.000000 }, + {4336,4335, 25, 1, 33, 33,0.000000 }, + {4337,4338, 61, 1, 40, 40,0.000000 }, + {4339,4340, 37, 1, 53, 53,0.000000 }, + {4341,4342, 15, 1, 320, 320,0.000000 }, + {4343,4344, 48, 1, 73, 73,-1.906250 }, + {4341,4345, 19, 1, 320, 320,0.000000 }, + {4346,4346, 48, 0, 53, 53,0.000000 }, + {4341,4342, 22, 1, 353, 353,0.000000 }, + {4341,4342, 24, 1, 360, 360,0.000000 }, + {4341,4347, 27, 1, 393, 393,0.000000 }, + {4341,4342, 31, 1, 380, 380,0.000000 }, + {4348,4349, 60, 1, 246, 246,0.031250 }, + {4350,4350, 70, 0, 340, 340,0.000000 }, + {4351,4352, 80, 1, 106, 106,0.125000 }, + {4353,4353, 58, 0, 73, 73,0.000000 }, + {4354,4355, 31, 1, 313, 313,0.000000 }, + {4356,4356, 61, 0, 253, 253,0.000000 }, + {4357,4358, 41, 1, 100, 100,0.000000 }, + {4359,4360, 35, 1, 160, 160,0.000000 }, + {4361,4362, 29, 1, 40, 40,0.000000 }, + {4363,4364, 41, 1, 166, 166,0.000000 }, + {4363,4364, 37, 1, 160, 160,0.000000 }, + {4365,4366, 54, 1, 80, 80,0.000000 }, + {4365,4367, 48, 1, 80, 80,0.000000 }, + {4368,4369, 77, 1, 53, 53,0.000000 }, + {4370,4371, 72, 1, 46, 46,0.000000 }, + {4372,4372, 40, 0, 140, 140,0.000000 }, + {4373,4373, 38, 0, 73, 73,0.000000 }, + {4374,4374, 36, 0, 533, 533,0.000000 }, + {4375,4376, 60, 1, 26, 26,0.000000 }, + {4376,4377, 60, 1, 26, 26,0.000000 }, + {4378,4378, 73, 0, 60, 60,0.000000 }, + {4379,4380, 68, 1, 40, 40,0.000000 }, + {4381,4382, 18, 1, 60, 60,0.000000 }, + {4383,4384, 18, 1, 106, 106,0.000000 }, + {4385,4385, 90, 0, 80, 80,0.000000 }, + {4386,4386, 90, 0, 306, 306,0.000000 }, + {4387,4388, 64, 1, 233, 233,0.031250 }, + {4389,4390, 80, 1, 140, 140,0.031250 }, + {4391,4392, 64, 1, 606, 606,0.000000 }, + {4393,4393, 67, 0, 20, 20,0.000000 }, + {4394,4395, 50, 1, 53, 53,0.000000 }, + {4396,4396, 36, 0, 66, 66,0.000000 }, + {4397,4397, 0, 0, 40000, 20,0.000000 }, + {4398,4398, 0, 0, 40000, 0,0.000000 }, + {4399,4399, 0, 0, 360, 360,0.000000 }, + {4400,4400, 0, 0, 586, 586,0.000000 }, + {4401,4401, 0, 0, 40000, 0,0.000000 }, + {4402,4402, 0, 0, 40000, 0,0.000000 }, {4403,4403, 0, 0, 40000, 0,0.000000 }, - {4404,4404, 0, 0, 40000, 0,0.000000 }, + {4404,4404, 0, 0, 40000, 6,0.000000 }, {4405,4405, 0, 0, 40000, 0,0.000000 }, - {4406,4406, 0, 0, 40000, 6,0.000000 }, - {4407,4407, 0, 0, 40000, 0,0.000000 }, - {4408,4408, 0, 0, 146, 146,0.000000 }, - {4408,4408, 73, 0, 886, 886,0.000000 }, - {4409,4409, 0, 0, 40, 0,0.000000 }, - {4410,4410, 0, 0, 486, 0,0.000000 }, - {4411,4411, 0, 0, 1226, 1226,0.000000 }, - {4412,4412, 0, 0, 1480, 1480,0.000000 }, - {4413,4413, 0, 0, 46, 46,0.000000 }, - {4414,4414, 0, 0, 126, 126,0.000000 }, - {4414,4414, 12, 0, 106, 106,0.000000 }, - {4415,4415, 0, 0, 160, 160,0.000000 }, - {4415,4415, 1, 0, 153, 153,0.000000 }, - {4416,4416, 0, 0, 20, 20,0.000000 }, - {4416,4416, 23, 0, 26, 26,0.000000 }, - {4417,4417, 0, 0, 140, 140,0.000000 }, - {4418,4418, 0, 0, 486, 486,0.000000 }, - {4419,4419, 0, 0, 40000, 13,0.000000 }, - {4420,4420, 0, 0, 40000, 0,0.000000 }, - {4421,4421, 0, 0, 1226, 1226,0.000000 }, - {4422,4422, 0, 0, 766, 766,0.000000 }, - {4423,4423, 0, 0, 93, 93,0.000000 }, - {4424,4424, 0, 2, 40000, 0,0.000000 }, + {4406,4406, 0, 0, 146, 146,0.000000 }, + {4406,4406, 73, 0, 886, 886,0.000000 }, + {4407,4407, 0, 0, 40, 0,0.000000 }, + {4408,4408, 0, 0, 486, 0,0.000000 }, + {4409,4409, 0, 0, 1226, 1226,0.000000 }, + {4410,4410, 0, 0, 1480, 1480,0.000000 }, + {4411,4411, 0, 0, 46, 46,0.000000 }, + {4412,4412, 0, 0, 126, 126,0.000000 }, + {4412,4412, 12, 0, 106, 106,0.000000 }, + {4413,4413, 0, 0, 160, 160,0.000000 }, + {4413,4413, 1, 0, 153, 153,0.000000 }, + {4414,4414, 0, 0, 20, 20,0.000000 }, + {4414,4414, 23, 0, 26, 26,0.000000 }, + {4415,4415, 0, 0, 140, 140,0.000000 }, + {4416,4416, 0, 0, 486, 486,0.000000 }, + {4417,4417, 0, 0, 40000, 13,0.000000 }, + {4418,4418, 0, 0, 40000, 0,0.000000 }, + {4419,4419, 0, 0, 1226, 1226,0.000000 }, + {4420,4420, 0, 0, 766, 766,0.000000 }, + {4421,4421, 0, 0, 93, 93,0.000000 }, + {4422,4422, 0, 2, 40000, 0,0.000000 }, }; @@ -9002,7 +9002,7 @@ int maxAdlBanks() const char* const banknames[74] = { - "AIL (Star Control 3, Albion, Empire 2, many others)", + "AIL (Star Control 3, Albion, Empire 2, etc.)", "Bisqwit (selection of 4op and 2op)", "HMI (Descent, Asterix)", "HMI (Descent:: Int)", @@ -9016,47 +9016,47 @@ const char* const banknames[74] = "HMI (Aces of the Deep)", "HMI (Earthsiege)", "HMI (Anvil of Dawn)", - "DMX (Doom)", + "DMX (Doom 2)", "DMX (Hexen, Heretic)", - "DMX (MUS Play)", - "AIL (Discworld, Grandest Fleet)", + "DMX (DOOM, MUS Play)", + "AIL (Discworld, Grandest Fleet, etc.)", "AIL (Warcraft 2)", "AIL (Syndicate)", - "AIL (Guilty, Orion Conspiracy)", + "AIL (Guilty, Orion Conspiracy, TNSFC ::4op)", "AIL (Magic Carpet 2)", "AIL (Nemesis)", "AIL (Jagged Alliance)", - "AIL (When Two Worlds War)", - "AIL (Bards Tale Construction)", + "AIL (When Two Worlds War :MISS-INS:)", + "AIL (Bards Tale Construction :MISS-INS:)", "AIL (Return to Zork)", "AIL (Theme Hospital)", "AIL (National Hockey League PA)", "AIL (Inherit The Earth)", "AIL (Inherit The Earth, file two)", - "AIL (Little Big Adventure)", + "AIL (Little Big Adventure :: 4op)", "AIL (Wreckin Crew)", "AIL (Death Gate)", "AIL (FIFA International Soccer)", "AIL (Starship Invasion)", - "AIL (Super Street Fighter 2)", - "AIL (Lords of the Realm)", - "AIL (SimFarm, SimHealth)", + "AIL (Super Street Fighter 2 :4op:)", + "AIL (Lords of the Realm :MISS-INS:)", + "AIL (SimFarm, SimHealth :: 4op)", "AIL (SimFarm, Settlers, Serf City)", - "AIL (Caesar 2, MISSING INSTRUMENTS)", + "AIL (Caesar 2, :p4op::MISS-INS:)", "AIL (Syndicate Wars)", "AIL (Bubble Bobble Feat. Rainbow Islands, Z)", "AIL (Warcraft)", - "AIL (Terra Nova Strike Force Centuri)", - "AIL (System Shock)", + "AIL (Terra Nova Strike Force Centuri :p4op:)", + "AIL (System Shock :p4op:)", "AIL (Advanced Civilization)", - "AIL (Battle Chess 4000, melodic only)", - "AIL (Ultimate Soccer Manager)", - "AIL (Air Bucks, Blue And The Gray)", + "AIL (Battle Chess 4000 :p4op:)", + "AIL (Ultimate Soccer Manager :p4op:)", + "AIL (Air Bucks, Blue And The Gray, etc)", "AIL (Ultima Underworld 2)", "AIL (Kasparov's Gambit)", - "AIL (High Seas Trader)", - "AIL (Master of Magic, std percussion)", - "AIL (Master of Magic, orchestral percussion)", + "AIL (High Seas Trader :MISS-INS:)", + "AIL (Master of Magic, :4op: std percussion)", + "AIL (Master of Magic, :4op: orchestral percussion)", "SB (Action Soccer)", "SB (3d Cyberpuck :: melodic only)", "SB (Simon the Sorcerer :: melodic only)", @@ -10388,14 +10388,14 @@ const unsigned short banks[74][256] = 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806,4467,4468,4469,4470,4471, 4472,4473,4474,4475,4476,4477,4217,4478,4218,4479,4480,4481,4482,4483,4221,4484, 4485,4222,4486,4487,4224,4488,4489,4226,4490,4227,4491,4492,4493,4494,4495,4496, -4497,4498,4499,4500,4501, 320,4502,4503,4504,4231,4232,4505,4506,1374,4507,4508, -4509,4510,4511,4512,4513,4514,4515,4516, 806, 806, 806, 806, 806, 806, 806, 806, +4497,4498,4499,4500,4501, 320,4502,4503,4504,4505,4506,4507,4508,1374,4509,4510, +4511,4512,4513,4514,4515,4516,4517,4518, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, }, { -4517,4518,4519,4520,4518,4521,4522,4523,4524,4525,4526,4528,4529,4530,4531,4532, -4533,4535,4537,4530,4539,4540,4541,4542,4543,4544,4545, 295, 28, 29, 30, 31, +4519,4520,4521,4522,4520,4523,4524,4525,4526,4527,4528,4530,4531,4532,4533,4534, +4535,4537,4539,4532,4541,4542,4543,4544,4545,4546,4547, 295, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 33, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, @@ -10404,8 +10404,8 @@ const unsigned short banks[74][256] = 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, - 295, 295, 295, 127,4534, 128,4536, 130, 131, 132,4538, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144,4527, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 295, 295, 295, 127,4536, 128,4538, 130, 131, 132,4540, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144,4529, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, @@ -10415,7 +10415,7 @@ const unsigned short banks[74][256] = const AdlBankSetup adlbanksetup[74] = { - {0, 1, 1, 0, 0}, //Bank 0, AIL (Star Control 3, Albion, Empire 2, Sensible Soccer, Settlers 2, many others) + {0, 1, 1, 0, 0}, //Bank 0, AIL (Star Control 3, Albion, Empire 2, etc.) {0, 1, 1, 0, 0}, //Bank 1, Bisqwit (selection of 4op and 2op) {0, 0, 0, 0, 0}, //Bank 2, HMI (Descent, Asterix) {0, 0, 0, 0, 0}, //Bank 3, HMI (Descent:: Int) @@ -10429,18 +10429,18 @@ const AdlBankSetup adlbanksetup[74] = {0, 0, 0, 0, 0}, //Bank 11, HMI (Aces of the Deep) {0, 0, 0, 0, 0}, //Bank 12, HMI (Earthsiege) {0, 0, 0, 0, 0}, //Bank 13, HMI (Anvil of Dawn) - {2, 0, 0, 0, 0}, //Bank 14, DMX (Doom :: partially pseudo 4op) - {2, 0, 0, 0, 0}, //Bank 15, DMX (Hexen, Heretic :: partially pseudo 4op) - {2, 0, 0, 0, 0}, //Bank 16, DMX (MUS Play :: partially pseudo 4op) - {0, 1, 1, 0, 0}, //Bank 17, AIL (Discworld, Grandest Fleet, Pocahontas, Slob Zone 3d, Ultima 4, Zorro) + {2, 0, 0, 0, 0}, //Bank 14, DMX (Doom 2) + {2, 0, 0, 0, 0}, //Bank 15, DMX (Hexen, Heretic) + {2, 0, 0, 0, 0}, //Bank 16, DMX (DOOM, MUS Play) + {0, 1, 1, 0, 0}, //Bank 17, AIL (Discworld, Grandest Fleet, etc.) {0, 1, 1, 0, 0}, //Bank 18, AIL (Warcraft 2) {0, 1, 1, 0, 0}, //Bank 19, AIL (Syndicate) - {0, 1, 1, 0, 0}, //Bank 20, AIL (Guilty, Orion Conspiracy, Terra Nova Strike Force Centauri :: 4op) + {0, 1, 1, 0, 0}, //Bank 20, AIL (Guilty, Orion Conspiracy, TNSFC ::4op) {0, 1, 1, 0, 0}, //Bank 21, AIL (Magic Carpet 2) {0, 1, 1, 0, 0}, //Bank 22, AIL (Nemesis) {0, 1, 1, 0, 0}, //Bank 23, AIL (Jagged Alliance) - {0, 1, 1, 0, 0}, //Bank 24, AIL (When Two Worlds War :: 4op, MISSING INSTRUMENTS) - {0, 1, 1, 0, 0}, //Bank 25, AIL (Bards Tale Construction :: MISSING INSTRUMENTS) + {0, 1, 1, 0, 0}, //Bank 24, AIL (When Two Worlds War :MISS-INS:) + {0, 1, 1, 0, 0}, //Bank 25, AIL (Bards Tale Construction :MISS-INS:) {0, 1, 1, 0, 0}, //Bank 26, AIL (Return to Zork) {0, 1, 1, 0, 0}, //Bank 27, AIL (Theme Hospital) {0, 1, 1, 0, 0}, //Bank 28, AIL (National Hockey League PA) @@ -10451,25 +10451,25 @@ const AdlBankSetup adlbanksetup[74] = {0, 1, 1, 0, 0}, //Bank 33, AIL (Death Gate) {0, 1, 1, 0, 0}, //Bank 34, AIL (FIFA International Soccer) {0, 1, 1, 0, 0}, //Bank 35, AIL (Starship Invasion) - {0, 1, 1, 0, 0}, //Bank 36, AIL (Super Street Fighter 2 :: 4op) - {0, 1, 1, 0, 0}, //Bank 37, AIL (Lords of the Realm :: MISSING INSTRUMENTS) + {0, 1, 1, 0, 0}, //Bank 36, AIL (Super Street Fighter 2 :4op:) + {0, 1, 1, 0, 0}, //Bank 37, AIL (Lords of the Realm :MISS-INS:) {0, 1, 1, 0, 0}, //Bank 38, AIL (SimFarm, SimHealth :: 4op) {0, 1, 1, 0, 0}, //Bank 39, AIL (SimFarm, Settlers, Serf City) - {0, 1, 1, 0, 0}, //Bank 40, AIL (Caesar 2 :: partially 4op, MISSING INSTRUMENTS) + {0, 1, 1, 0, 0}, //Bank 40, AIL (Caesar 2, :p4op::MISS-INS:) {0, 1, 1, 0, 0}, //Bank 41, AIL (Syndicate Wars) {0, 1, 1, 0, 0}, //Bank 42, AIL (Bubble Bobble Feat. Rainbow Islands, Z) {0, 1, 1, 0, 0}, //Bank 43, AIL (Warcraft) - {0, 1, 1, 0, 0}, //Bank 44, AIL (Terra Nova Strike Force Centuri :: partially 4op) - {0, 1, 1, 0, 0}, //Bank 45, AIL (System Shock :: partially 4op) + {0, 1, 1, 0, 0}, //Bank 44, AIL (Terra Nova Strike Force Centuri :p4op:) + {0, 1, 1, 0, 0}, //Bank 45, AIL (System Shock :p4op:) {0, 1, 1, 0, 0}, //Bank 46, AIL (Advanced Civilization) - {0, 1, 1, 0, 0}, //Bank 47, AIL (Battle Chess 4000 :: partially 4op, melodic only) - {0, 1, 1, 0, 0}, //Bank 48, AIL (Ultimate Soccer Manager :: partially 4op) - {0, 1, 1, 0, 0}, //Bank 49, AIL (Air Bucks, Blue And The Gray, America Invades, Terminator 2029) + {0, 1, 1, 0, 0}, //Bank 47, AIL (Battle Chess 4000 :p4op:) + {0, 1, 1, 0, 0}, //Bank 48, AIL (Ultimate Soccer Manager :p4op:) + {0, 1, 1, 0, 0}, //Bank 49, AIL (Air Bucks, Blue And The Gray, etc) {0, 1, 1, 0, 0}, //Bank 50, AIL (Ultima Underworld 2) {0, 1, 1, 0, 0}, //Bank 51, AIL (Kasparov's Gambit) - {0, 1, 1, 0, 0}, //Bank 52, AIL (High Seas Trader :: MISSING INSTRUMENTS) - {0, 0, 0, 0, 0}, //Bank 53, AIL (Master of Magic, Master of Orion 2 :: 4op, std percussion) - {0, 0, 0, 0, 0}, //Bank 54, AIL (Master of Magic, Master of Orion 2 :: 4op, orchestral percussion) + {0, 1, 1, 0, 0}, //Bank 52, AIL (High Seas Trader :MISS-INS:) + {0, 0, 0, 0, 0}, //Bank 53, AIL (Master of Magic, :4op: std percussion) + {0, 0, 0, 0, 0}, //Bank 54, AIL (Master of Magic, :4op: orchestral percussion) {0, 0, 0, 0, 0}, //Bank 55, SB (Action Soccer) {0, 0, 0, 0, 0}, //Bank 56, SB (3d Cyberpuck :: melodic only) {0, 0, 0, 0, 0}, //Bank 57, SB (Simon the Sorcerer :: melodic only) From 2d79d187d506c67ada6a31710332936ed2a2ad1b Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 28 Mar 2018 20:37:55 +0300 Subject: [PATCH 13/50] OPNMIDI: Remove std:: from all snprintf calls --- src/sound/opnmidi/opnmidi_midiplay.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sound/opnmidi/opnmidi_midiplay.cpp b/src/sound/opnmidi/opnmidi_midiplay.cpp index 58c4c350a..cd77429d8 100644 --- a/src/sound/opnmidi/opnmidi_midiplay.cpp +++ b/src/sound/opnmidi/opnmidi_midiplay.cpp @@ -280,7 +280,7 @@ bool OPNMIDIplay::buildTrackData() evtPos.delay = ReadVarLenEx(&trackPtr, end, ok); if(!ok) { - int len = std::snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); + int len = snprintf(error, 150, "buildTrackData: Can't read variable-length value at begin of track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -308,7 +308,7 @@ bool OPNMIDIplay::buildTrackData() event = parseEvent(&trackPtr, end, status); if(!event.isValid) { - int len = std::snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); + int len = snprintf(error, 150, "buildTrackData: Fail to parse event in the track %d.\n", (int)tk); if((len > 0) && (len < 150)) errorString += std::string(error, (size_t)len); return false; @@ -2567,12 +2567,12 @@ retry_arpeggio: // if(ains.tone) // { // /*if(ains.tone < 20) -// std::snprintf(ToneIndication, 8, "+%-2d", ains.tone); +// snprintf(ToneIndication, 8, "+%-2d", ains.tone); // else*/ // if(ains.tone < 128) -// std::snprintf(ToneIndication, 8, "=%-2d", ains.tone); +// snprintf(ToneIndication, 8, "=%-2d", ains.tone); // else -// std::snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); +// snprintf(ToneIndication, 8, "-%-2d", ains.tone - 128); // } // std::printf("%s%s%s%u\t", // ToneIndication, From cbad9ac21923568602df30b867ed9f66f508fb55 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 29 Mar 2018 16:41:29 +0300 Subject: [PATCH 14/50] Fixed crash when event handler class isn't derived from StaticEventHandler --- src/events.cpp | 77 ++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/src/events.cpp b/src/events.cpp index 7ef72b0db..17fc30bea 100755 --- a/src/events.cpp +++ b/src/events.cpp @@ -174,8 +174,9 @@ bool E_CheckHandler(DStaticEventHandler* handler) bool E_IsStaticType(PClass* type) { - return (type->IsDescendantOf(RUNTIME_CLASS(DStaticEventHandler)) && // make sure it's from our hierarchy at all. - !type->IsDescendantOf(RUNTIME_CLASS(DEventHandler))); + assert(type != nullptr); + assert(type->IsDescendantOf(RUNTIME_CLASS(DStaticEventHandler))); + return !type->IsDescendantOf(RUNTIME_CLASS(DEventHandler)); } void E_SerializeEvents(FSerializer& arc) @@ -230,27 +231,24 @@ void E_SerializeEvents(FSerializer& arc) } } -static void E_InitStaticHandler(PClass* type, FString typestring, bool map) +static PClass* E_GetHandlerClass(const FString& typeName) { + PClass* type = PClass::FindClass(typeName); + if (type == nullptr) { - I_Error("Fatal: unknown event handler class %s in MAPINFO!\n", typestring.GetChars()); - return; - + I_Error("Fatal: unknown event handler class %s", typeName.GetChars()); + } + else if (!type->IsDescendantOf(RUNTIME_CLASS(DStaticEventHandler))) + { + I_Error("Fatal: event handler class %s is not derived from StaticEventHandler", typeName.GetChars()); } - if (E_IsStaticType(type) && map) - { - I_Error("Fatal: invalid event handler class %s in MAPINFO!\nMap-specific event handlers cannot be static.\n", typestring.GetChars()); - return; - } - /* - if (!E_IsStaticType(type) && !map) - { - Printf("%cGWarning: invalid event handler class %s in MAPINFO!\nMAPINFO event handlers should inherit Static* directly!\n", TEXTCOLOR_ESCAPE, typestring.GetChars()); - return; - }*/ + return type; +} +static void E_InitHandler(PClass* type) +{ // check if type already exists, don't add twice. bool typeExists = false; for (DStaticEventHandler* handler = E_FirstEventHandler; handler; handler = handler->next) @@ -269,41 +267,34 @@ static void E_InitStaticHandler(PClass* type, FString typestring, bool map) void E_InitStaticHandlers(bool map) { + // don't initialize map handlers if restoring from savegame. if (savegamerestore) return; // just make sure E_Shutdown(map); - if (map) // don't initialize map handlers if restoring from savegame. + // initialize event handlers from gameinfo + for (const FString& typeName : gameinfo.EventHandlers) { - // load non-static handlers from gameinfo - for (unsigned int i = 0; i < gameinfo.EventHandlers.Size(); i++) - { - FString typestring = gameinfo.EventHandlers[i]; - PClass* type = PClass::FindClass(typestring); - if (!type || E_IsStaticType(type)) // don't init the really global stuff here. - continue; - E_InitStaticHandler(type, typestring, false); - } - - for (unsigned int i = 0; i < level.info->EventHandlers.Size(); i++) - { - FString typestring = level.info->EventHandlers[i]; - PClass* type = PClass::FindClass(typestring); - E_InitStaticHandler(type, typestring, true); - } + PClass* type = E_GetHandlerClass(typeName); + // don't init the really global stuff here on startup initialization. + // don't init map-local global stuff here on level setup. + if (map == E_IsStaticType(type)) + continue; + E_InitHandler(type); } - else + + if (!map) + return; + + // initialize event handlers from mapinfo + for (const FString& typeName : level.info->EventHandlers) { - for (unsigned int i = 0; i < gameinfo.EventHandlers.Size(); i++) - { - FString typestring = gameinfo.EventHandlers[i]; - PClass* type = PClass::FindClass(typestring); - if (!type || !E_IsStaticType(type)) // don't init map-local global stuff here. - continue; - E_InitStaticHandler(type, typestring, false); - } + PClass* type = E_GetHandlerClass(typeName); + if (E_IsStaticType(type)) + I_Error("Fatal: invalid event handler class %s in MAPINFO!\nMap-specific event handlers cannot be static.\n", typeName.GetChars()); + E_InitHandler(type); } } From b95265330315b1621fede188ecb67d2a2fc82698 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 29 Mar 2018 17:36:48 +0300 Subject: [PATCH 15/50] Set more suitable limit for sound velocity validation https://forum.zdoom.org/viewtopic.php?t=59979 --- src/s_sound.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 74be46c20..a2eb8d731 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -817,14 +817,17 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector, // //========================================================================== -inline bool Validate(const float value) +inline bool Validate(const float value, const float limit) { - return value >= -32768.f && value <= 32768.f; + return value >= -limit && value <= limit; } -static bool Validate(const FVector3 &value, const char *const name, const AActor *const actor) +static bool Validate(const FVector3 &value, const float limit, const char *const name, const AActor *const actor) { - const bool valid = Validate(value.X) && Validate(value.Y) && Validate(value.Z); + const bool valid = + Validate(value.X, limit) + && Validate(value.Y, limit) + && Validate(value.Z, limit); if (!valid) { @@ -845,8 +848,13 @@ static bool Validate(const FVector3 &value, const char *const name, const AActor static bool ValidatePosVel(const AActor *actor, const FVector3 &pos, const FVector3 &vel) { - const bool valid = Validate(pos, "position", actor); - return Validate(vel, "velocity", actor) && valid; + // The actual limit for map coordinates + static const float POSITION_LIMIT = 32768.f; + const bool valid = Validate(pos, POSITION_LIMIT, "position", actor); + + // The maximum velocity is enough to travel through entire map in one tic + static const float VELOCITY_LIMIT = 2 * sqrtf(2.f) * POSITION_LIMIT * TICRATE; + return Validate(vel, VELOCITY_LIMIT, "velocity", actor) && valid; } static bool ValidatePosVel(const FSoundChan *const chan, const FVector3 &pos, const FVector3 &vel) From 74c5bab075976f8485cd1c7710017413f34f9797 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Fri, 30 Mar 2018 02:09:15 +0300 Subject: [PATCH 16/50] Attempt to fix a blank banks list of ADLMIDI That happen because of silly dependency on soundfonts list which is totally unneeded to ADLMIDI as it uses embedded banks or external banks in a different format. https://forum.zdoom.org/viewtopic.php?f=104&t=59997&p=1047184 --- src/menu/menudef.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 67d9d0a9f..840c0fce2 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -1429,11 +1429,11 @@ static void InitMusicMenus() if (menu != nullptr) { - if (soundfonts.Size() > 0) + int adl_banks_count = adl_getBanksCount(); + if (adl_banks_count > 0) { - int adl_banks_count = adl_getBanksCount(); const char *const *adl_bank_names = adl_getBankNames(); - for(int i=0; i < adl_banks_count; i++) + for (int i=0; i < adl_banks_count; i++) { auto it = CreateOptionMenuItemCommand(adl_bank_names[i], FStringf("adl_bank %d", i), true); static_cast(*menu)->mItems.Push(it); From 140ad241c4f4434012122e3937d8daa4dcf817f8 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 30 Mar 2018 10:42:22 +0300 Subject: [PATCH 17/50] Adjusted validation limit for sound velocity again :( https://forum.zdoom.org/viewtopic.php?t=59979 --- src/s_sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s_sound.cpp b/src/s_sound.cpp index a2eb8d731..a41663c3a 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -853,7 +853,7 @@ static bool ValidatePosVel(const AActor *actor, const FVector3 &pos, const FVect const bool valid = Validate(pos, POSITION_LIMIT, "position", actor); // The maximum velocity is enough to travel through entire map in one tic - static const float VELOCITY_LIMIT = 2 * sqrtf(2.f) * POSITION_LIMIT * TICRATE; + static const float VELOCITY_LIMIT = 2 * POSITION_LIMIT * TICRATE; return Validate(vel, VELOCITY_LIMIT, "velocity", actor) && valid; } From a6738fd139a81f7acf7f831fa4d46b8ee440e9e1 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 30 Mar 2018 10:44:42 +0300 Subject: [PATCH 18/50] Fixed infinite loop with None class in random spawner actor NoneSpawner : RandomSpawner { DropItem "None" } https://forum.zdoom.org/viewtopic.php?t=60027 --- wadsrc/static/zscript/shared/randomspawner.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wadsrc/static/zscript/shared/randomspawner.txt b/wadsrc/static/zscript/shared/randomspawner.txt index 9914670b4..24892aeec 100644 --- a/wadsrc/static/zscript/shared/randomspawner.txt +++ b/wadsrc/static/zscript/shared/randomspawner.txt @@ -44,16 +44,16 @@ class RandomSpawner : Actor { while (di != null) { - if (di.Name != 'None') + bool shouldSkip = (di.Name == 'None') || (nomonsters && IsMonster(di)); + + if (!shouldSkip) { - if (!nomonsters || !IsMonster(di)) - { - int amt = di.Amount; - if (amt < 0) amt = 1; // default value is -1, we need a positive value. - n += amt; // this is how we can weight the list. - } - di = di.Next; + int amt = di.Amount; + if (amt < 0) amt = 1; // default value is -1, we need a positive value. + n += amt; // this is how we can weight the list. } + + di = di.Next; } if (n == 0) { // Nothing left to spawn. They must have all been monsters, and monsters are disabled. From 84e9017a5f949a8bad10c2b91d9007b40da2f5f3 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 30 Mar 2018 12:49:35 +0300 Subject: [PATCH 19/50] Fixed infinite loop with zero height fast projectile https://forum.zdoom.org/viewtopic.php?t=60019 --- wadsrc/static/zscript/shared/fastprojectile.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/shared/fastprojectile.txt b/wadsrc/static/zscript/shared/fastprojectile.txt index c861a3f8f..4ba05a7bf 100644 --- a/wadsrc/static/zscript/shared/fastprojectile.txt +++ b/wadsrc/static/zscript/shared/fastprojectile.txt @@ -66,13 +66,21 @@ class FastProjectile : Actor int count = 8; if (radius > 0) { - while ( abs(Vel.X) >= radius * count || abs(Vel.Y) >= radius * count || abs(Vel.Z) >= height * count) + while (abs(Vel.X) >= radius * count || abs(Vel.Y) >= radius * count) { // we need to take smaller steps. count += count; } } + if (height > 0) + { + while (abs(Vel.Z) >= height * count) + { + count += count; + } + } + // Handle movement if (Vel != (0, 0, 0) || (pos.Z != floorz)) { From 408a2f6dabeed55e77947df117e4a1a187a9a39b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 30 Mar 2018 16:38:51 +0300 Subject: [PATCH 20/50] Fixed uninitialized members in DPSprite class https://forum.zdoom.org/viewtopic.php?t=60034 --- src/p_pspr.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 45e92a8d0..c419f2228 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -153,10 +153,13 @@ DPSprite::DPSprite(player_t *owner, AActor *caller, int id) : x(.0), y(.0), oldx(.0), oldy(.0), firstTic(true), + Tics(0), Flags(0), Caller(caller), Owner(owner), + State(nullptr), Sprite(0), + Frame(0), ID(id), processPending(true) { From 709bbe3db03603eb1451776e7bd67cf61ad69297 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 30 Mar 2018 16:40:31 +0300 Subject: [PATCH 21/50] Fixed crash on accessing player sprite's state in software renderer https://forum.zdoom.org/viewtopic.php?t=60034 --- src/polyrenderer/scene/poly_playersprite.cpp | 3 ++- src/swrenderer/things/r_playersprite.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/polyrenderer/scene/poly_playersprite.cpp b/src/polyrenderer/scene/poly_playersprite.cpp index faf2f2a9a..5626e6f7b 100644 --- a/src/polyrenderer/scene/poly_playersprite.cpp +++ b/src/polyrenderer/scene/poly_playersprite.cpp @@ -354,7 +354,8 @@ void RenderPolyPlayerSprites::RenderSprite(PolyRenderThread *thread, DPSprite *p invertcolormap = !invertcolormap; } - bool fullbright = !foggy && pspr->GetState()->GetFullbright(); + const FState* const psprState = pspr->GetState(); + bool fullbright = !foggy && (psprState == nullptr ? false : psprState->GetFullbright()); bool fadeToBlack = (vis.RenderStyle.Flags & STYLEF_FadeToBlack) != 0; vis.Light.SetColormap(0, spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack); diff --git a/src/swrenderer/things/r_playersprite.cpp b/src/swrenderer/things/r_playersprite.cpp index b0021ca32..240f8e0c2 100644 --- a/src/swrenderer/things/r_playersprite.cpp +++ b/src/swrenderer/things/r_playersprite.cpp @@ -357,7 +357,8 @@ namespace swrenderer invertcolormap = !invertcolormap; } - bool fullbright = !foggy && pspr->GetState()->GetFullbright(); + const FState* const psprState = pspr->GetState(); + bool fullbright = !foggy && (psprState == nullptr ? false : psprState->GetFullbright()); bool fadeToBlack = (vis.RenderStyle.Flags & STYLEF_FadeToBlack) != 0; vis.Light.SetColormap(0, spriteshade, basecolormap, fullbright, invertcolormap, fadeToBlack); From 0441994106f5224f9048870de47ddd65c2cb9999 Mon Sep 17 00:00:00 2001 From: ZippeyKeys12 Date: Fri, 30 Mar 2018 18:06:46 -0500 Subject: [PATCH 22/50] Default newradius in A_SetSize --- src/p_actionfunctions.cpp | 2 +- wadsrc/static/zscript/actor.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_actionfunctions.cpp b/src/p_actionfunctions.cpp index 1a3333bdd..0cb4e9849 100644 --- a/src/p_actionfunctions.cpp +++ b/src/p_actionfunctions.cpp @@ -6765,7 +6765,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CheckTerrain) DEFINE_ACTION_FUNCTION(AActor, A_SetSize) { PARAM_SELF_PROLOGUE(AActor); - PARAM_FLOAT(newradius); + PARAM_FLOAT_DEF(newradius); PARAM_FLOAT_DEF(newheight); PARAM_BOOL_DEF(testpos); diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actor.txt index a7f76f348..bec97eda3 100644 --- a/wadsrc/static/zscript/actor.txt +++ b/wadsrc/static/zscript/actor.txt @@ -1145,7 +1145,7 @@ class Actor : Thinker native native bool A_CopySpriteFrame(int from, int to, int flags = 0); native bool A_SetVisibleRotation(double anglestart = 0, double angleend = 0, double pitchstart = 0, double pitchend = 0, int flags = 0, int ptr = AAPTR_DEFAULT); native void A_SetTranslation(name transname); - native bool A_SetSize(double newradius, double newheight = -1, bool testpos = false); + native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false); native void A_SprayDecal(String name, double dist = 172); native void A_SetMugshotState(String name); From 17bc9c3f69669713ca256c45d5a373d707cc5b3c Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 31 Mar 2018 11:46:06 +0300 Subject: [PATCH 23/50] Fixed handling of default value in Actor.Vec3Angle() --- src/p_mobj.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index e27ab198c..21126f645 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -8317,15 +8317,15 @@ DEFINE_ACTION_FUNCTION(AActor, Vec2To) { PARAM_SELF_PROLOGUE(AActor); PARAM_OBJECT_NOT_NULL(t, AActor) - ACTION_RETURN_VEC2(self->Vec2To(t)); + ACTION_RETURN_VEC2(self->Vec2To(t)); } DEFINE_ACTION_FUNCTION(AActor, Vec3Angle) { PARAM_SELF_PROLOGUE(AActor); PARAM_FLOAT(length) - PARAM_ANGLE(angle); - PARAM_FLOAT(z); + PARAM_ANGLE(angle); + PARAM_FLOAT_DEF(z); PARAM_BOOL_DEF(absolute); ACTION_RETURN_VEC3(self->Vec3Angle(length, angle, z, absolute)); } From ca0e39cd0ce7ca1ca76994d35832e48749dfad74 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 31 Mar 2018 15:20:00 +0300 Subject: [PATCH 24/50] Added ability to load any IWAD without extension Previously, only .wad files can specified without file extension for -iwad command line option For example, -iwad square1 will load square1.pk3 as IWAD --- src/d_iwad.cpp | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 29c3ea98b..5aa5f35b8 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -519,28 +519,39 @@ int FIWadManager::IdentifyVersion (TArray &wadfiles, const char *iwad, if (iwadparm) { - // Check if the given IWAD has an absolute path, in which case the search path will be ignored. - custwad = iwadparm; - FixPathSeperator(custwad); - DefaultExtension(custwad, ".wad"); - bool isAbsolute = (custwad[0] == '/'); + const char* const extensions[] = { ".wad", ".pk3", ".iwad", ".ipk3", ".ipk7" }; + + for (auto ext : extensions) + { + // Check if the given IWAD has an absolute path, in which case the search path will be ignored. + custwad = iwadparm; + FixPathSeperator(custwad); + DefaultExtension(custwad, ext); + bool isAbsolute = (custwad[0] == '/'); #ifdef WINDOWS - isAbsolute |= (custwad.Len() >= 2 && custwad[1] == ':'); + isAbsolute |= (custwad.Len() >= 2 && custwad[1] == ':'); #endif - if (isAbsolute) - { - if (FileExists(custwad)) mFoundWads.Push({ custwad, "", -1 }); - } - else - { - for (auto &dir : mSearchPaths) + if (isAbsolute) { - FStringf fullpath("%s/%s", dir.GetChars(), custwad.GetChars()); - if (FileExists(fullpath)) + if (FileExists(custwad)) mFoundWads.Push({ custwad, "", -1 }); + } + else + { + for (auto &dir : mSearchPaths) { - mFoundWads.Push({ fullpath, "", -1 }); + FStringf fullpath("%s/%s", dir.GetChars(), custwad.GetChars()); + if (FileExists(fullpath)) + { + mFoundWads.Push({ fullpath, "", -1 }); + } } } + + if (mFoundWads.Size() != numFoundWads) + { + // Found IWAD with guessed extension + break; + } } } // -iwad not found or not specified. Revert back to standard behavior. From b36fc82fff16f38c7bb03f8ddbe58da34a82d020 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 31 Mar 2018 15:25:25 +0300 Subject: [PATCH 25/50] Removed check for duplicate IWADs Skipping of duplicate IWADs seems to serve a cosmetic purpose only but it caused troubles with custom IWADs https://forum.zdoom.org/viewtopic.php?t=58333 --- src/d_iwad.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 5aa5f35b8..d263ba073 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -348,13 +348,6 @@ int FIWadManager::CheckIWADInfo(const char *fn) FIWADInfo result; ParseIWadInfo(resfile->Filename, (const char*)lmp->CacheLump(), lmp->LumpSize, &result); delete resfile; - for (auto &wadinf : mIWadInfos) - { - if (wadinf.Name == result.Name) - { - return -1; // do not show the same one twice. - } - } return mIWadInfos.Push(result); } catch (CRecoverableError &err) From 4afc538f885612f72841f9802fbbd2d17929d674 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 31 Mar 2018 18:14:27 +0200 Subject: [PATCH 26/50] =?UTF-8?q?Localize=20the=20word=20=E2=80=9Cfor?= =?UTF-8?q?=E2=80=9D=20in=20Strife=E2=80=99s=20trading=20dialogs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This deals with what seems to be the only hardcoded piece of text in Strife. Also added a translation to the French file and removed a few superfluous line breaks in the English one. --- wadsrc/static/language.enu | 7 +------ wadsrc/static/language.fr | 2 ++ wadsrc/static/zscript/menu/conversationmenu.txt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index da16d83e4..d7da664e1 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -579,7 +579,6 @@ NERVETEXT = "\n" "THIS RIDE IS CLOSED.\n"; - // Cast list (must appear in this order) CC_ZOMBIE = "ZOMBIEMAN"; CC_SHOTGUN = "SHOTGUN GUY"; @@ -1299,7 +1298,6 @@ TXT_IMITEMS = "ITEMS"; TXT_IMSECRETS = "SECRETS"; TXT_IMTIME = "TIME"; - RAVENQUITMSG = "ARE YOU SURE YOU WANT TO QUIT?"; // Hexen strings @@ -1459,7 +1457,6 @@ TXT_MAULER = "You picked up the mauler."; TXT_GLAUNCHER = "You picked up the Grenade launcher."; TXT_SIGIL = "You picked up the SIGIL."; - TXT_BASEKEY = "You picked up the Base Key."; TXT_GOVSKEY = "You picked up the Govs Key."; TXT_PASSCARD = "You picked up the Passcard."; @@ -1567,6 +1564,7 @@ TXT_GOAWAY = "Go away!"; TXT_COMM0 = "Incoming Message"; TXT_COMM1 = "Incoming Message from BlackBird"; +TXT_TRADE = " for %u"; AMMO_CLIP = "Bullets"; AMMO_SHELLS = "Shotgun Shells"; @@ -2471,12 +2469,10 @@ OPTSTR_NOINTERPOLATION = "No interpolation"; OPTSTR_SPLINE = "Spline"; OPTSTR_OPENAL = "OpenAL"; - NOTSET = "Not set"; SAFEMESSAGE = "Do you really want to do this?"; MNU_COLORPICKER = "SELECT COLOR"; - WI_FINISHED = "finished"; WI_ENTERING = "Now entering:"; @@ -2852,7 +2848,6 @@ DSPLYMNU_TCOPT = "TrueColor Options"; TCMNU_TITLE = "TRUECOLOR OPTIONS"; - TCMNU_TRUECOLOR = "True color output"; TCMNU_MINFILTER = "Linear filter when downscaling"; TCMNU_MAGFILTER = "Linear filter when upscaling"; diff --git a/wadsrc/static/language.fr b/wadsrc/static/language.fr index 973103327..fa49cc07e 100644 --- a/wadsrc/static/language.fr +++ b/wadsrc/static/language.fr @@ -1646,6 +1646,8 @@ TXT_GOAWAY = "Allez-vous en!"; TXT_COMM0 = "Message reçu."; TXT_COMM1 = "Message reçu de BlackBird"; +TXT_TRADE = " pour %u"; + AMMO_CLIP = "Balles"; AMMO_SHELLS = "Cartouches"; AMMO_ROCKETS = "Roquettes"; diff --git a/wadsrc/static/zscript/menu/conversationmenu.txt b/wadsrc/static/zscript/menu/conversationmenu.txt index 8d05ee4ba..3474753e8 100644 --- a/wadsrc/static/zscript/menu/conversationmenu.txt +++ b/wadsrc/static/zscript/menu/conversationmenu.txt @@ -137,7 +137,7 @@ class ConversationMenu : Menu mShowGold |= reply.NeedsGold; let ReplyText = Stringtable.Localize(reply.Reply); - if (reply.NeedsGold) ReplyText.AppendFormat(" for %u", reply.PrintAmount); + if (reply.NeedsGold) ReplyText.AppendFormat(Stringtable.Localize("$TXT_TRADE"), reply.PrintAmount); let ReplyLines = SmallFont.BreakLines (ReplyText, ReplyWidth); From ff96980dda3719e81398bbc5f2e8073c14abb61e Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 31 Mar 2018 21:45:20 +0300 Subject: [PATCH 27/50] Fixed handling of default values in String.Mid() https://forum.zdoom.org/viewtopic.php?t=60047 --- src/scripting/thingdef_data.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index 09e28ba55..4560b282e 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -1204,8 +1204,8 @@ DEFINE_ACTION_FUNCTION(FStringStruct, AppendFormat) DEFINE_ACTION_FUNCTION(FStringStruct, Mid) { PARAM_SELF_STRUCT_PROLOGUE(FString); - PARAM_UINT(pos); - PARAM_UINT(len); + PARAM_UINT_DEF(pos); + PARAM_UINT_DEF(len); FString s = self->Mid(pos, len); ACTION_RETURN_STRING(s); } From 23146c9b18be9af29380478b6ebf05090b36f4cd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Apr 2018 08:37:32 +0200 Subject: [PATCH 28/50] - made all elements of DehInfo and State read-only. This data must be immutable, if any mod plays loose here, very bad things can happen, so this hole got plugged, even at the expense risking to break some badly behaving mods. --- wadsrc/static/zscript/base.txt | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index acaa831b5..52020816d 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -663,31 +663,31 @@ struct StringTable native // Most are handled at load time and are omitted here. struct DehInfo native { - native int MaxSoulsphere; - native uint8 ExplosionStyle; - native double ExplosionAlpha; - native int NoAutofreeze; - native int BFGCells; - native int BlueAC; + native readonly int MaxSoulsphere; + native readonly uint8 ExplosionStyle; + native readonly double ExplosionAlpha; + native readonly int NoAutofreeze; + native readonly int BFGCells; + native readonly int BlueAC; } struct State native { - native State NextState; - native int sprite; - native int16 Tics; - native uint16 TicRange; - native uint8 Frame; - native uint8 UseFlags; - native int Misc1; - native int Misc2; - native uint16 bSlow; - native uint16 bFast; - native bool bFullbright; - native bool bNoDelay; - native bool bSameFrame; - native bool bCanRaise; - native bool bDehacked; + native readonly State NextState; + native readonly int sprite; + native readonly int16 Tics; + native readonly uint16 TicRange; + native readonly uint8 Frame; + native readonly uint8 UseFlags; + native readonly int Misc1; + native readonly int Misc2; + native readonly uint16 bSlow; + native readonly uint16 bFast; + native readonly bool bFullbright; + native readonly bool bNoDelay; + native readonly bool bSameFrame; + native readonly bool bCanRaise; + native readonly bool bDehacked; native int DistanceTo(state other); native bool ValidateSpriteFrame(); From 5df5e2abe720ca81a391eea20695afdfa10fc1a0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 1 Apr 2018 14:35:49 +0300 Subject: [PATCH 29/50] Fixed excessive growth of ACS string pool This fixes usage of uninitialized variable in ACSStringPool::PoolEntry objects The initial version (before 66d15dc) increased pool size by one entry and assign all its members right after that The improved version reserved MIN_GC_SIZE entries but didn't initialize anything except the first one ACSStringPool::FindFirstFreeEntry() cannot find the proper entry as it uses PoolEntry::Next member for list traversal It's enough to initialize Next member with FREE_ENTRY value because other fields will be assigned anyway inside ACSStringPool::InsertString() https://forum.zdoom.org/viewtopic.php?t=60049 --- src/p_acs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_acs.h b/src/p_acs.h index 8ccf62982..fc361a230 100644 --- a/src/p_acs.h +++ b/src/p_acs.h @@ -129,7 +129,7 @@ private: { FString Str; unsigned int Hash; - unsigned int Next; + unsigned int Next = FREE_ENTRY; bool Mark; TArray Locks; From ac7e5def3252291a3a8e95651edc63bf62c523a6 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 2 Apr 2018 15:18:30 +0300 Subject: [PATCH 30/50] Forbade dynamic array as the return type of a function Compiler ignored this case silently but it crashed during code generation --- src/scripting/zscript/zcc_compile.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index 4d530c8a5..1068501d6 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -2316,6 +2316,11 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool // structs and classes only get passed by pointer. type = NewPointer(type); } + else if (type->isDynArray()) + { + Error(f, "The return type of a function cannot be a dynamic array"); + break; + } // TBD: disallow certain types? For now, let everything pass that isn't an array. rets.Push(type); t = static_cast(t->SiblingNext); From 4de9597006417821692fc755b51d759548dd0dd4 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 2 Apr 2018 15:32:00 +0300 Subject: [PATCH 31/50] Fixed detection of .ipk7 custom IWADs --- src/d_iwad.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index d263ba073..4beab8712 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -427,7 +427,7 @@ void FIWadManager::AddIWADCandidates(const char *dir) if (p != nullptr) { // special IWAD extension. - if (!stricmp(p, ".iwad") || !stricmp(p, ".ipk3") || !stricmp(p, "ipk7")) + if (!stricmp(p, ".iwad") || !stricmp(p, ".ipk3") || !stricmp(p, ".ipk7")) { mFoundWads.Push(FFoundWadInfo{ slasheddir + FindName, "", -1 }); } @@ -461,7 +461,7 @@ void FIWadManager::ValidateIWADs() { int index; auto x = strrchr(p.mFullPath, '.'); - if (x != nullptr && (!stricmp(x, ".iwad") || !stricmp(x, ".ipk3") || !stricmp(x, "ipk7"))) + if (x != nullptr && (!stricmp(x, ".iwad") || !stricmp(x, ".ipk3") || !stricmp(x, ".ipk7"))) { index = CheckIWADInfo(p.mFullPath); } From c70f9cf833482dbd0192a53bbfb21d9697c83667 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 2 Apr 2018 16:16:47 +0300 Subject: [PATCH 32/50] Reintroduced discarding of custom IWAD duplicates Detection of duplicated IWADs now works the same for embedded and custom IWADINFO definitions https://forum.zdoom.org/viewtopic.php?t=58333 --- src/d_iwad.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 4beab8712..67f15a60c 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -348,6 +348,16 @@ int FIWadManager::CheckIWADInfo(const char *fn) FIWADInfo result; ParseIWadInfo(resfile->Filename, (const char*)lmp->CacheLump(), lmp->LumpSize, &result); delete resfile; + + for (unsigned i = 0, count = mIWadInfos.Size(); i < count; ++i) + { + if (mIWadInfos[i].Name == result.Name) + { + return i; + } + } + + mOrderNames.Push(result.Name); return mIWadInfos.Push(result); } catch (CRecoverableError &err) From de2ad7a5d9fb1d35fb42890229b72adfbea4a4d1 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 3 Apr 2018 10:48:45 +0300 Subject: [PATCH 33/50] Updated zlib to 1.2.11 https://zlib.net/zlib1211.zip --- zlib/ChangeLog | 55 ++- zlib/README | 6 +- zlib/adler32.c | 21 +- zlib/compress.c | 42 ++- zlib/crc32.c | 41 ++- zlib/deflate.c | 860 +++++++++++++++++++++++++++----------------- zlib/deflate.h | 35 +- zlib/gzguts.h | 23 +- zlib/infback.c | 4 +- zlib/inffast.c | 85 ++--- zlib/inflate.c | 123 +++++-- zlib/inflate.h | 11 +- zlib/inftrees.c | 26 +- zlib/trees.c | 99 ++--- zlib/uncompr.c | 114 +++--- zlib/win32/zlib.def | 8 + zlib/win32/zlib1.rc | 2 +- zlib/zconf.h | 41 ++- zlib/zlib.3 | 70 ++-- zlib/zlib.3.pdf | Bin 8734 -> 19318 bytes zlib/zlib.h | 444 +++++++++++++++-------- zlib/zutil.c | 49 +-- zlib/zutil.h | 52 ++- 23 files changed, 1364 insertions(+), 847 deletions(-) diff --git a/zlib/ChangeLog b/zlib/ChangeLog index f22aabaef..30199a65a 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,10 +1,53 @@ ChangeLog file for zlib +Changes in 1.2.11 (15 Jan 2017) +- Fix deflate stored bug when pulling last block from window +- Permit immediate deflateParams changes before any deflate input + +Changes in 1.2.10 (2 Jan 2017) +- Avoid warnings on snprintf() return value +- Fix bug in deflate_stored() for zero-length input +- Fix bug in gzwrite.c that produced corrupt gzip files +- Remove files to be installed before copying them in Makefile.in +- Add warnings when compiling with assembler code + +Changes in 1.2.9 (31 Dec 2016) +- Fix contrib/minizip to permit unzipping with desktop API [Zouzou] +- Improve contrib/blast to return unused bytes +- Assure that gzoffset() is correct when appending +- Improve compress() and uncompress() to support large lengths +- Fix bug in test/example.c where error code not saved +- Remedy Coverity warning [Randers-Pehrson] +- Improve speed of gzprintf() in transparent mode +- Fix inflateInit2() bug when windowBits is 16 or 32 +- Change DEBUG macro to ZLIB_DEBUG +- Avoid uninitialized access by gzclose_w() +- Allow building zlib outside of the source directory +- Fix bug that accepted invalid zlib header when windowBits is zero +- Fix gzseek() problem on MinGW due to buggy _lseeki64 there +- Loop on write() calls in gzwrite.c in case of non-blocking I/O +- Add --warn (-w) option to ./configure for more compiler warnings +- Reject a window size of 256 bytes if not using the zlib wrapper +- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE +- Add --debug (-d) option to ./configure to define ZLIB_DEBUG +- Fix bugs in creating a very large gzip header +- Add uncompress2() function, which returns the input size used +- Assure that deflateParams() will not switch functions mid-block +- Dramatically speed up deflation for level 0 (storing) +- Add gzfread(), duplicating the interface of fread() +- Add gzfwrite(), duplicating the interface of fwrite() +- Add deflateGetDictionary() function +- Use snprintf() for later versions of Microsoft C +- Fix *Init macros to use z_ prefix when requested +- Replace as400 with os400 for OS/400 support [Monnerat] +- Add crc32_z() and adler32_z() functions with size_t lengths +- Update Visual Studio project files [AraHaan] + Changes in 1.2.8 (28 Apr 2013) - Update contrib/minizip/iowin32.c for Windows RT [Vollant] - Do not force Z_CONST for C++ -- Clean up contrib/vstudio [Ro§] +- Clean up contrib/vstudio [Roß] - Correct spelling error in zlib.h - Fix mixed line endings in contrib/vstudio @@ -34,7 +77,7 @@ Changes in 1.2.7.1 (24 Mar 2013) - Clean up the usage of z_const and respect const usage within zlib - Clean up examples/gzlog.[ch] comparisons of different types - Avoid shift equal to bits in type (caused endless loop) -- Fix unintialized value bug in gzputc() introduced by const patches +- Fix uninitialized value bug in gzputc() introduced by const patches - Fix memory allocation error in examples/zran.c [Nor] - Fix bug where gzopen(), gzclose() would write an empty file - Fix bug in gzclose() when gzwrite() runs out of memory @@ -194,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011) - Add a transparent write mode to gzopen() when 'T' is in the mode - Update python link in zlib man page - Get inffixed.h and MAKEFIXED result to match -- Add a ./config --solo option to make zlib subset with no libary use +- Add a ./config --solo option to make zlib subset with no library use - Add undocumented inflateResetKeep() function for CAB file decoding - Add --cover option to ./configure for gcc coverage testing - Add #define ZLIB_CONST option to use const in the z_stream interface @@ -564,7 +607,7 @@ Changes in 1.2.3.1 (16 August 2006) - Update make_vms.com [Zinser] - Use -fPIC for shared build in configure [Teredesai, Nicholson] - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] -- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] +- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck] - Add some FAQ entries about the contrib directory - Update the MVS question in the FAQ - Avoid extraneous reads after EOF in gzio.c [Brown] @@ -1178,7 +1221,7 @@ Changes in 1.0.6 (19 Jan 1998) 386 asm code replacing longest_match(). contrib/iostream/ by Kevin Ruland A C++ I/O streams interface to the zlib gz* functions - contrib/iostream2/ by Tyge Løvset + contrib/iostream2/ by Tyge Løvset Another C++ I/O streams interface contrib/untgz/ by "Pedro A. Aranda Guti\irrez" A very simple tar.gz file extractor using zlib @@ -1267,7 +1310,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] - fix array overlay in deflate.c which sometimes caused bad compressed data - fix inflate bug with empty stored block - fix MSDOS medium model which was broken in 0.99 -- fix deflateParams() which could generated bad compressed data. +- fix deflateParams() which could generate bad compressed data. - Bytef is define'd instead of typedef'ed (work around Borland bug) - added an INDEX file - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), diff --git a/zlib/README b/zlib/README index 5ca9d127e..51106de47 100644 --- a/zlib/README +++ b/zlib/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.8 is a general purpose data compression library. All the code is +zlib 1.2.11 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -31,7 +31,7 @@ Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at http://marknelson.us/1997/01/01/zlib-engine/ . -The changes made in version 1.2.8 are documented in the file ChangeLog. +The changes made in version 1.2.11 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . @@ -84,7 +84,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2013 Jean-loup Gailly and Mark Adler + (C) 1995-2017 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/zlib/adler32.c b/zlib/adler32.c index a868f073d..d0be4380a 100644 --- a/zlib/adler32.c +++ b/zlib/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2011, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -7,11 +7,9 @@ #include "zutil.h" -#define local static - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -#define BASE 65521 /* largest prime smaller than 65536 */ +#define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -62,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) +uLong ZEXPORT adler32_z(adler, buf, len) uLong adler; const Bytef *buf; - uInt len; + z_size_t len; { unsigned long sum2; unsigned n; @@ -132,6 +130,15 @@ uLong ZEXPORT adler32(adler, buf, len) return adler | (sum2 << 16); } +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + return adler32_z(adler, buf, len); +} + /* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; @@ -156,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2) sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } diff --git a/zlib/compress.c b/zlib/compress.c index 6e9762676..e2db404ab 100644 --- a/zlib/compress.c +++ b/zlib/compress.c @@ -1,5 +1,5 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -28,16 +28,11 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) { z_stream stream; int err; + const uInt max = (uInt)-1; + uLong left; - stream.next_in = (z_const Bytef *)source; - stream.avail_in = (uInt)sourceLen; -#ifdef MAXSEG_64K - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; -#endif - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + left = *destLen; + *destLen = 0; stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; @@ -46,15 +41,26 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) err = deflateInit(&stream, level); if (err != Z_OK) return err; - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; + stream.next_out = dest; + stream.avail_out = 0; + stream.next_in = (z_const Bytef *)source; + stream.avail_in = 0; - err = deflateEnd(&stream); - return err; + do { + if (stream.avail_out == 0) { + stream.avail_out = left > (uLong)max ? max : (uInt)left; + left -= stream.avail_out; + } + if (stream.avail_in == 0) { + stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen; + sourceLen -= stream.avail_in; + } + err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH); + } while (err == Z_OK); + + *destLen = stream.total_out; + deflateEnd(&stream); + return err == Z_STREAM_END ? Z_OK : err; } /* =========================================================================== diff --git a/zlib/crc32.c b/zlib/crc32.c index 979a7190a..9580440c0 100644 --- a/zlib/crc32.c +++ b/zlib/crc32.c @@ -1,5 +1,5 @@ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler + * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster @@ -30,17 +30,15 @@ #include "zutil.h" /* for STDC and FAR definitions */ -#define local static - /* Definitions for doing the crc four data bytes at a time. */ #if !defined(NOBYFOUR) && defined(Z_U4) # define BYFOUR #endif #ifdef BYFOUR local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, unsigned)); + const unsigned char FAR *, z_size_t)); local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, unsigned)); + const unsigned char FAR *, z_size_t)); # define TBLS 8 #else # define TBLS 1 @@ -201,10 +199,10 @@ const z_crc_t FAR * ZEXPORT get_crc_table() #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 /* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) +unsigned long ZEXPORT crc32_z(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - uInt len; + z_size_t len; { if (buf == Z_NULL) return 0UL; @@ -235,8 +233,29 @@ unsigned long ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffUL; } +/* ========================================================================= */ +unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + uInt len; +{ + return crc32_z(crc, buf, len); +} + #ifdef BYFOUR +/* + This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit + integer pointer type. This violates the strict aliasing rule, where a + compiler can assume, for optimization purposes, that two pointers to + fundamentally different types won't ever point to the same memory. This can + manifest as a problem only if one of the pointers is written to. This code + only reads from those pointers. So long as this code remains isolated in + this compilation unit, there won't be a problem. For this reason, this code + should not be copied and pasted into a compilation unit in which other code + writes to the buffer that is passed to these routines. + */ + /* ========================================================================= */ #define DOLIT4 c ^= *buf4++; \ c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ @@ -247,7 +266,7 @@ unsigned long ZEXPORT crc32(crc, buf, len) local unsigned long crc32_little(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - unsigned len; + z_size_t len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -278,7 +297,7 @@ local unsigned long crc32_little(crc, buf, len) } /* ========================================================================= */ -#define DOBIG4 c ^= *++buf4; \ +#define DOBIG4 c ^= *buf4++; \ c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 @@ -287,7 +306,7 @@ local unsigned long crc32_little(crc, buf, len) local unsigned long crc32_big(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - unsigned len; + z_size_t len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -300,7 +319,6 @@ local unsigned long crc32_big(crc, buf, len) } buf4 = (const z_crc_t FAR *)(const void FAR *)buf; - buf4--; while (len >= 32) { DOBIG32; len -= 32; @@ -309,7 +327,6 @@ local unsigned long crc32_big(crc, buf, len) DOBIG4; len -= 4; } - buf4++; buf = (const unsigned char FAR *)buf4; if (len) do { diff --git a/zlib/deflate.c b/zlib/deflate.c index 696957705..1ec761448 100644 --- a/zlib/deflate.c +++ b/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -73,6 +73,8 @@ typedef enum { typedef block_state (*compress_func) OF((deflate_state *s, int flush)); /* Compression function. Returns the block state after the call. */ +local int deflateStateCheck OF((z_streamp strm)); +local void slide_hash OF((deflate_state *s)); local void fill_window OF((deflate_state *s)); local block_state deflate_stored OF((deflate_state *s, int flush)); local block_state deflate_fast OF((deflate_state *s, int flush)); @@ -84,15 +86,16 @@ local block_state deflate_huff OF((deflate_state *s, int flush)); local void lm_init OF((deflate_state *s)); local void putShortMSB OF((deflate_state *s, uInt b)); local void flush_pending OF((z_streamp strm)); -local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); #ifdef ASMV +# pragma message("Assembler code may have bugs -- use at your own risk") void match_init OF((void)); /* asm code initialization */ uInt longest_match OF((deflate_state *s, IPos cur_match)); #else local uInt longest_match OF((deflate_state *s, IPos cur_match)); #endif -#ifdef DEBUG +#ifdef ZLIB_DEBUG local void check_match OF((deflate_state *s, IPos start, IPos match, int length)); #endif @@ -148,21 +151,14 @@ local const config configuration_table[10] = { * meaning. */ -#define EQUAL 0 -/* result of memcmp for equal strings */ - -#ifndef NO_DUMMY_DECL -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ -#endif - /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ -#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) +#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) /* =========================================================================== * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive - * input characters, so that a running hash key can be computed from the - * previous key instead of complete recalculation each time. + * IN assertion: all calls to UPDATE_HASH are made with consecutive input + * characters, so that a running hash key can be computed from the previous + * key instead of complete recalculation each time. */ #define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) @@ -173,9 +169,9 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ * the previous length of the hash chain. * If this file is compiled with -DFASTEST, the compression level is forced * to 1, and no hash chains are maintained. - * IN assertion: all calls to to INSERT_STRING are made with consecutive - * input characters and the first MIN_MATCH bytes of str are valid - * (except for the last MIN_MATCH-1 bytes of the input file). + * IN assertion: all calls to INSERT_STRING are made with consecutive input + * characters and the first MIN_MATCH bytes of str are valid (except for + * the last MIN_MATCH-1 bytes of the input file). */ #ifdef FASTEST #define INSERT_STRING(s, str, match_head) \ @@ -197,6 +193,37 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ s->head[s->hash_size-1] = NIL; \ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); +/* =========================================================================== + * Slide the hash table when sliding the window down (could be avoided with 32 + * bit values at the expense of memory usage). We slide even when level == 0 to + * keep the hash table consistent if we switch back to level > 0 later. + */ +local void slide_hash(s) + deflate_state *s; +{ + unsigned n, m; + Posf *p; + uInt wsize = s->w_size; + + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + } while (--n); + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif +} + /* ========================================================================= */ int ZEXPORT deflateInit_(strm, level, version, stream_size) z_streamp strm; @@ -270,7 +297,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, #endif if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED) { + strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { return Z_STREAM_ERROR; } if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ @@ -278,14 +305,15 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, if (s == Z_NULL) return Z_MEM_ERROR; strm->state = (struct internal_state FAR *)s; s->strm = strm; + s->status = INIT_STATE; /* to pass state test in deflateReset() */ s->wrap = wrap; s->gzhead = Z_NULL; - s->w_bits = windowBits; + s->w_bits = (uInt)windowBits; s->w_size = 1 << s->w_bits; s->w_mask = s->w_size - 1; - s->hash_bits = memLevel + 7; + s->hash_bits = (uInt)memLevel + 7; s->hash_size = 1 << s->hash_bits; s->hash_mask = s->hash_size - 1; s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); @@ -319,6 +347,31 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, return deflateReset(strm); } +/* ========================================================================= + * Check for a valid deflate stream state. Return 0 if ok, 1 if not. + */ +local int deflateStateCheck (strm) + z_streamp strm; +{ + deflate_state *s; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + s = strm->state; + if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && +#ifdef GZIP + s->status != GZIP_STATE && +#endif + s->status != EXTRA_STATE && + s->status != NAME_STATE && + s->status != COMMENT_STATE && + s->status != HCRC_STATE && + s->status != BUSY_STATE && + s->status != FINISH_STATE)) + return 1; + return 0; +} + /* ========================================================================= */ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) z_streamp strm; @@ -331,7 +384,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) unsigned avail; z_const unsigned char *next; - if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) + if (deflateStateCheck(strm) || dictionary == Z_NULL) return Z_STREAM_ERROR; s = strm->state; wrap = s->wrap; @@ -388,14 +441,35 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) return Z_OK; } +/* ========================================================================= */ +int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength) + z_streamp strm; + Bytef *dictionary; + uInt *dictLength; +{ + deflate_state *s; + uInt len; + + if (deflateStateCheck(strm)) + return Z_STREAM_ERROR; + s = strm->state; + len = s->strstart + s->lookahead; + if (len > s->w_size) + len = s->w_size; + if (dictionary != Z_NULL && len) + zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); + if (dictLength != Z_NULL) + *dictLength = len; + return Z_OK; +} + /* ========================================================================= */ int ZEXPORT deflateResetKeep (strm) z_streamp strm; { deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + if (deflateStateCheck(strm)) { return Z_STREAM_ERROR; } @@ -410,7 +484,11 @@ int ZEXPORT deflateResetKeep (strm) if (s->wrap < 0) { s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ } - s->status = s->wrap ? INIT_STATE : BUSY_STATE; + s->status = +#ifdef GZIP + s->wrap == 2 ? GZIP_STATE : +#endif + s->wrap ? INIT_STATE : BUSY_STATE; strm->adler = #ifdef GZIP s->wrap == 2 ? crc32(0L, Z_NULL, 0) : @@ -440,8 +518,8 @@ int ZEXPORT deflateSetHeader (strm, head) z_streamp strm; gz_headerp head; { - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (strm->state->wrap != 2) return Z_STREAM_ERROR; + if (deflateStateCheck(strm) || strm->state->wrap != 2) + return Z_STREAM_ERROR; strm->state->gzhead = head; return Z_OK; } @@ -452,7 +530,7 @@ int ZEXPORT deflatePending (strm, pending, bits) int *bits; z_streamp strm; { - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; if (pending != Z_NULL) *pending = strm->state->pending; if (bits != Z_NULL) @@ -469,7 +547,7 @@ int ZEXPORT deflatePrime (strm, bits, value) deflate_state *s; int put; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; @@ -494,9 +572,8 @@ int ZEXPORT deflateParams(strm, level, strategy) { deflate_state *s; compress_func func; - int err = Z_OK; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; #ifdef FASTEST @@ -510,13 +587,22 @@ int ZEXPORT deflateParams(strm, level, strategy) func = configuration_table[s->level].func; if ((strategy != s->strategy || func != configuration_table[level].func) && - strm->total_in != 0) { + s->high_water) { /* Flush the last buffer: */ - err = deflate(strm, Z_BLOCK); - if (err == Z_BUF_ERROR && s->pending == 0) - err = Z_OK; + int err = deflate(strm, Z_BLOCK); + if (err == Z_STREAM_ERROR) + return err; + if (strm->avail_out == 0) + return Z_BUF_ERROR; } if (s->level != level) { + if (s->level == 0 && s->matches != 0) { + if (s->matches == 1) + slide_hash(s); + else + CLEAR_HASH(s); + s->matches = 0; + } s->level = level; s->max_lazy_match = configuration_table[level].max_lazy; s->good_match = configuration_table[level].good_length; @@ -524,7 +610,7 @@ int ZEXPORT deflateParams(strm, level, strategy) s->max_chain_length = configuration_table[level].max_chain; } s->strategy = strategy; - return err; + return Z_OK; } /* ========================================================================= */ @@ -537,12 +623,12 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) { deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; - s->good_match = good_length; - s->max_lazy_match = max_lazy; + s->good_match = (uInt)good_length; + s->max_lazy_match = (uInt)max_lazy; s->nice_match = nice_length; - s->max_chain_length = max_chain; + s->max_chain_length = (uInt)max_chain; return Z_OK; } @@ -569,14 +655,13 @@ uLong ZEXPORT deflateBound(strm, sourceLen) { deflate_state *s; uLong complen, wraplen; - Bytef *str; /* conservative upper bound for compressed data */ complen = sourceLen + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; /* if can't get parameters, return conservative bound plus zlib wrapper */ - if (strm == Z_NULL || strm->state == Z_NULL) + if (deflateStateCheck(strm)) return complen + 6; /* compute wrapper length */ @@ -588,9 +673,11 @@ uLong ZEXPORT deflateBound(strm, sourceLen) case 1: /* zlib wrapper */ wraplen = 6 + (s->strstart ? 4 : 0); break; +#ifdef GZIP case 2: /* gzip wrapper */ wraplen = 18; if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + Bytef *str; if (s->gzhead->extra != Z_NULL) wraplen += 2 + s->gzhead->extra_len; str = s->gzhead->name; @@ -607,6 +694,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen) wraplen += 2; } break; +#endif default: /* for compiler happiness */ wraplen = 6; } @@ -634,10 +722,10 @@ local void putShortMSB (s, b) } /* ========================================================================= - * Flush as much pending output as possible. All deflate() output goes - * through this function so some applications may wish to modify it - * to avoid allocating a large strm->next_out buffer and copying into it. - * (See also read_buf()). + * Flush as much pending output as possible. All deflate() output, except for + * some deflate_stored() output, goes through this function so some + * applications may wish to modify it to avoid allocating a large + * strm->next_out buffer and copying into it. (See also read_buf()). */ local void flush_pending(strm) z_streamp strm; @@ -654,13 +742,23 @@ local void flush_pending(strm) strm->next_out += len; s->pending_out += len; strm->total_out += len; - strm->avail_out -= len; - s->pending -= len; + strm->avail_out -= len; + s->pending -= len; if (s->pending == 0) { s->pending_out = s->pending_buf; } } +/* =========================================================================== + * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1]. + */ +#define HCRC_UPDATE(beg) \ + do { \ + if (s->gzhead->hcrc && s->pending > (beg)) \ + strm->adler = crc32(strm->adler, s->pending_buf + (beg), \ + s->pending - (beg)); \ + } while (0) + /* ========================================================================= */ int ZEXPORT deflate (strm, flush) z_streamp strm; @@ -669,203 +767,21 @@ int ZEXPORT deflate (strm, flush) int old_flush; /* value of flush param for previous deflate call */ deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_BLOCK || flush < 0) { + if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) { return Z_STREAM_ERROR; } s = strm->state; if (strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0) || + (strm->avail_in != 0 && strm->next_in == Z_NULL) || (s->status == FINISH_STATE && flush != Z_FINISH)) { ERR_RETURN(strm, Z_STREAM_ERROR); } if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); - s->strm = strm; /* just in case */ old_flush = s->last_flush; s->last_flush = flush; - /* Write the header */ - if (s->status == INIT_STATE) { -#ifdef GZIP - if (s->wrap == 2) { - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == Z_NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); - s->status = BUSY_STATE; - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != Z_NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); - } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; - } - } - else -#endif - { - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - s->status = BUSY_STATE; - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - strm->adler = adler32(0L, Z_NULL, 0); - } - } -#ifdef GZIP - if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - - while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) - break; - } - put_byte(s, s->gzhead->extra[s->gzindex]); - s->gzindex++; - } - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (s->gzindex == s->gzhead->extra_len) { - s->gzindex = 0; - s->status = NAME_STATE; - } - } - else - s->status = NAME_STATE; - } - if (s->status == NAME_STATE) { - if (s->gzhead->name != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->name[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) { - s->gzindex = 0; - s->status = COMMENT_STATE; - } - } - else - s->status = COMMENT_STATE; - } - if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->comment[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) - s->status = HCRC_STATE; - } - else - s->status = HCRC_STATE; - } - if (s->status == HCRC_STATE) { - if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) - flush_pending(strm); - if (s->pending + 2 <= s->pending_buf_size) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); - s->status = BUSY_STATE; - } - } - else - s->status = BUSY_STATE; - } -#endif - /* Flush as much pending output as possible */ if (s->pending != 0) { flush_pending(strm); @@ -894,15 +810,197 @@ int ZEXPORT deflate (strm, flush) ERR_RETURN(strm, Z_BUF_ERROR); } + /* Write the header */ + if (s->status == INIT_STATE) { + /* zlib header */ + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } +#ifdef GZIP + if (s->status == GZIP_STATE) { + /* gzip header */ + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex; + while (s->pending + left > s->pending_buf_size) { + uInt copy = s->pending_buf_size - s->pending; + zmemcpy(s->pending_buf + s->pending, + s->gzhead->extra + s->gzindex, copy); + s->pending = s->pending_buf_size; + HCRC_UPDATE(beg); + s->gzindex += copy; + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + left -= copy; + } + zmemcpy(s->pending_buf + s->pending, + s->gzhead->extra + s->gzindex, left); + s->pending += left; + HCRC_UPDATE(beg); + s->gzindex = 0; + } + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + int val; + do { + if (s->pending == s->pending_buf_size) { + HCRC_UPDATE(beg); + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + HCRC_UPDATE(beg); + s->gzindex = 0; + } + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + int val; + do { + if (s->pending == s->pending_buf_size) { + HCRC_UPDATE(beg); + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + HCRC_UPDATE(beg); + } + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) { + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + } + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } +#endif + /* Start a new block or continue the current one. */ if (strm->avail_in != 0 || s->lookahead != 0 || (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { block_state bstate; - bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : - (s->strategy == Z_RLE ? deflate_rle(s, flush) : - (*(configuration_table[s->level].func))(s, flush)); + bstate = s->level == 0 ? deflate_stored(s, flush) : + s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush); if (bstate == finish_started || bstate == finish_done) { s->status = FINISH_STATE; @@ -944,7 +1042,6 @@ int ZEXPORT deflate (strm, flush) } } } - Assert(strm->avail_out > 0, "bug2"); if (flush != Z_FINISH) return Z_OK; if (s->wrap <= 0) return Z_STREAM_END; @@ -981,18 +1078,9 @@ int ZEXPORT deflateEnd (strm) { int status; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; status = strm->state->status; - if (status != INIT_STATE && - status != EXTRA_STATE && - status != NAME_STATE && - status != COMMENT_STATE && - status != HCRC_STATE && - status != BUSY_STATE && - status != FINISH_STATE) { - return Z_STREAM_ERROR; - } /* Deallocate in reverse order of allocations: */ TRY_FREE(strm, strm->state->pending_buf); @@ -1023,7 +1111,7 @@ int ZEXPORT deflateCopy (dest, source) ushf *overlay; - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + if (deflateStateCheck(source) || dest == Z_NULL) { return Z_STREAM_ERROR; } @@ -1073,7 +1161,7 @@ int ZEXPORT deflateCopy (dest, source) * allocating a large strm->next_in buffer and copying from it. * (See also flush_pending()). */ -local int read_buf(strm, buf, size) +local unsigned read_buf(strm, buf, size) z_streamp strm; Bytef *buf; unsigned size; @@ -1097,7 +1185,7 @@ local int read_buf(strm, buf, size) strm->next_in += len; strm->total_in += len; - return (int)len; + return len; } /* =========================================================================== @@ -1151,9 +1239,9 @@ local uInt longest_match(s, cur_match) { unsigned chain_length = s->max_chain_length;/* max hash chain length */ register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ + register Bytef *match; /* matched string */ register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ + int best_len = (int)s->prev_length; /* best match length so far */ int nice_match = s->nice_match; /* stop if match long enough */ IPos limit = s->strstart > (IPos)MAX_DIST(s) ? s->strstart - (IPos)MAX_DIST(s) : NIL; @@ -1188,7 +1276,7 @@ local uInt longest_match(s, cur_match) /* Do not look for matches beyond the end of the input. This is necessary * to make deflate deterministic. */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead; Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); @@ -1349,7 +1437,11 @@ local uInt longest_match(s, cur_match) #endif /* FASTEST */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG + +#define EQUAL 0 +/* result of memcmp for equal strings */ + /* =========================================================================== * Check that the match at match_start is indeed a match. */ @@ -1375,7 +1467,7 @@ local void check_match(s, start, match, length) } #else # define check_match(s, start, match, length) -#endif /* DEBUG */ +#endif /* ZLIB_DEBUG */ /* =========================================================================== * Fill the window when the lookahead becomes insufficient. @@ -1390,8 +1482,7 @@ local void check_match(s, start, match, length) local void fill_window(s) deflate_state *s; { - register unsigned n, m; - register Posf *p; + unsigned n; unsigned more; /* Amount of free space at the end of the window. */ uInt wsize = s->w_size; @@ -1418,35 +1509,11 @@ local void fill_window(s) */ if (s->strstart >= wsize+MAX_DIST(s)) { - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more); s->match_start -= wsize; s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ s->block_start -= (long) wsize; - - /* Slide the hash table (could be avoided with 32 bit values - at the expense of memory usage). We slide even when level == 0 - to keep the hash table consistent if we switch back to level > 0 - later. (Using level 0 permanently is not an optimal usage of - zlib, so we don't care about this pathological case.) - */ - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - } while (--n); - - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif + slide_hash(s); more += wsize; } if (s->strm->avail_in == 0) break; @@ -1552,70 +1619,199 @@ local void fill_window(s) if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ } +/* Maximum stored block length in deflate format (not including header). */ +#define MAX_STORED 65535 + +/* Minimum of a and b. */ +#define MIN(a, b) ((a) > (b) ? (b) : (a)) + /* =========================================================================== * Copy without compression as much as possible from the input stream, return * the current block state. - * This function does not insert new strings in the dictionary since - * uncompressible data is probably not useful. This function is used - * only for the level=0 compression option. - * NOTE: this function should be optimized to avoid extra copying from - * window to pending_buf. + * + * In case deflateParams() is used to later switch to a non-zero compression + * level, s->matches (otherwise unused when storing) keeps track of the number + * of hash table slides to perform. If s->matches is 1, then one hash table + * slide will be done when switching. If s->matches is 2, the maximum value + * allowed here, then the hash table will be cleared, since two or more slides + * is the same as a clear. + * + * deflate_stored() is written to minimize the number of times an input byte is + * copied. It is most efficient with large input and output buffers, which + * maximizes the opportunites to have a single copy from next_in to next_out. */ local block_state deflate_stored(s, flush) deflate_state *s; int flush; { - /* Stored blocks are limited to 0xffff bytes, pending_buf is limited - * to pending_buf_size, and each stored block has a 5 byte header: + /* Smallest worthy block size when not flushing or finishing. By default + * this is 32K. This can be as small as 507 bytes for memLevel == 1. For + * large input and output buffers, the stored block size will be larger. */ - ulg max_block_size = 0xffff; - ulg max_start; + unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size); - if (max_block_size > s->pending_buf_size - 5) { - max_block_size = s->pending_buf_size - 5; - } - - /* Copy as much as possible from input to output: */ - for (;;) { - /* Fill the window as much as possible: */ - if (s->lookahead <= 1) { - - Assert(s->strstart < s->w_size+MAX_DIST(s) || - s->block_start >= (long)s->w_size, "slide too late"); - - fill_window(s); - if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - - if (s->lookahead == 0) break; /* flush the current block */ - } - Assert(s->block_start >= 0L, "block gone"); - - s->strstart += s->lookahead; - s->lookahead = 0; - - /* Emit a stored block if pending_buf will be full: */ - max_start = s->block_start + max_block_size; - if (s->strstart == 0 || (ulg)s->strstart >= max_start) { - /* strstart == 0 is possible when wraparound on 16-bit machine */ - s->lookahead = (uInt)(s->strstart - max_start); - s->strstart = (uInt)max_start; - FLUSH_BLOCK(s, 0); - } - /* Flush if we may have to slide, otherwise block_start may become - * negative and the data will be gone: + /* Copy as many min_block or larger stored blocks directly to next_out as + * possible. If flushing, copy the remaining available input to next_out as + * stored blocks, if there is enough space. + */ + unsigned len, left, have, last = 0; + unsigned used = s->strm->avail_in; + do { + /* Set len to the maximum size block that we can copy directly with the + * available input data and output space. Set left to how much of that + * would be copied from what's left in the window. */ - if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { - FLUSH_BLOCK(s, 0); + len = MAX_STORED; /* maximum deflate stored block length */ + have = (s->bi_valid + 42) >> 3; /* number of header bytes */ + if (s->strm->avail_out < have) /* need room for header */ + break; + /* maximum stored block length that will fit in avail_out: */ + have = s->strm->avail_out - have; + left = s->strstart - s->block_start; /* bytes left in window */ + if (len > (ulg)left + s->strm->avail_in) + len = left + s->strm->avail_in; /* limit len to the input */ + if (len > have) + len = have; /* limit len to the output */ + + /* If the stored block would be less than min_block in length, or if + * unable to copy all of the available input when flushing, then try + * copying to the window and the pending buffer instead. Also don't + * write an empty block when flushing -- deflate() does that. + */ + if (len < min_block && ((len == 0 && flush != Z_FINISH) || + flush == Z_NO_FLUSH || + len != left + s->strm->avail_in)) + break; + + /* Make a dummy stored block in pending to get the header bytes, + * including any pending bits. This also updates the debugging counts. + */ + last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0; + _tr_stored_block(s, (char *)0, 0L, last); + + /* Replace the lengths in the dummy stored block with len. */ + s->pending_buf[s->pending - 4] = len; + s->pending_buf[s->pending - 3] = len >> 8; + s->pending_buf[s->pending - 2] = ~len; + s->pending_buf[s->pending - 1] = ~len >> 8; + + /* Write the stored block header bytes. */ + flush_pending(s->strm); + +#ifdef ZLIB_DEBUG + /* Update debugging counts for the data about to be copied. */ + s->compressed_len += len << 3; + s->bits_sent += len << 3; +#endif + + /* Copy uncompressed bytes from the window to next_out. */ + if (left) { + if (left > len) + left = len; + zmemcpy(s->strm->next_out, s->window + s->block_start, left); + s->strm->next_out += left; + s->strm->avail_out -= left; + s->strm->total_out += left; + s->block_start += left; + len -= left; } + + /* Copy uncompressed bytes directly from next_in to next_out, updating + * the check value. + */ + if (len) { + read_buf(s->strm, s->strm->next_out, len); + s->strm->next_out += len; + s->strm->avail_out -= len; + s->strm->total_out += len; + } + } while (last == 0); + + /* Update the sliding window with the last s->w_size bytes of the copied + * data, or append all of the copied data to the existing window if less + * than s->w_size bytes were copied. Also update the number of bytes to + * insert in the hash tables, in the event that deflateParams() switches to + * a non-zero compression level. + */ + used -= s->strm->avail_in; /* number of input bytes directly copied */ + if (used) { + /* If any input was used, then no unused input remains in the window, + * therefore s->block_start == s->strstart. + */ + if (used >= s->w_size) { /* supplant the previous history */ + s->matches = 2; /* clear hash */ + zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size); + s->strstart = s->w_size; + } + else { + if (s->window_size - s->strstart <= used) { + /* Slide the window down. */ + s->strstart -= s->w_size; + zmemcpy(s->window, s->window + s->w_size, s->strstart); + if (s->matches < 2) + s->matches++; /* add a pending slide_hash() */ + } + zmemcpy(s->window + s->strstart, s->strm->next_in - used, used); + s->strstart += used; + } + s->block_start = s->strstart; + s->insert += MIN(used, s->w_size - s->insert); } - s->insert = 0; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); + if (s->high_water < s->strstart) + s->high_water = s->strstart; + + /* If the last block was written to next_out, then done. */ + if (last) return finish_done; + + /* If flushing and all input has been consumed, then done. */ + if (flush != Z_NO_FLUSH && flush != Z_FINISH && + s->strm->avail_in == 0 && (long)s->strstart == s->block_start) + return block_done; + + /* Fill the window with any remaining input. */ + have = s->window_size - s->strstart - 1; + if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) { + /* Slide the window down. */ + s->block_start -= s->w_size; + s->strstart -= s->w_size; + zmemcpy(s->window, s->window + s->w_size, s->strstart); + if (s->matches < 2) + s->matches++; /* add a pending slide_hash() */ + have += s->w_size; /* more space now */ } - if ((long)s->strstart > s->block_start) - FLUSH_BLOCK(s, 0); - return block_done; + if (have > s->strm->avail_in) + have = s->strm->avail_in; + if (have) { + read_buf(s->strm, s->window + s->strstart, have); + s->strstart += have; + } + if (s->high_water < s->strstart) + s->high_water = s->strstart; + + /* There was not enough avail_out to write a complete worthy or flushed + * stored block to next_out. Write a stored block to pending instead, if we + * have enough input for a worthy block, or if flushing and there is enough + * room for the remaining input as a stored block in the pending buffer. + */ + have = (s->bi_valid + 42) >> 3; /* number of header bytes */ + /* maximum stored block length that will fit in pending: */ + have = MIN(s->pending_buf_size - have, MAX_STORED); + min_block = MIN(have, s->w_size); + left = s->strstart - s->block_start; + if (left >= min_block || + ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH && + s->strm->avail_in == 0 && left <= have)) { + len = MIN(left, have); + last = flush == Z_FINISH && s->strm->avail_in == 0 && + len == left ? 1 : 0; + _tr_stored_block(s, (charf *)s->window + s->block_start, len, last); + s->block_start += len; + flush_pending(s->strm); + } + + /* We've done all we can with the available input and output. */ + return last ? finish_started : need_more; } /* =========================================================================== @@ -1892,7 +2088,7 @@ local block_state deflate_rle(s, flush) prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan && scan < strend); - s->match_length = MAX_MATCH - (int)(strend - scan); + s->match_length = MAX_MATCH - (uInt)(strend - scan); if (s->match_length > s->lookahead) s->match_length = s->lookahead; } diff --git a/zlib/deflate.h b/zlib/deflate.h index ce0299edd..23ecdd312 100644 --- a/zlib/deflate.h +++ b/zlib/deflate.h @@ -1,5 +1,5 @@ /* deflate.h -- internal compression state - * Copyright (C) 1995-2012 Jean-loup Gailly + * Copyright (C) 1995-2016 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -51,13 +51,16 @@ #define Buf_size 16 /* size of bit buffer in bi_buf */ -#define INIT_STATE 42 -#define EXTRA_STATE 69 -#define NAME_STATE 73 -#define COMMENT_STATE 91 -#define HCRC_STATE 103 -#define BUSY_STATE 113 -#define FINISH_STATE 666 +#define INIT_STATE 42 /* zlib header -> BUSY_STATE */ +#ifdef GZIP +# define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */ +#endif +#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */ +#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */ +#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */ +#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */ +#define BUSY_STATE 113 /* deflate -> FINISH_STATE */ +#define FINISH_STATE 666 /* stream complete */ /* Stream status */ @@ -83,7 +86,7 @@ typedef struct static_tree_desc_s static_tree_desc; typedef struct tree_desc_s { ct_data *dyn_tree; /* the dynamic tree */ int max_code; /* largest code with non zero frequency */ - static_tree_desc *stat_desc; /* the corresponding static tree */ + const static_tree_desc *stat_desc; /* the corresponding static tree */ } FAR tree_desc; typedef ush Pos; @@ -100,10 +103,10 @@ typedef struct internal_state { Bytef *pending_buf; /* output still pending */ ulg pending_buf_size; /* size of pending_buf */ Bytef *pending_out; /* next pending byte to output to the stream */ - uInt pending; /* nb of bytes in the pending buffer */ + ulg pending; /* nb of bytes in the pending buffer */ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ gz_headerp gzhead; /* gzip header information to write */ - uInt gzindex; /* where in extra, name, or comment */ + ulg gzindex; /* where in extra, name, or comment */ Byte method; /* can only be DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ @@ -249,7 +252,7 @@ typedef struct internal_state { uInt matches; /* number of string matches in current block */ uInt insert; /* bytes at end of window left to insert */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG ulg compressed_len; /* total bit length of compressed file mod 2^32 */ ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ #endif @@ -275,7 +278,7 @@ typedef struct internal_state { /* Output a byte on the stream. * IN assertion: there is enough room in pending_buf. */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} +#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);} #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) @@ -309,7 +312,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, * used. */ -#ifndef DEBUG +#ifndef ZLIB_DEBUG /* Inline versions of _tr_tally for speed: */ #if defined(GEN_TREES_H) || !defined(STDC) @@ -328,8 +331,8 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, flush = (s->last_lit == s->lit_bufsize-1); \ } # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (length); \ - ush dist = (distance); \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ s->d_buf[s->last_lit] = dist; \ s->l_buf[s->last_lit++] = len; \ dist--; \ diff --git a/zlib/gzguts.h b/zlib/gzguts.h index d87659d03..990a4d251 100644 --- a/zlib/gzguts.h +++ b/zlib/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -25,6 +25,10 @@ # include # include #endif + +#ifndef _POSIX_SOURCE +# define _POSIX_SOURCE +#endif #include #ifdef _WIN32 @@ -35,6 +39,10 @@ # include #endif +#if defined(_WIN32) || defined(__CYGWIN__) +# define WIDECHAR +#endif + #ifdef WINAPI_FAMILY # define open _open # define read _read @@ -95,18 +103,19 @@ # endif #endif -/* unlike snprintf (which is required in C99, yet still not supported by - Microsoft more than a decade later!), _snprintf does not guarantee null - termination of the result -- however this is only used in gzlib.c where +/* unlike snprintf (which is required in C99), _snprintf does not guarantee + null termination of the result -- however this is only used in gzlib.c where the result is assured to fit in the space provided */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 # define snprintf _snprintf #endif #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't find static symbols */ +/* since "static" is used to mean two completely different things in C, we + define "local" for the non-static meaning of "static", for readability + (compile with -Dlocal if your debugger can't find static symbols) */ /* gz* functions always use library allocation functions */ #ifndef STDC @@ -170,7 +179,7 @@ typedef struct { char *path; /* path or fd for error messages */ unsigned size; /* buffer size, zero if not allocated yet */ unsigned want; /* requested buffer size, default is GZBUFSIZE */ - unsigned char *in; /* input buffer */ + unsigned char *in; /* input buffer (double-sized when writing) */ unsigned char *out; /* output buffer (double-sized when reading) */ int direct; /* 0 if processing gzip, 1 if transparent */ /* just for reading */ diff --git a/zlib/infback.c b/zlib/infback.c index f3833c2e4..59679ecbf 100644 --- a/zlib/infback.c +++ b/zlib/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -61,7 +61,7 @@ int stream_size; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; state->dmax = 32768U; - state->wbits = windowBits; + state->wbits = (uInt)windowBits; state->wsize = 1U << windowBits; state->window = window; state->wnext = 0; diff --git a/zlib/inffast.c b/zlib/inffast.c index bda59ceb6..0dbd1dbc0 100644 --- a/zlib/inffast.c +++ b/zlib/inffast.c @@ -1,5 +1,5 @@ /* inffast.c -- fast decoding - * Copyright (C) 1995-2008, 2010, 2013 Mark Adler + * Copyright (C) 1995-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,26 +8,9 @@ #include "inflate.h" #include "inffast.h" -#ifndef ASMINF - -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ -#ifdef POSTINC -# define OFF 0 -# define PUP(a) *(a)++ +#ifdef ASMINF +# pragma message("Assembler code may have bugs -- use at your own risk") #else -# define OFF 1 -# define PUP(a) *++(a) -#endif /* Decode literal, length, and distance codes and write out the resulting @@ -96,9 +79,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ /* copy state to local variables */ state = (struct inflate_state FAR *)strm->state; - in = strm->next_in - OFF; + in = strm->next_in; last = in + (strm->avail_in - 5); - out = strm->next_out - OFF; + out = strm->next_out; beg = out - (start - strm->avail_out); end = out + (strm->avail_out - 257); #ifdef INFLATE_STRICT @@ -119,9 +102,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ input data or output space */ do { if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } here = lcode[hold & lmask]; @@ -134,14 +117,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : "inflate: literal 0x%02x\n", here.val)); - PUP(out) = (unsigned char)(here.val); + *out++ = (unsigned char)(here.val); } else if (op & 16) { /* length base */ len = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } len += (unsigned)hold & ((1U << op) - 1); @@ -150,9 +133,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } Tracevv((stderr, "inflate: length %u\n", len)); if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } here = dcode[hold & dmask]; @@ -165,10 +148,10 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ dist = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } } @@ -196,30 +179,30 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR if (len <= op - whave) { do { - PUP(out) = 0; + *out++ = 0; } while (--len); continue; } len -= op - whave; do { - PUP(out) = 0; + *out++ = 0; } while (--op > whave); if (op == 0) { from = out - dist; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--len); continue; } #endif } - from = window - OFF; + from = window; if (wnext == 0) { /* very common case */ from += wsize - op; if (op < len) { /* some from window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } @@ -230,14 +213,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from end of window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); - from = window - OFF; + from = window; if (wnext < len) { /* some from start of window */ op = wnext; len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } @@ -248,35 +231,35 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } } while (len > 2) { - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); + *out++ = *from++; + *out++ = *from++; + *out++ = *from++; len -= 3; } if (len) { - PUP(out) = PUP(from); + *out++ = *from++; if (len > 1) - PUP(out) = PUP(from); + *out++ = *from++; } } else { from = out - dist; /* copy direct from output */ do { /* minimum length is three */ - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); + *out++ = *from++; + *out++ = *from++; + *out++ = *from++; len -= 3; } while (len > 2); if (len) { - PUP(out) = PUP(from); + *out++ = *from++; if (len > 1) - PUP(out) = PUP(from); + *out++ = *from++; } } } @@ -313,8 +296,8 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold &= (1U << bits) - 1; /* update state and return */ - strm->next_in = in + OFF; - strm->next_out = out + OFF; + strm->next_in = in; + strm->next_out = out; strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); strm->avail_out = (unsigned)(out < end ? 257 + (end - out) : 257 - (out - end)); diff --git a/zlib/inflate.c b/zlib/inflate.c index 870f89bb4..ac333e8c2 100644 --- a/zlib/inflate.c +++ b/zlib/inflate.c @@ -1,5 +1,5 @@ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2012 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -92,6 +92,7 @@ #endif /* function prototypes */ +local int inflateStateCheck OF((z_streamp strm)); local void fixedtables OF((struct inflate_state FAR *state)); local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, unsigned copy)); @@ -101,12 +102,26 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, unsigned len)); +local int inflateStateCheck(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + state = (struct inflate_state FAR *)strm->state; + if (state == Z_NULL || state->strm != strm || + state->mode < HEAD || state->mode > SYNC) + return 1; + return 0; +} + int ZEXPORT inflateResetKeep(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; strm->total_in = strm->total_out = state->total = 0; strm->msg = Z_NULL; @@ -131,7 +146,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; state->wsize = 0; state->whave = 0; @@ -147,7 +162,7 @@ int windowBits; struct inflate_state FAR *state; /* get the state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* extract wrap request from windowBits parameter */ @@ -156,7 +171,7 @@ int windowBits; windowBits = -windowBits; } else { - wrap = (windowBits >> 4) + 1; + wrap = (windowBits >> 4) + 5; #ifdef GUNZIP if (windowBits < 48) windowBits &= 15; @@ -210,7 +225,9 @@ int stream_size; if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; + state->strm = strm; state->window = Z_NULL; + state->mode = HEAD; /* to pass state test in inflateReset2() */ ret = inflateReset2(strm, windowBits); if (ret != Z_OK) { ZFREE(strm, state); @@ -234,17 +251,17 @@ int value; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (bits < 0) { state->hold = 0; state->bits = 0; return Z_OK; } - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR; value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; + state->hold += (unsigned)value << state->bits; + state->bits += (uInt)bits; return Z_OK; } @@ -625,7 +642,7 @@ int flush; static const unsigned short order[19] = /* permutation of code lengths */ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + if (inflateStateCheck(strm) || strm->next_out == Z_NULL || (strm->next_in == Z_NULL && strm->avail_in != 0)) return Z_STREAM_ERROR; @@ -645,6 +662,8 @@ int flush; NEEDBITS(16); #ifdef GUNZIP if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + if (state->wbits == 0) + state->wbits = 15; state->check = crc32(0L, Z_NULL, 0); CRC2(state->check, hold); INITBITS(); @@ -672,7 +691,7 @@ int flush; len = BITS(4) + 8; if (state->wbits == 0) state->wbits = len; - else if (len > state->wbits) { + if (len > 15 || len > state->wbits) { strm->msg = (char *)"invalid window size"; state->mode = BAD; break; @@ -699,14 +718,16 @@ int flush; } if (state->head != Z_NULL) state->head->text = (int)((hold >> 8) & 1); - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); state->mode = TIME; case TIME: NEEDBITS(32); if (state->head != Z_NULL) state->head->time = hold; - if (state->flags & 0x0200) CRC4(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC4(state->check, hold); INITBITS(); state->mode = OS; case OS: @@ -715,7 +736,8 @@ int flush; state->head->xflags = (int)(hold & 0xff); state->head->os = (int)(hold >> 8); } - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); state->mode = EXLEN; case EXLEN: @@ -724,7 +746,8 @@ int flush; state->length = (unsigned)(hold); if (state->head != Z_NULL) state->head->extra_len = (unsigned)hold; - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); } else if (state->head != Z_NULL) @@ -742,7 +765,7 @@ int flush; len + copy > state->head->extra_max ? state->head->extra_max - len : copy); } - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -761,9 +784,9 @@ int flush; if (state->head != Z_NULL && state->head->name != Z_NULL && state->length < state->head->name_max) - state->head->name[state->length++] = len; + state->head->name[state->length++] = (Bytef)len; } while (len && copy < have); - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -782,9 +805,9 @@ int flush; if (state->head != Z_NULL && state->head->comment != Z_NULL && state->length < state->head->comm_max) - state->head->comment[state->length++] = len; + state->head->comment[state->length++] = (Bytef)len; } while (len && copy < have); - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -796,7 +819,7 @@ int flush; case HCRC: if (state->flags & 0x0200) { NEEDBITS(16); - if (hold != (state->check & 0xffff)) { + if ((state->wrap & 4) && hold != (state->check & 0xffff)) { strm->msg = (char *)"header crc mismatch"; state->mode = BAD; break; @@ -1177,11 +1200,11 @@ int flush; out -= left; strm->total_out += out; state->total += out; - if (out) + if ((state->wrap & 4) && out) strm->adler = state->check = UPDATE(state->check, put - out, out); out = left; - if (( + if ((state->wrap & 4) && ( #ifdef GUNZIP state->flags ? hold : #endif @@ -1240,10 +1263,10 @@ int flush; strm->total_in += in; strm->total_out += out; state->total += out; - if (state->wrap && out) + if ((state->wrap & 4) && out) strm->adler = state->check = UPDATE(state->check, strm->next_out - out, out); - strm->data_type = state->bits + (state->last ? 64 : 0) + + strm->data_type = (int)state->bits + (state->last ? 64 : 0) + (state->mode == TYPE ? 128 : 0) + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) @@ -1255,7 +1278,7 @@ int ZEXPORT inflateEnd(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->window != Z_NULL) ZFREE(strm, state->window); @@ -1273,7 +1296,7 @@ uInt *dictLength; struct inflate_state FAR *state; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* copy dictionary */ @@ -1298,7 +1321,7 @@ uInt dictLength; int ret; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->wrap != 0 && state->mode != DICT) return Z_STREAM_ERROR; @@ -1330,7 +1353,7 @@ gz_headerp head; struct inflate_state FAR *state; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; @@ -1383,7 +1406,7 @@ z_streamp strm; struct inflate_state FAR *state; /* check parameters */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; @@ -1430,7 +1453,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; return state->mode == STORED && state->bits == 0; } @@ -1445,8 +1468,7 @@ z_streamp source; unsigned wsize; /* check input */ - if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || - source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + if (inflateStateCheck(source) || dest == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)source->state; @@ -1467,6 +1489,7 @@ z_streamp source; /* copy state */ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); + copy->strm = dest; if (state->lencode >= state->codes && state->lencode <= state->codes + ENOUGH - 1) { copy->lencode = copy->codes + (state->lencode - state->codes); @@ -1488,25 +1511,51 @@ int subvert; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; - state->sane = !subvert; #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + state->sane = !subvert; return Z_OK; #else + (void)subvert; state->sane = 1; return Z_DATA_ERROR; #endif } +int ZEXPORT inflateValidate(strm, check) +z_streamp strm; +int check; +{ + struct inflate_state FAR *state; + + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (check) + state->wrap |= 4; + else + state->wrap &= ~4; + return Z_OK; +} + long ZEXPORT inflateMark(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + if (inflateStateCheck(strm)) + return -(1L << 16); state = (struct inflate_state FAR *)strm->state; - return ((long)(state->back) << 16) + + return (long)(((unsigned long)((long)state->back)) << 16) + (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } + +unsigned long ZEXPORT inflateCodesUsed(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (inflateStateCheck(strm)) return (unsigned long)-1; + state = (struct inflate_state FAR *)strm->state; + return (unsigned long)(state->next - state->codes); +} diff --git a/zlib/inflate.h b/zlib/inflate.h index 95f4986d4..a46cce6b6 100644 --- a/zlib/inflate.h +++ b/zlib/inflate.h @@ -1,5 +1,5 @@ /* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2009 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -18,7 +18,7 @@ /* Possible inflate modes between inflate() calls */ typedef enum { - HEAD, /* i: waiting for magic header */ + HEAD = 16180, /* i: waiting for magic header */ FLAGS, /* i: waiting for method and flags (gzip) */ TIME, /* i: waiting for modification time (gzip) */ OS, /* i: waiting for extra flags and operating system (gzip) */ @@ -77,11 +77,14 @@ typedef enum { CHECK -> LENGTH -> DONE */ -/* state maintained between inflate() calls. Approximately 10K bytes. */ +/* State maintained between inflate() calls -- approximately 7K bytes, not + including the allocated sliding window, which is up to 32K bytes. */ struct inflate_state { + z_streamp strm; /* pointer back to this zlib stream */ inflate_mode mode; /* current inflate mode */ int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip, + bit 2 true to validate check value */ int havedict; /* true if dictionary provided */ int flags; /* gzip header method and flags (0 if zlib) */ unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ diff --git a/zlib/inftrees.c b/zlib/inftrees.c index 44d89cf24..2ea08fc13 100644 --- a/zlib/inftrees.c +++ b/zlib/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2013 Mark Adler + * Copyright (C) 1995-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; + " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -54,7 +54,7 @@ unsigned short FAR *work; code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ const unsigned short FAR *extra; /* extra bits table to use */ - int end; /* use base and extra for symbol > end */ + unsigned match; /* use base and extra for symbol >= match */ unsigned short count[MAXBITS+1]; /* number of codes of each length */ unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ static const unsigned short lbase[31] = { /* Length codes 257..285 base */ @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 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, @@ -181,19 +181,17 @@ unsigned short FAR *work; switch (type) { case CODES: base = extra = work; /* dummy value--not used */ - end = 19; + match = 20; break; case LENS: base = lbase; - base -= 257; extra = lext; - extra -= 257; - end = 256; + match = 257; break; - default: /* DISTS */ + default: /* DISTS */ base = dbase; extra = dext; - end = -1; + match = 0; } /* initialize state for loop */ @@ -216,13 +214,13 @@ unsigned short FAR *work; for (;;) { /* create table entry */ here.bits = (unsigned char)(len - drop); - if ((int)(work[sym]) < end) { + if (work[sym] + 1U < match) { here.op = (unsigned char)0; here.val = work[sym]; } - else if ((int)(work[sym]) > end) { - here.op = (unsigned char)(extra[work[sym]]); - here.val = base[work[sym]]; + else if (work[sym] >= match) { + here.op = (unsigned char)(extra[work[sym] - match]); + here.val = base[work[sym] - match]; } else { here.op = (unsigned char)(32 + 64); /* end of block */ diff --git a/zlib/trees.c b/zlib/trees.c index 1fd7759ef..50cf4b457 100644 --- a/zlib/trees.c +++ b/zlib/trees.c @@ -1,5 +1,5 @@ /* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2012 Jean-loup Gailly + * Copyright (C) 1995-2017 Jean-loup Gailly * detect_data_type() function provided freely by Cosmin Truta, 2006 * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -36,7 +36,7 @@ #include "deflate.h" -#ifdef DEBUG +#ifdef ZLIB_DEBUG # include #endif @@ -122,13 +122,13 @@ struct static_tree_desc_s { int max_length; /* max bit length for the codes */ }; -local static_tree_desc static_l_desc = +local const static_tree_desc static_l_desc = {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; -local static_tree_desc static_d_desc = +local const static_tree_desc static_d_desc = {static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; -local static_tree_desc static_bl_desc = +local const static_tree_desc static_bl_desc = {(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; /* =========================================================================== @@ -152,18 +152,16 @@ local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); local void bi_flush OF((deflate_state *s)); -local void copy_block OF((deflate_state *s, charf *buf, unsigned len, - int header)); #ifdef GEN_TREES_H local void gen_trees_header OF((void)); #endif -#ifndef DEBUG +#ifndef ZLIB_DEBUG # define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) /* Send a code of the given tree. c and tree must not have side effects */ -#else /* DEBUG */ +#else /* !ZLIB_DEBUG */ # define send_code(s, c, tree) \ { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ send_bits(s, tree[c].Code, tree[c].Len); } @@ -182,7 +180,7 @@ local void gen_trees_header OF((void)); * Send a value on a given number of bits. * IN assertion: length <= 16 and value fits in length bits. */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG local void send_bits OF((deflate_state *s, int value, int length)); local void send_bits(s, value, length) @@ -208,12 +206,12 @@ local void send_bits(s, value, length) s->bi_valid += length; } } -#else /* !DEBUG */ +#else /* !ZLIB_DEBUG */ #define send_bits(s, value, length) \ { int len = length;\ if (s->bi_valid > (int)Buf_size - len) {\ - int val = value;\ + int val = (int)value;\ s->bi_buf |= (ush)val << s->bi_valid;\ put_short(s, s->bi_buf);\ s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ @@ -223,7 +221,7 @@ local void send_bits(s, value, length) s->bi_valid += len;\ }\ } -#endif /* DEBUG */ +#endif /* ZLIB_DEBUG */ /* the arguments must not have side effects */ @@ -317,7 +315,7 @@ local void tr_static_init() * Genererate the file trees.h describing the static trees. */ #ifdef GEN_TREES_H -# ifndef DEBUG +# ifndef ZLIB_DEBUG # include # endif @@ -394,7 +392,7 @@ void ZLIB_INTERNAL _tr_init(s) s->bi_buf = 0; s->bi_valid = 0; -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->compressed_len = 0L; s->bits_sent = 0L; #endif @@ -522,12 +520,12 @@ local void gen_bitlen(s, desc) xbits = 0; if (n >= base) xbits = extra[n-base]; f = tree[n].Freq; - s->opt_len += (ulg)f * (bits + xbits); - if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); + s->opt_len += (ulg)f * (unsigned)(bits + xbits); + if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits); } if (overflow == 0) return; - Trace((stderr,"\nbit length overflow\n")); + Tracev((stderr,"\nbit length overflow\n")); /* This happens for example on obj2 and pic of the Calgary corpus */ /* Find the first bit length which could increase: */ @@ -554,9 +552,8 @@ local void gen_bitlen(s, desc) m = s->heap[--h]; if (m > max_code) continue; if ((unsigned) tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - s->opt_len += ((long)bits - (long)tree[m].Len) - *(long)tree[m].Freq; + Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq; tree[m].Len = (ush)bits; } n--; @@ -578,7 +575,7 @@ local void gen_codes (tree, max_code, bl_count) ushf *bl_count; /* number of codes at each bit length */ { ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ + unsigned code = 0; /* running code value */ int bits; /* bit index */ int n; /* code index */ @@ -586,7 +583,8 @@ local void gen_codes (tree, max_code, bl_count) * without bit reversal. */ for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; + code = (code + bl_count[bits-1]) << 1; + next_code[bits] = (ush)code; } /* Check that the bit counts in bl_count are consistent. The last code * must be all ones. @@ -599,7 +597,7 @@ local void gen_codes (tree, max_code, bl_count) int len = tree[n].Len; if (len == 0) continue; /* Now reverse the bits */ - tree[n].Code = bi_reverse(next_code[len]++, len); + tree[n].Code = (ush)bi_reverse(next_code[len]++, len); Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); @@ -821,7 +819,7 @@ local int build_bl_tree(s) if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; } /* Update opt_len to include the bit length tree and counts */ - s->opt_len += 3*(max_blindex+1) + 5+5+4; + s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4; Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", s->opt_len, s->static_len)); @@ -869,11 +867,17 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) int last; /* one if this is the last block for a file */ { send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ -#ifdef DEBUG + bi_windup(s); /* align on byte boundary */ + put_short(s, (ush)stored_len); + put_short(s, (ush)~stored_len); + zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); + s->pending += stored_len; +#ifdef ZLIB_DEBUG s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; s->compressed_len += (stored_len + 4) << 3; + s->bits_sent += 2*16; + s->bits_sent += stored_len<<3; #endif - copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ } /* =========================================================================== @@ -894,7 +898,7 @@ void ZLIB_INTERNAL _tr_align(s) { send_bits(s, STATIC_TREES<<1, 3); send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ #endif bi_flush(s); @@ -902,7 +906,7 @@ void ZLIB_INTERNAL _tr_align(s) /* =========================================================================== * Determine the best encoding for the current block: dynamic trees, static - * trees or store, and output the encoded block to the zip file. + * trees or store, and write out the encoded block. */ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) deflate_state *s; @@ -974,7 +978,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) send_bits(s, (STATIC_TREES<<1)+last, 3); compress_block(s, (const ct_data *)static_ltree, (const ct_data *)static_dtree); -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->compressed_len += 3 + s->static_len; #endif } else { @@ -983,7 +987,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) max_blindex+1); compress_block(s, (const ct_data *)s->dyn_ltree, (const ct_data *)s->dyn_dtree); -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->compressed_len += 3 + s->opt_len; #endif } @@ -995,7 +999,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) if (last) { bi_windup(s); -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->compressed_len += 7; /* align on byte boundary */ #endif } @@ -1090,7 +1094,7 @@ local void compress_block(s, ltree, dtree) send_code(s, code, dtree); /* send the distance code */ extra = extra_dbits[code]; if (extra != 0) { - dist -= base_dist[code]; + dist -= (unsigned)base_dist[code]; send_bits(s, dist, extra); /* send the extra distance bits */ } } /* literal or match pair ? */ @@ -1193,34 +1197,7 @@ local void bi_windup(s) } s->bi_buf = 0; s->bi_valid = 0; -#ifdef DEBUG +#ifdef ZLIB_DEBUG s->bits_sent = (s->bits_sent+7) & ~7; #endif } - -/* =========================================================================== - * Copy a stored block, storing first the length and its - * one's complement if requested. - */ -local void copy_block(s, buf, len, header) - deflate_state *s; - charf *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ -{ - bi_windup(s); /* align on byte boundary */ - - if (header) { - put_short(s, (ush)len); - put_short(s, (ush)~len); -#ifdef DEBUG - s->bits_sent += 2*16; -#endif - } -#ifdef DEBUG - s->bits_sent += (ulg)len<<3; -#endif - while (len--) { - put_byte(s, *buf++); - } -} diff --git a/zlib/uncompr.c b/zlib/uncompr.c index 242e9493d..f03a1a865 100644 --- a/zlib/uncompr.c +++ b/zlib/uncompr.c @@ -1,5 +1,5 @@ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. + * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,51 +9,85 @@ #include "zlib.h" /* =========================================================================== - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. + Decompresses the source buffer into the destination buffer. *sourceLen is + the byte length of the source buffer. Upon entry, *destLen is the total size + of the destination buffer, which must be large enough to hold the entire + uncompressed data. (The size of the uncompressed data must have been saved + previously by the compressor and transmitted to the decompressor by some + mechanism outside the scope of this compression library.) Upon exit, + *destLen is the size of the decompressed data and *sourceLen is the number + of source bytes consumed. Upon return, source + *sourceLen points to the + first unused input byte. - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, or + Z_DATA_ERROR if the input data was corrupted, including if the input data is + an incomplete zlib stream. */ +int ZEXPORT uncompress2 (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong *sourceLen; +{ + z_stream stream; + int err; + const uInt max = (uInt)-1; + uLong len, left; + Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */ + + len = *sourceLen; + if (*destLen) { + left = *destLen; + *destLen = 0; + } + else { + left = 1; + dest = buf; + } + + stream.next_in = (z_const Bytef *)source; + stream.avail_in = 0; + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; + + err = inflateInit(&stream); + if (err != Z_OK) return err; + + stream.next_out = dest; + stream.avail_out = 0; + + do { + if (stream.avail_out == 0) { + stream.avail_out = left > (uLong)max ? max : (uInt)left; + left -= stream.avail_out; + } + if (stream.avail_in == 0) { + stream.avail_in = len > (uLong)max ? max : (uInt)len; + len -= stream.avail_in; + } + err = inflate(&stream, Z_NO_FLUSH); + } while (err == Z_OK); + + *sourceLen -= len + stream.avail_in; + if (dest != buf) + *destLen = stream.total_out; + else if (stream.total_out && err == Z_BUF_ERROR) + left = 1; + + inflateEnd(&stream); + return err == Z_STREAM_END ? Z_OK : + err == Z_NEED_DICT ? Z_DATA_ERROR : + err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR : + err; +} + int ZEXPORT uncompress (dest, destLen, source, sourceLen) Bytef *dest; uLongf *destLen; const Bytef *source; uLong sourceLen; { - z_stream stream; - int err; - - stream.next_in = (z_const Bytef *)source; - stream.avail_in = (uInt)sourceLen; - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; - - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - - err = inflateInit(&stream); - if (err != Z_OK) return err; - - err = inflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - inflateEnd(&stream); - if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) - return Z_DATA_ERROR; - return err; - } - *destLen = stream.total_out; - - err = inflateEnd(&stream); - return err; + return uncompress2(dest, destLen, source, &sourceLen); } diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def index face65518..a2188b000 100644 --- a/zlib/win32/zlib.def +++ b/zlib/win32/zlib.def @@ -8,6 +8,7 @@ EXPORTS inflateEnd ; advanced functions deflateSetDictionary + deflateGetDictionary deflateCopy deflateReset deflateParams @@ -33,12 +34,15 @@ EXPORTS compress2 compressBound uncompress + uncompress2 gzopen gzdopen gzbuffer gzsetparams gzread + gzfread gzwrite + gzfwrite gzprintf gzvprintf gzputs @@ -67,7 +71,9 @@ EXPORTS crc32_combine64 ; checksum functions adler32 + adler32_z crc32 + crc32_z adler32_combine crc32_combine ; various hacks, don't look :) @@ -81,6 +87,8 @@ EXPORTS inflateSyncPoint get_crc_table inflateUndermine + inflateValidate + inflateCodesUsed inflateResetKeep deflateResetKeep gzopen_w diff --git a/zlib/win32/zlib1.rc b/zlib/win32/zlib1.rc index 5c0feed1b..234e641c3 100644 --- a/zlib/win32/zlib1.rc +++ b/zlib/win32/zlib1.rc @@ -26,7 +26,7 @@ BEGIN VALUE "FileDescription", "zlib data compression library\0" VALUE "FileVersion", ZLIB_VERSION "\0" VALUE "InternalName", "zlib1.dll\0" - VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" VALUE "OriginalFilename", "zlib1.dll\0" VALUE "ProductName", "zlib\0" VALUE "ProductVersion", ZLIB_VERSION "\0" diff --git a/zlib/zconf.h b/zlib/zconf.h index 9987a7755..5e1d68a00 100644 --- a/zlib/zconf.h +++ b/zlib/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2013 Jean-loup Gailly. + * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -17,7 +17,7 @@ #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ # define Z_PREFIX_SET -/* all linked symbols */ +/* all linked symbols and init macros */ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align @@ -29,6 +29,7 @@ # define adler32 z_adler32 # define adler32_combine z_adler32_combine # define adler32_combine64 z_adler32_combine64 +# define adler32_z z_adler32_z # ifndef Z_SOLO # define compress z_compress # define compress2 z_compress2 @@ -37,10 +38,14 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 +# define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound # define deflateCopy z_deflateCopy # define deflateEnd z_deflateEnd +# define deflateGetDictionary z_deflateGetDictionary +# define deflateInit z_deflateInit +# define deflateInit2 z_deflateInit2 # define deflateInit2_ z_deflateInit2_ # define deflateInit_ z_deflateInit_ # define deflateParams z_deflateParams @@ -67,6 +72,8 @@ # define gzeof z_gzeof # define gzerror z_gzerror # define gzflush z_gzflush +# define gzfread z_gzfread +# define gzfwrite z_gzfwrite # define gzgetc z_gzgetc # define gzgetc_ z_gzgetc_ # define gzgets z_gzgets @@ -78,7 +85,6 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf -# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -89,32 +95,39 @@ # define gztell z_gztell # define gztell64 z_gztell64 # define gzungetc z_gzungetc +# define gzvprintf z_gzvprintf # define gzwrite z_gzwrite # endif # define inflate z_inflate # define inflateBack z_inflateBack # define inflateBackEnd z_inflateBackEnd +# define inflateBackInit z_inflateBackInit # define inflateBackInit_ z_inflateBackInit_ +# define inflateCodesUsed z_inflateCodesUsed # define inflateCopy z_inflateCopy # define inflateEnd z_inflateEnd +# define inflateGetDictionary z_inflateGetDictionary # define inflateGetHeader z_inflateGetHeader +# define inflateInit z_inflateInit +# define inflateInit2 z_inflateInit2 # define inflateInit2_ z_inflateInit2_ # define inflateInit_ z_inflateInit_ # define inflateMark z_inflateMark # define inflatePrime z_inflatePrime # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 +# define inflateResetKeep z_inflateResetKeep # define inflateSetDictionary z_inflateSetDictionary -# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine -# define inflateResetKeep z_inflateResetKeep +# define inflateValidate z_inflateValidate # define inflate_copyright z_inflate_copyright # define inflate_fast z_inflate_fast # define inflate_table z_inflate_table # ifndef Z_SOLO # define uncompress z_uncompress +# define uncompress2 z_uncompress2 # endif # define zError z_zError # ifndef Z_SOLO @@ -224,9 +237,19 @@ # define z_const #endif -/* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) -# define NO_DUMMY_DECL +#ifdef Z_SOLO + typedef unsigned long z_size_t; +#else +# define z_longlong long long +# if defined(NO_SIZE_T) + typedef unsigned NO_SIZE_T z_size_t; +# elif defined(STDC) +# include + typedef size_t z_size_t; +# else + typedef unsigned long z_size_t; +# endif +# undef z_longlong #endif /* Maximum value for memLevel in deflateInit2 */ @@ -256,7 +279,7 @@ Of course this will generally degrade compression (there's no free lunch). The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus a few kilobytes + that is, 32K for windowBits=15 (default value) plus about 7 kilobytes for small objects. */ diff --git a/zlib/zlib.3 b/zlib/zlib.3 index 0160e62b6..bda4eb073 100644 --- a/zlib/zlib.3 +++ b/zlib/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "28 Apr 2013" +.TH ZLIB 3 "15 Jan 2017" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -48,32 +48,10 @@ Changes to this version are documented in the file that accompanies the source. .LP .I zlib -is available in Java using the java.util.zip package: -.IP -http://java.sun.com/developer/technicalArticles/Programming/compression/ +is built in to many languages and operating systems, including but not limited to +Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go. .LP -A Perl interface to -.IR zlib , -written by Paul Marquess (pmqs@cpan.org), -is available at CPAN (Comprehensive Perl Archive Network) sites, -including: -.IP -http://search.cpan.org/~pmqs/IO-Compress-Zlib/ -.LP -A Python interface to -.IR zlib , -written by A.M. Kuchling (amk@magnet.com), -is available in Python 1.5 and later versions: -.IP -http://docs.python.org/library/zlib.html -.LP -.I zlib -is built into -.IR tcl: -.IP -http://wiki.tcl.tk/4610 -.LP -An experimental package to read and write files in .zip format, +An experimental package to read and write files in the .zip format, written on top of .I zlib by Gilles Vollant (info@winimage.com), @@ -92,7 +70,9 @@ web site can be found at: .IP http://zlib.net/ .LP -The data format used by the zlib library is described by RFC +The data format used by the +.I zlib +library is described by RFC (Request for Comments) 1950 to 1952 in the files: .IP http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format) @@ -124,17 +104,35 @@ http://zlib.net/zlib_faq.html before asking for help. Send questions and/or comments to zlib@gzip.org, or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). -.SH AUTHORS -Version 1.2.8 -Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org) -and Mark Adler (madler@alumni.caltech.edu). +.SH AUTHORS AND LICENSE +Version 1.2.11 .LP -This software is provided "as-is," -without any express or implied warranty. -In no event will the authors be held liable for any damages +Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler +.LP +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages arising from the use of this software. -See the distribution directory with respect to requirements -governing redistribution. +.LP +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: +.LP +.nr step 1 1 +.IP \n[step]. 3 +The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software +in a product, an acknowledgment in the product documentation would be +appreciated but is not required. +.IP \n+[step]. +Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. +.IP \n+[step]. +This notice may not be removed or altered from any source distribution. +.LP +Jean-loup Gailly Mark Adler +.br +jloup@gzip.org madler@alumni.caltech.edu +.LP The deflate format used by .I zlib was defined by Phil Katz. diff --git a/zlib/zlib.3.pdf b/zlib/zlib.3.pdf index a346b5d7e24834806b0871b209637c728fb36d60..6fa519c5bdf5df33b2f17549e1df142c619c916c 100644 GIT binary patch literal 19318 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 to the adler32 checksum of all input read - so far (that is, total_in bytes). + deflate() sets strm->adler to the Adler-32 checksum of all input read + so far (that is, total_in bytes). If a gzip stream is being generated, then + strm->adler will be the CRC-32 checksum of the input read so far. (See + deflateInit2 below.) deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered - binary. This field is only for information purposes and does not affect the - compression algorithm in any manner. + the input data type (Z_BINARY or Z_TEXT). If in doubt, the data is + considered binary. This field is only for information purposes and does not + affect the compression algorithm in any manner. deflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if all input has been consumed and all output has been produced (only when flush is set to Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not - fatal, and deflate() can be called again with more input and more output - space to continue compressing. + if next_in or next_out was Z_NULL or the state was inadvertently written over + by the application), or Z_BUF_ERROR if no progress is possible (for example + avail_in or avail_out was zero). Note that Z_BUF_ERROR is not fatal, and + deflate() can be called again with more input and more output space to + continue compressing. */ @@ -369,23 +379,21 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); Initializes the internal stream state for decompression. The fields next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the - exact value depends on the compression method), inflateInit determines the - compression method from the zlib header and allocates all data structures - accordingly; otherwise the allocation will be deferred to the first call of - inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to - use default allocation functions. + the caller. In the current version of inflate, the provided input is not + read or consumed. The allocation of a sliding window will be deferred to + the first call of inflate (if the decompression does not complete on the + first call). If zalloc and zfree are set to Z_NULL, inflateInit updates + them to use default allocation functions. inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the version assumed by the caller, or Z_STREAM_ERROR if the parameters are invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit() does not process any header information -- that is deferred - until inflate() is called. + there is no error message. inflateInit does not perform any decompression. + Actual decompression will be done by inflate(). So next_in, and avail_in, + next_out, and avail_out are unused and unchanged. The current + implementation of inflateInit() does not process any header information -- + that is deferred until inflate() is called. */ @@ -401,17 +409,20 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); - Decompress more input starting at next_in and update next_in and avail_in accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing will - resume at this point for the next call of inflate(). + enough room in the output buffer), then next_in and avail_in are updated + accordingly, and processing will resume at this point for the next call of + inflate(). - - Provide more output starting at next_out and update next_out and avail_out + - Generate more output starting at next_out and update next_out and avail_out accordingly. inflate() provides as much output as possible, until there is no more input data or no more space in the output buffer (see below about the flush parameter). Before the call of inflate(), the application should ensure that at least one of the actions is possible, by providing more input and/or consuming more - output, and updating the next_* and avail_* values accordingly. The + output, and updating the next_* and avail_* values accordingly. If the + caller of inflate() does not provide both available input and available + output space, it is possible that there will be no progress made. The application can consume the uncompressed output when it wants, for example when the output buffer is full (avail_out == 0), or after each call of inflate(). If inflate returns Z_OK and with zero avail_out, it must be @@ -428,7 +439,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); gets to the end of that block, or when it runs out of data. The Z_BLOCK option assists in appending to or combining deflate streams. - Also to assist in this, on return inflate() will set strm->data_type to the + To assist in this, on return inflate() always sets strm->data_type to the number of unused bits in the last byte taken from strm->next_in, plus 64 if inflate() is currently decoding the last block in the deflate stream, plus 128 if inflate() returned immediately after decoding an end-of-block code or @@ -454,7 +465,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); this case all pending input is processed and all pending output is flushed; avail_out must be large enough to hold all of the uncompressed data for the operation to complete. (The size of the uncompressed data may have been - saved by the compressor for this purpose.) The use of Z_FINISH is not + saved by the compressor for this purpose.) The use of Z_FINISH is not required to perform an inflation in one step. However it may be used to inform inflate that a faster approach can be used for the single inflate() call. Z_FINISH also informs inflate to not maintain a sliding window if the @@ -476,32 +487,33 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the Adler-32 checksum of all output produced so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed adler32 + below. At the end of the stream, inflate() checks that its computed Adler-32 checksum is equal to that saved by the compressor and returns Z_STREAM_END only if the checksum is correct. inflate() can decompress and check either zlib-wrapped or gzip-wrapped deflate data. The header type is detected automatically, if requested when initializing with inflateInit2(). Any information contained in the gzip - header is not retained, so applications that need that information should - instead use raw inflate, see inflateInit2() below, or inflateBack() and - perform their own processing of the gzip header and trailer. When processing + header is not retained unless inflateGetHeader() is used. When processing gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output - producted so far. The CRC-32 is checked against the gzip trailer. + produced so far. The CRC-32 is checked against the gzip trailer, as is the + uncompressed length, modulo 2^32. inflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if the end of the compressed data has been reached and all uncompressed output has been produced, Z_NEED_DICT if a preset dictionary is needed at this point, Z_DATA_ERROR if the input data was corrupted (input stream not conforming to the zlib format or incorrect check - value), Z_STREAM_ERROR if the stream structure was inconsistent (for example - next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, - Z_BUF_ERROR if no progress is possible or if there was not enough room in the - output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + value, in which case strm->msg points to a string with a more specific + error), Z_STREAM_ERROR if the stream structure was inconsistent (for example + next_in or next_out was Z_NULL, or the state was inadvertently written over + by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR + if no progress was possible or if there was not enough room in the output + buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and inflate() can be called again with more input and more output space to continue decompressing. If Z_DATA_ERROR is returned, the application may then call inflateSync() to look for a good compression block if a partial - recovery of the data is desired. + recovery of the data is to be attempted. */ @@ -511,9 +523,8 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); This function discards any unprocessed input and does not flush any pending output. - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). + inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state + was inconsistent. */ @@ -544,16 +555,29 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, compression at the expense of memory usage. The default value is 15 if deflateInit is used instead. + For the current implementation of deflate(), a windowBits value of 8 (a + window size of 256 bytes) is not supported. As a result, a request for 8 + will result in 9 (a 512-byte window). In that case, providing 8 to + inflateInit2() will result in an error when the zlib header with 9 is + checked against the initialization of inflate(). The remedy is to not use 8 + with deflateInit2() with this initialization, or at least in that case use 9 + with inflateInit2(). + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute an adler32 check value. + with no zlib header or trailer, and will not compute a check value. windowBits can also be greater than 15 for optional gzip encoding. Add 16 to windowBits to write a simple gzip header and trailer around the compressed data instead of a zlib wrapper. The gzip header will have no file name, no extra data, no comment, no modification time (set to zero), no - header crc, and the operating system will be set to 255 (unknown). If a - gzip stream is being written, strm->adler is a crc32 instead of an adler32. + header crc, and the operating system will be set to the appropriate value, + if the operating system was determined at compile time. If a gzip stream is + being written, strm->adler is a CRC-32 instead of an Adler-32. + + For raw deflate or gzip encoding, a request for a 256-byte window is + rejected as invalid, since only the zlib header provides a means of + transmitting the window size to the decompressor. The memLevel parameter specifies how much memory should be allocated for the internal compression state. memLevel=1 uses minimum memory but is @@ -614,12 +638,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, addition, the current implementation of deflate will use at most the window size minus 262 bytes of the provided dictionary. - Upon return of this function, strm->adler is set to the adler32 value + Upon return of this function, strm->adler is set to the Adler-32 value of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The adler32 value + which dictionary has been used by the compressor. (The Adler-32 value applies to the whole dictionary even if only a subset of the dictionary is actually used by the compressor.) If a raw deflate was requested, then the - adler32 value is not computed and strm->adler is not set. + Adler-32 value is not computed and strm->adler is not set. deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is @@ -628,6 +652,28 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, not perform any compression: this will be done by deflate(). */ +ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by deflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If deflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + deflateGetDictionary() may return a length less than the window size, even + when more than the window size in input has been provided. It may return up + to 258 bytes less in that case, due to how zlib's implementation of deflate + manages the sliding window and lookahead for matches, where matches can be + up to 258 bytes long. If the application needs the last window-size bytes of + input, then that would need to be saved by the application outside of zlib. + + deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, z_streamp source)); /* @@ -648,10 +694,10 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); /* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. The - stream will keep the same compression level and any other attributes that - may have been set by deflateInit2. + This function is equivalent to deflateEnd followed by deflateInit, but + does not free and reallocate the internal compression state. The stream + will leave the compression level and any other attributes that may have been + set unchanged. deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent (such as zalloc or state being Z_NULL). @@ -662,20 +708,36 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, int strategy)); /* Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2. This can be + interpretation of level and strategy is as in deflateInit2(). This can be used to switch between compression and straight copy of the input data, or to switch to a different kind of input data requiring a different strategy. - If the compression level is changed, the input available so far is - compressed with the old level (and may be flushed); the new level will take - effect only at the next call of deflate(). + If the compression approach (which is a function of the level) or the + strategy is changed, and if any input has been consumed in a previous + deflate() call, then the input available so far is compressed with the old + level and strategy using deflate(strm, Z_BLOCK). There are three approaches + for the compression levels 0, 1..3, and 4..9 respectively. The new level + and strategy will take effect at the next call of deflate(). - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to be - compressed and flushed. In particular, strm->avail_out must be non-zero. + If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does + not have enough output space to complete, then the parameter change will not + take effect. In this case, deflateParams() can be called again with the + same parameters and more output space to try again. - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if - strm->avail_out was zero. + In order to assure a change in the parameters on the first try, the + deflate stream should be flushed using deflate() with Z_BLOCK or other flush + request until strm.avail_out is not zero, before calling deflateParams(). + Then no more input data should be provided before the deflateParams() call. + If this is done, the old level and strategy will be applied to the data + compressed before deflateParams(), and the new level and strategy will be + applied to the the data compressed after deflateParams(). + + deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream + state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if + there was not enough output space to complete the compression of the + available input data before a change in the strategy or approach. Note that + in the case of a Z_BUF_ERROR, the parameters are not changed. A return + value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be + retried with more output space. */ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, @@ -793,7 +855,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, is for use with other formats that use the deflate compressed data format such as zip. Those formats provide their own check values. If a custom format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an adler32 or a crc32 be applied to + recommended that a check value such as an Adler-32 or a CRC-32 be applied to the uncompressed data as is done in the zlib, gzip, and zip formats. For most applications, the zlib format should be used as is. Note that comments above on the use in deflateInit2() applies to the magnitude of windowBits. @@ -802,7 +864,10 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a - crc32 instead of an adler32. + CRC-32 instead of an Adler-32. Unlike the gunzip utility and gzread() (see + below), inflate() will not automatically decode concatenated gzip streams. + inflate() will return Z_STREAM_END at the end of the gzip stream. The state + would need to be reset to continue decoding a subsequent gzip stream. inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the @@ -823,7 +888,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, Initializes the decompression dictionary from the given uncompressed byte sequence. This function must be called immediately after a call of inflate, if that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by that call of inflate. + can be determined from the Adler-32 value returned by that call of inflate. The compressor and decompressor must use exactly the same dictionary (see deflateSetDictionary). For raw inflate, this function can be called at any time to set the dictionary. If the provided dictionary is smaller than the @@ -834,7 +899,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect adler32 value). inflateSetDictionary does not + expected one (incorrect Adler-32 value). inflateSetDictionary does not perform any decompression: this will be done by subsequent calls of inflate(). */ @@ -892,7 +957,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); /* This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. The + but does not free and reallocate the internal decompression state. The stream will keep attributes that may have been set by inflateInit2. inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source @@ -904,7 +969,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, /* This function is the same as inflateReset, but it also permits changing the wrap and window size requests. The windowBits parameter is interpreted - the same as it is for inflateInit2. + the same as it is for inflateInit2. If the window size is changed, then the + memory allocated for the window is freed, and the window will be reallocated + by inflate() if needed. inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent (such as zalloc or state being Z_NULL), or if @@ -956,7 +1023,7 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); location in the input stream can be determined from avail_in and data_type as noted in the description for the Z_BLOCK flush parameter for inflate. - inflateMark returns the value noted above or -1 << 16 if the provided + inflateMark returns the value noted above, or -65536 if the provided source stream state was inconsistent. */ @@ -1048,9 +1115,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, This routine would normally be used in a utility that reads zip or gzip files and writes out uncompressed files. The utility would decode the header and process the trailer on its own, hence this routine expects only - the raw deflate stream to decompress. This is different from the normal - behavior of inflate(), which expects either a zlib or gzip header and - trailer around the deflate stream. + the raw deflate stream to decompress. This is different from the default + behavior of inflate(), which expects a zlib header and trailer around the + deflate stream. inflateBack() uses two subroutines supplied by the caller that are then called by inflateBack() for input and output. inflateBack() calls those @@ -1059,12 +1126,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, parameters and return types are defined above in the in_func and out_func typedefs. inflateBack() will call in(in_desc, &buf) which should return the number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero--buf is ignored in that - case--and inflateBack() will return a buffer error. inflateBack() will call - out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() - should return zero on success, or non-zero on failure. If out() returns - non-zero, inflateBack() will return with an error. Neither in() nor out() - are permitted to change the contents of the window provided to + there is no input available, in() must return zero -- buf is ignored in that + case -- and inflateBack() will return a buffer error. inflateBack() will + call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. + out() should return zero on success, or non-zero on failure. If out() + returns non-zero, inflateBack() will return with an error. Neither in() nor + out() are permitted to change the contents of the window provided to inflateBackInit(), which is also the buffer that out() uses to write from. The length written by out() will be at most the window size. Any non-zero amount of input may be provided by in(). @@ -1092,7 +1159,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, using strm->next_in which will be Z_NULL only if in() returned an error. If strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning non-zero. (in() will always be called before out(), so strm->next_in is - assured to be defined if out() returns non-zero.) Note that inflateBack() + assured to be defined if out() returns non-zero.) Note that inflateBack() cannot return Z_OK. */ @@ -1114,7 +1181,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); 7.6: size of z_off_t Compiler, assembler, and debug options: - 8: DEBUG + 8: ZLIB_DEBUG 9: ASMV or ASMINF -- use ASM code 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention 11: 0 (reserved) @@ -1164,7 +1231,8 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, the byte length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be at least the value returned by compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. + compressed data. compress() is equivalent to compress2() with a level + parameter of Z_DEFAULT_COMPRESSION. compress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output @@ -1180,7 +1248,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be at least the value returned by compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. + compressed data. compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, @@ -1203,7 +1271,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, uncompressed data. (The size of the uncompressed data must have been saved previously by the compressor and transmitted to the decompressor by some mechanism outside the scope of this compression library.) Upon exit, destLen - is the actual size of the uncompressed buffer. + is the actual size of the uncompressed data. uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output @@ -1212,6 +1280,14 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, buffer with the uncompressed data up to that point. */ +ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong *sourceLen)); +/* + Same as uncompress, except that sourceLen is a pointer, where the + length of the source is *sourceLen. On return, *sourceLen is the number of + source bytes consumed. +*/ + /* gzip file access functions */ /* @@ -1290,10 +1366,9 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); default buffer size is 8192 bytes. This function must be called after gzopen() or gzdopen(), and before any other calls that read or write the file. The buffer memory allocation is always deferred to the first read or - write. Two buffers are allocated, either both of the specified size when - writing, or one of the specified size and the other twice that size when - reading. A larger buffer size of, for example, 64K or 128K bytes will - noticeably increase the speed of decompression (reading). + write. Three times that size in buffer space is allocated. A larger buffer + size of, for example, 64K or 128K bytes will noticeably increase the speed + of decompression (reading). The new buffer size also affects the maximum length for gzprintf(). @@ -1304,10 +1379,12 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); /* Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. + of deflateInit2 for the meaning of these parameters. Previously provided + data is flushed before the parameter change. - gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not - opened for writing. + gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not + opened for writing, Z_ERRNO if there is an error writing the flushed data, + or Z_MEM_ERROR if there is a memory allocation error. */ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); @@ -1335,7 +1412,35 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); case. gzread returns the number of uncompressed bytes actually read, less than - len for end of file, or -1 for error. + len for end of file, or -1 for error. If len is too large to fit in an int, + then nothing is read, -1 is returned, and the error state is set to + Z_STREAM_ERROR. +*/ + +ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems, + gzFile file)); +/* + Read up to nitems items of size size from file to buf, otherwise operating + as gzread() does. This duplicates the interface of stdio's fread(), with + size_t request and return types. If the library defines size_t, then + z_size_t is identical to size_t. If not, then z_size_t is an unsigned + integer type that can contain a pointer. + + gzfread() returns the number of full items read of size size, or zero if + the end of the file was reached and a full item could not be read, or if + there was an error. gzerror() must be consulted if zero is returned in + order to determine if there was an error. If the multiplication of size and + nitems overflows, i.e. the product does not fit in a z_size_t, then nothing + is read, zero is returned, and the error state is set to Z_STREAM_ERROR. + + In the event that the end of file is reached and only a partial item is + available at the end, i.e. the remaining uncompressed data length is not a + multiple of size, then the final partial item is nevetheless read into buf + and the end-of-file flag is set. The length of the partial item read is not + provided, but could be inferred from the result of gztell(). This behavior + is the same as the behavior of fread() implementations in common libraries, + but it prevents the direct use of gzfread() to read a concurrently written + file, reseting and retrying on end-of-file, when size is not 1. */ ZEXTERN int ZEXPORT gzwrite OF((gzFile file, @@ -1346,19 +1451,33 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file, error. */ +ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size, + z_size_t nitems, gzFile file)); +/* + gzfwrite() writes nitems items of size size from buf to file, duplicating + the interface of stdio's fwrite(), with size_t request and return types. If + the library defines size_t, then z_size_t is identical to size_t. If not, + then z_size_t is an unsigned integer type that can contain a pointer. + + gzfwrite() returns the number of full items written of size size, or zero + if there was an error. If the multiplication of size and nitems overflows, + i.e. the product does not fit in a z_size_t, then nothing is written, zero + is returned, and the error state is set to Z_STREAM_ERROR. +*/ + ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); /* Converts, formats, and writes the arguments to the compressed file under control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written, or 0 in case of error. The number of - uncompressed bytes written is limited to 8191, or one less than the buffer - size given to gzbuffer(). The caller should assure that this limit is not - exceeded. If it is exceeded, then gzprintf() will return an error (0) with - nothing written. In this case, there may also be a buffer overflow with - unpredictable consequences, which is possible only if zlib was compiled with - the insecure functions sprintf() or vsprintf() because the secure snprintf() - or vsnprintf() functions were not available. This can be determined using - zlibCompileFlags(). + uncompressed bytes actually written, or a negative zlib error code in case + of error. The number of uncompressed bytes written is limited to 8191, or + one less than the buffer size given to gzbuffer(). The caller should assure + that this limit is not exceeded. If it is exceeded, then gzprintf() will + return an error (0) with nothing written. In this case, there may also be a + buffer overflow with unpredictable consequences, which is possible only if + zlib was compiled with the insecure functions sprintf() or vsprintf() + because the secure snprintf() or vsnprintf() functions were not available. + This can be determined using zlibCompileFlags(). */ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); @@ -1418,7 +1537,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); If the flush parameter is Z_FINISH, the remaining data is written and the gzip stream is completed in the output. If gzwrite() is called again, a new gzip stream will be started in the output. gzread() is able to read such - concatented gzip streams. + concatenated gzip streams. gzflush should be called only when strictly necessary because it will degrade compression if called too often. @@ -1572,7 +1691,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); return the updated checksum. If buf is Z_NULL, this function returns the required initial value for the checksum. - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed much faster. Usage example: @@ -1585,6 +1704,12 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); if (adler != original_adler) error(); */ +ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf, + z_size_t len)); +/* + Same as adler32(), but with a size_t length. +*/ + /* ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, z_off_t len2)); @@ -1614,6 +1739,12 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); if (crc != original_crc) error(); */ +ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf, + z_size_t len)); +/* + Same as crc32(), but with a size_t length. +*/ + /* ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); @@ -1644,19 +1775,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, unsigned char FAR *window, const char *version, int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ - (int)sizeof(z_stream)) -#define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, (int)sizeof(z_stream)) +#ifdef Z_PREFIX_SET +# define z_deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +# define z_inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +# define z_inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) +#else +# define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +# define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +# define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +# define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +# define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) +#endif #ifndef Z_SOLO @@ -1676,10 +1823,10 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #ifdef Z_PREFIX_SET # undef z_gzgetc # define z_gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) #else # define gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) #endif /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or @@ -1737,19 +1884,16 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #endif /* !Z_SOLO */ -/* hack for buggy compilers */ -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; -#endif - /* undocumented functions */ ZEXTERN const char * ZEXPORT zError OF((int)); ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); +ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int)); +ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); -#if defined(_WIN32) && !defined(Z_SOLO) +#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, const char *mode)); #endif diff --git a/zlib/zutil.c b/zlib/zutil.c index 23d2ebef0..a76c6b0c7 100644 --- a/zlib/zutil.c +++ b/zlib/zutil.c @@ -1,5 +1,5 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. + * Copyright (C) 1995-2017 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -10,21 +10,18 @@ # include "gzguts.h" #endif -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - z_const char * const z_errmsg[10] = { -"need dictionary", /* Z_NEED_DICT 2 */ -"stream end", /* Z_STREAM_END 1 */ -"", /* Z_OK 0 */ -"file error", /* Z_ERRNO (-1) */ -"stream error", /* Z_STREAM_ERROR (-2) */ -"data error", /* Z_DATA_ERROR (-3) */ -"insufficient memory", /* Z_MEM_ERROR (-4) */ -"buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ -""}; + (z_const char *)"need dictionary", /* Z_NEED_DICT 2 */ + (z_const char *)"stream end", /* Z_STREAM_END 1 */ + (z_const char *)"", /* Z_OK 0 */ + (z_const char *)"file error", /* Z_ERRNO (-1) */ + (z_const char *)"stream error", /* Z_STREAM_ERROR (-2) */ + (z_const char *)"data error", /* Z_DATA_ERROR (-3) */ + (z_const char *)"insufficient memory", /* Z_MEM_ERROR (-4) */ + (z_const char *)"buffer error", /* Z_BUF_ERROR (-5) */ + (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */ + (z_const char *)"" +}; const char * ZEXPORT zlibVersion() @@ -61,7 +58,7 @@ uLong ZEXPORT zlibCompileFlags() case 8: flags += 2 << 6; break; default: flags += 3 << 6; } -#ifdef DEBUG +#ifdef ZLIB_DEBUG flags += 1 << 8; #endif #if defined(ASMV) || defined(ASMINF) @@ -115,8 +112,8 @@ uLong ZEXPORT zlibCompileFlags() return flags; } -#ifdef DEBUG - +#ifdef ZLIB_DEBUG +#include # ifndef verbose # define verbose 0 # endif @@ -219,9 +216,11 @@ local ptr_table table[MAX_PTR]; voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) { - voidpf buf = opaque; /* just to make some compilers happy */ + voidpf buf; ulg bsize = (ulg)items*size; + (void)opaque; + /* If we allocate less than 65520 bytes, we assume that farmalloc * will return a usable pointer which doesn't have to be normalized. */ @@ -244,6 +243,9 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { int n; + + (void)opaque; + if (*(ush*)&ptr != 0) { /* object < 64K */ farfree(ptr); return; @@ -259,7 +261,6 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) next_ptr--; return; } - ptr = opaque; /* just to make some compilers happy */ Assert(0, "zcfree: ptr not found"); } @@ -278,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) { - if (opaque) opaque = 0; /* to make compiler happy */ + (void)opaque; return _halloc((long)items, size); } void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { - if (opaque) opaque = 0; /* to make compiler happy */ + (void)opaque; _hfree(ptr); } @@ -306,7 +307,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) unsigned items; unsigned size; { - if (opaque) items += size - size; /* make compiler happy */ + (void)opaque; return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : (voidpf)calloc(items, size); } @@ -315,8 +316,8 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) voidpf opaque; voidpf ptr; { + (void)opaque; free(ptr); - if (opaque) return; /* make compiler happy */ } #endif /* MY_ZCALLOC */ diff --git a/zlib/zutil.h b/zlib/zutil.h index 24ab06b1c..b079ea6a8 100644 --- a/zlib/zutil.h +++ b/zlib/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2013 Jean-loup Gailly. + * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -36,7 +36,9 @@ #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't find static symbols */ +/* since "static" is used to mean two completely different things in C, we + define "local" for the non-static meaning of "static", for readability + (compile with -Dlocal if your debugger can't find static symbols) */ typedef unsigned char uch; typedef uch FAR uchf; @@ -98,28 +100,38 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif #ifdef AMIGA -# define OS_CODE 0x01 +# define OS_CODE 1 #endif #if defined(VAXC) || defined(VMS) -# define OS_CODE 0x02 +# define OS_CODE 2 # define F_OPEN(name, mode) \ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") #endif +#ifdef __370__ +# if __TARGET_LIB__ < 0x20000000 +# define OS_CODE 4 +# elif __TARGET_LIB__ < 0x40000000 +# define OS_CODE 11 +# else +# define OS_CODE 8 +# endif +#endif + #if defined(ATARI) || defined(atarist) -# define OS_CODE 0x05 +# define OS_CODE 5 #endif #ifdef OS2 -# define OS_CODE 0x06 +# define OS_CODE 6 # if defined(M_I86) && !defined(Z_SOLO) # include # endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 0x07 +# define OS_CODE 7 # ifndef Z_SOLO # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os # include /* for fdopen */ @@ -131,18 +143,24 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif #endif -#ifdef TOPS20 -# define OS_CODE 0x0a +#ifdef __acorn +# define OS_CODE 13 #endif -#ifdef WIN32 -# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ -# define OS_CODE 0x0b -# endif +#if defined(WIN32) && !defined(__CYGWIN__) +# define OS_CODE 10 #endif -#ifdef __50SERIES /* Prime/PRIMOS */ -# define OS_CODE 0x0f +#ifdef _BEOS_ +# define OS_CODE 16 +#endif + +#ifdef __TOS_OS400__ +# define OS_CODE 18 +#endif + +#ifdef __APPLE__ +# define OS_CODE 19 #endif #if defined(_BEOS_) || defined(RISCOS) @@ -177,7 +195,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* common defaults */ #ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ +# define OS_CODE 3 /* assume Unix */ #endif #ifndef F_OPEN @@ -216,7 +234,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* Diagnostic functions */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG # include extern int ZLIB_INTERNAL z_verbose; extern void ZLIB_INTERNAL z_error OF((char *m)); From 5c8a82d6b212466ae31bf2437073a4f63f63177d Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 3 Apr 2018 11:13:01 +0300 Subject: [PATCH 34/50] Set proper version numbers in 7-Zip header file Source code was at 18.01 already, the latest stable version at the moment --- lzma/C/7zVersion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lzma/C/7zVersion.h b/lzma/C/7zVersion.h index a0f562791..69ef69853 100644 --- a/lzma/C/7zVersion.h +++ b/lzma/C/7zVersion.h @@ -1,7 +1,7 @@ -#define MY_VER_MAJOR 17 +#define MY_VER_MAJOR 18 #define MY_VER_MINOR 01 #define MY_VER_BUILD 0 -#define MY_VERSION_NUMBERS "17.01 beta" +#define MY_VERSION_NUMBERS "18.01" #define MY_VERSION MY_VERSION_NUMBERS #ifdef MY_CPU_NAME @@ -10,12 +10,12 @@ #define MY_VERSION_CPU MY_VERSION #endif -#define MY_DATE "2017-08-28" +#define MY_DATE "2018-01-28" #undef MY_COPYRIGHT #undef MY_VERSION_COPYRIGHT_DATE #define MY_AUTHOR_NAME "Igor Pavlov" #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain" -#define MY_COPYRIGHT_CR "Copyright (c) 1999-2017 Igor Pavlov" +#define MY_COPYRIGHT_CR "Copyright (c) 1999-2018 Igor Pavlov" #ifdef USE_COPYRIGHT_CR #define MY_COPYRIGHT MY_COPYRIGHT_CR From 9da92facda33457beeccb0fbcd035224baeab11e Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 3 Apr 2018 11:12:12 +0300 Subject: [PATCH 35/50] Removed workaround for MSVC 2017 compiler bug Apparently Microsoft fixed it in the recent update --- game-music-emu/gme/Fir_Resampler.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/game-music-emu/gme/Fir_Resampler.cpp b/game-music-emu/gme/Fir_Resampler.cpp index a311895a2..7f0deeca3 100644 --- a/game-music-emu/gme/Fir_Resampler.cpp +++ b/game-music-emu/gme/Fir_Resampler.cpp @@ -23,10 +23,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #undef PI #define PI 3.1415926535897932384626433832795029 -#if _MSC_VER >= 1911 -#pragma float_control(precise, on, push) -#endif // _MSC_VER >= 1911 - static void gen_sinc( double rolloff, int width, double offset, double spacing, double scale, int count, short* out ) { @@ -56,10 +52,6 @@ static void gen_sinc( double rolloff, int width, double offset, double spacing, } } -#if _MSC_VER >= 1911 -#pragma float_control(pop) -#endif // _MSC_VER >= 1911 - Fir_Resampler_::Fir_Resampler_( int width, sample_t* impulses_ ) : width_( width ), write_offset( width * stereo - stereo ), From d3cacbf246293197d67602cbd88003980d614ef2 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 3 Apr 2018 12:41:51 +0300 Subject: [PATCH 36/50] Fixed potential crash on usage of Mystic Ambit Incant https://forum.zdoom.org/viewtopic.php?t=60080 --- wadsrc/static/zscript/hexen/healingradius.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/hexen/healingradius.txt b/wadsrc/static/zscript/hexen/healingradius.txt index 52b87c15b..95540bd6c 100644 --- a/wadsrc/static/zscript/hexen/healingradius.txt +++ b/wadsrc/static/zscript/hexen/healingradius.txt @@ -35,8 +35,13 @@ class ArtiHealingRadius : Inventory for (int i = 0; i < MAXPLAYERS; ++i) { + if (!playeringame[i]) + { + continue; + } + PlayerPawn mo = players[i].mo; - if (playeringame[i] && mo != null && mo.health > 0 && mo.Distance2D (Owner) <= HEAL_RADIUS_DIST) + if (mo != null && mo.health > 0 && mo.Distance2D (Owner) <= HEAL_RADIUS_DIST) { // Q: Is it worth it to make this selectable as a player property? // A: Probably not - but it sure doesn't hurt. From 2e7d196f8bf2c13c471d5b91145c6b14b33f0692 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 4 Apr 2018 11:46:14 +0300 Subject: [PATCH 37/50] Fixed crash when vid_setmode CCMD is used from command line It's impossible to validate video mode at such early stage of initialization Added sanity check for mode's width and height as well https://forum.zdoom.org/viewtopic.php?t=59990 --- src/v_video.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/v_video.cpp b/src/v_video.cpp index 761c805d7..1ac815bc5 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -1454,7 +1454,6 @@ bool IVideo::SetResolution (int width, int height, int bits) CCMD (vid_setmode) { - bool goodmode = false; int width = 0, height = SCREENHEIGHT; int bits = DisplayBits; @@ -1471,13 +1470,8 @@ CCMD (vid_setmode) } } - if (width && I_CheckResolution (width, height, bits)) - { - goodmode = true; - } - - if (!fullscreen) - goodmode = true; + const bool goodmode = (width > 0 && height > 0) + && (!fullscreen || (Video != nullptr && I_CheckResolution(width, height, bits))); if (goodmode) { From b6f184491b44117136c2daac0224d4c2fc2febd3 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 4 Apr 2018 16:46:01 +0300 Subject: [PATCH 38/50] Restored vanilla behavior of lightning for original Hexen https://forum.zdoom.org/viewtopic.php?t=60103 --- src/g_shared/a_lightning.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp index aedcd7e6d..625059993 100644 --- a/src/g_shared/a_lightning.cpp +++ b/src/g_shared/a_lightning.cpp @@ -36,6 +36,7 @@ #include "serializer.h" #include "g_levellocals.h" #include "events.h" +#include "gi.h" static FRandom pr_lightning ("Lightning"); @@ -205,6 +206,32 @@ static DLightningThinker *LocateLightning () void P_StartLightning () { + const bool isOriginalHexen = (gameinfo.gametype == GAME_Hexen) + && (level.flags2 & LEVEL2_HEXENHACK); + + if (isOriginalHexen) + { + bool hasLightning = false; + + for (const sector_t §or : level.sectors) + { + hasLightning = sector.GetTexture(sector_t::ceiling) == skyflatnum + || sector.special == Light_IndoorLightning1 + || sector.special == Light_IndoorLightning2; + + if (hasLightning) + { + break; + } + } + + if (!hasLightning) + { + level.flags &= ~LEVEL_STARTLIGHTNING; + return; + } + } + DLightningThinker *lightning = LocateLightning (); if (lightning == NULL) { From b1d33d1bbafa26f81452c516667d88af73e3f2a6 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 5 Apr 2018 01:40:58 +0200 Subject: [PATCH 39/50] - Fix mid texture rendering for self-referencing sector lines --- src/swrenderer/line/r_renderdrawsegment.cpp | 40 +++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/swrenderer/line/r_renderdrawsegment.cpp b/src/swrenderer/line/r_renderdrawsegment.cpp index f46fbc133..f21c9e79f 100644 --- a/src/swrenderer/line/r_renderdrawsegment.cpp +++ b/src/swrenderer/line/r_renderdrawsegment.cpp @@ -264,28 +264,40 @@ namespace swrenderer WallC.sx1 = ds->sx1; WallC.sx2 = ds->sx2; - double top, bot; - GetMaskedWallTopBottom(ds, top, bot); - top -= Thread->Viewport->viewpoint.Pos.Z; - bot -= Thread->Viewport->viewpoint.Pos.Z; + // Unclipped vanilla Doom range for the wall. Relies on ceiling/floor clip to clamp the wall in range. + double ceilZ = textop; + double floorZ = textop - texheight; + // The 3D Floors implementation destroys the ceiling clip when doing its height passes.. + if (m3DFloor.clipTop || m3DFloor.clipBottom) + { + // Use the actual correct wall range for the midtexture. + // This doesn't work for self-referenced sectors, which is why we only do it if we have 3D floors. + + double top, bot; + GetMaskedWallTopBottom(ds, top, bot); + top -= Thread->Viewport->viewpoint.Pos.Z; + bot -= Thread->Viewport->viewpoint.Pos.Z; + + ceilZ = MIN(ceilZ, top); + floorZ = MAX(floorZ, bot); + } + + // Clip wall by the current 3D floor render range. if (m3DFloor.clipTop) { - wallupper.Project(Thread->Viewport.get(), textop < m3DFloor.sclipTop - Thread->Viewport->viewpoint.Pos.Z ? textop : m3DFloor.sclipTop - Thread->Viewport->viewpoint.Pos.Z, &WallC); - } - else - { - wallupper.Project(Thread->Viewport.get(), MIN(textop, top), &WallC); + double clipZ = m3DFloor.sclipTop - Thread->Viewport->viewpoint.Pos.Z; + ceilZ = MIN(ceilZ, clipZ); } if (m3DFloor.clipBottom) { - walllower.Project(Thread->Viewport.get(), textop - texheight > m3DFloor.sclipBottom - Thread->Viewport->viewpoint.Pos.Z ? textop - texheight : m3DFloor.sclipBottom - Thread->Viewport->viewpoint.Pos.Z, &WallC); - } - else - { - walllower.Project(Thread->Viewport.get(), MAX(textop - texheight, bot), &WallC); + double clipZ = m3DFloor.sclipBottom - Thread->Viewport->viewpoint.Pos.Z; + floorZ = MAX(floorZ, clipZ); } + wallupper.Project(Thread->Viewport.get(), ceilZ, &WallC); + walllower.Project(Thread->Viewport.get(), floorZ, &WallC); + for (int i = x1; i < x2; i++) { if (wallupper.ScreenY[i] < mceilingclip[i]) From 7bd281ddc9cfcf934c65dd1bd039760ee9fc7180 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 5 Apr 2018 11:43:43 +0300 Subject: [PATCH 40/50] Added zero initialization of implicit dynamic array items https://forum.zdoom.org/viewtopic.php?t=60111 --- src/scripting/backend/dynarrays.cpp | 56 +++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/src/scripting/backend/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp index 56331442f..49c916a88 100644 --- a/src/scripting/backend/dynarrays.cpp +++ b/src/scripting/backend/dynarrays.cpp @@ -54,6 +54,20 @@ typedef TArray FDynArray_Ptr; typedef TArray FDynArray_Obj; typedef TArray FDynArray_String; +// The following macros are used to zero initialize items implicitly added to a dynamic array +// Some function like Insert() and Resize() can append such items during their operation +// It's more natural for a scripting language to have them initialized +// This is a must for DObject pointers because of garbage collection + +#define PARAM_DYNARRAY_SIZE_PROLOGUE(type) \ + PARAM_SELF_STRUCT_PROLOGUE(type); \ + const unsigned oldSize = self->Size(); + +#define DYNARRAY_FILL_ITEMS_SKIP(skip) \ + const int fillCount = int(self->Size() - oldSize) - skip; \ + if (fillCount > 0) memset(&(*self)[oldSize], 0, sizeof(*self)[0] * fillCount); + + //----------------------------------------------------- // // Int8 array @@ -107,10 +121,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_I8, Delete) DEFINE_ACTION_FUNCTION(FDynArray_I8, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I8); PARAM_INT(index); PARAM_INT(val); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -131,9 +146,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_I8, Grow) DEFINE_ACTION_FUNCTION(FDynArray_I8, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I8); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I8); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -210,10 +226,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_I16, Delete) DEFINE_ACTION_FUNCTION(FDynArray_I16, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I16); PARAM_INT(index); PARAM_INT(val); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -234,9 +251,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_I16, Grow) DEFINE_ACTION_FUNCTION(FDynArray_I16, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I16); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I16); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -313,10 +331,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_I32, Delete) DEFINE_ACTION_FUNCTION(FDynArray_I32, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I32); PARAM_INT(index); PARAM_INT(val); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -337,9 +356,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_I32, Grow) DEFINE_ACTION_FUNCTION(FDynArray_I32, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_I32); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_I32); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -416,10 +436,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_F32, Delete) DEFINE_ACTION_FUNCTION(FDynArray_F32, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_F32); PARAM_INT(index); PARAM_FLOAT(val); self->Insert(index, (float)val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -440,9 +461,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_F32, Grow) DEFINE_ACTION_FUNCTION(FDynArray_F32, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F32); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_F32); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -519,10 +541,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_F64, Delete) DEFINE_ACTION_FUNCTION(FDynArray_F64, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_F64); PARAM_INT(index); PARAM_FLOAT(val); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -543,9 +566,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_F64, Grow) DEFINE_ACTION_FUNCTION(FDynArray_F64, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_F64); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_F64); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -622,10 +646,11 @@ DEFINE_ACTION_FUNCTION(FDynArray_Ptr, Delete) DEFINE_ACTION_FUNCTION(FDynArray_Ptr, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_Ptr); PARAM_INT(index); PARAM_POINTER(val, void); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -646,9 +671,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_Ptr, Grow) DEFINE_ACTION_FUNCTION(FDynArray_Ptr, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Ptr); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_Ptr); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } @@ -727,11 +753,12 @@ DEFINE_ACTION_FUNCTION(FDynArray_Obj, Delete) DEFINE_ACTION_FUNCTION(FDynArray_Obj, Insert) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_Obj); PARAM_INT(index); PARAM_OBJECT(val, DObject); GC::WriteBarrier(val); self->Insert(index, val); + DYNARRAY_FILL_ITEMS_SKIP(1); return 0; } @@ -752,9 +779,10 @@ DEFINE_ACTION_FUNCTION(FDynArray_Obj, Grow) DEFINE_ACTION_FUNCTION(FDynArray_Obj, Resize) { - PARAM_SELF_STRUCT_PROLOGUE(FDynArray_Obj); + PARAM_DYNARRAY_SIZE_PROLOGUE(FDynArray_Obj); PARAM_INT(count); self->Resize(count); + DYNARRAY_FILL_ITEMS_SKIP(0); return 0; } From 51778687731a0b1db8c528071e5119abf19ec0e5 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 7 Apr 2018 08:05:50 +0300 Subject: [PATCH 41/50] Revert "Removed workaround for MSVC 2017 compiler bug" This reverts commit 9da92facda33457beeccb0fbcd035224baeab11e. --- game-music-emu/gme/Fir_Resampler.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/game-music-emu/gme/Fir_Resampler.cpp b/game-music-emu/gme/Fir_Resampler.cpp index 7f0deeca3..a311895a2 100644 --- a/game-music-emu/gme/Fir_Resampler.cpp +++ b/game-music-emu/gme/Fir_Resampler.cpp @@ -23,6 +23,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #undef PI #define PI 3.1415926535897932384626433832795029 +#if _MSC_VER >= 1911 +#pragma float_control(precise, on, push) +#endif // _MSC_VER >= 1911 + static void gen_sinc( double rolloff, int width, double offset, double spacing, double scale, int count, short* out ) { @@ -52,6 +56,10 @@ static void gen_sinc( double rolloff, int width, double offset, double spacing, } } +#if _MSC_VER >= 1911 +#pragma float_control(pop) +#endif // _MSC_VER >= 1911 + Fir_Resampler_::Fir_Resampler_( int width, sample_t* impulses_ ) : width_( width ), write_offset( width * stereo - stereo ), From 3239a9eaa64dc21d3373607f01044eda8e49ebf1 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 7 Apr 2018 12:43:10 +0300 Subject: [PATCH 42/50] Added loading of ZSDF lumps by full paths https://forum.zdoom.org/viewtopic.php?t=60139 --- src/p_conversation.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 401541e24..1e5d306b9 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -227,8 +227,10 @@ void P_LoadStrifeConversations (MapData *map, const char *mapname) bool LoadScriptFile (const char *name, bool include, int type) { int lumpnum = Wads.CheckNumForName (name); + const bool found = lumpnum >= 0 + || (lumpnum = Wads.CheckNumForFullName (name)) >= 0; - if (lumpnum < 0) + if (!found) { return false; } From cb3650ed9e1fa69541573ff7893ff45023a68d42 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 7 Apr 2018 12:52:38 +0300 Subject: [PATCH 43/50] Added message for absent explicitly referenced dialog file --- src/p_conversation.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 1e5d306b9..073d5ff9d 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -232,6 +232,11 @@ bool LoadScriptFile (const char *name, bool include, int type) if (!found) { + if (type == 0) + { + Printf(TEXTCOLOR_RED "Could not find dialog file %s", name); + } + return false; } FileReader lump = Wads.ReopenLumpReader (lumpnum); From 3dd7f17ded8fe34d0eae18bb6ed43c714316f8e6 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 8 Apr 2018 09:55:48 +0300 Subject: [PATCH 44/50] Deleted MPL text from docs It was the last remnant of tmpfileplus --- docs/licenses/mpl.txt | 373 ------------------------------------------ 1 file changed, 373 deletions(-) delete mode 100644 docs/licenses/mpl.txt diff --git a/docs/licenses/mpl.txt b/docs/licenses/mpl.txt deleted file mode 100644 index 14e2f777f..000000000 --- a/docs/licenses/mpl.txt +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. From 7c70e0971c184ec8ba7d374aaa77be6212084244 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 8 Apr 2018 20:49:51 +0200 Subject: [PATCH 45/50] - disabled the survey code. This survey is now closed and new input no longer needed. --- src/d_stats.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_stats.cpp b/src/d_stats.cpp index c4fb6d1a5..0a0e7f847 100644 --- a/src/d_stats.cpp +++ b/src/d_stats.cpp @@ -1,4 +1,4 @@ - +#define NO_SEND_STATS #ifdef NO_SEND_STATS void D_DoAnonStats() From 5d0ff4c8baeb07261844830df76e59656f7ed601 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 7 Apr 2018 16:58:30 +0200 Subject: [PATCH 46/50] Exports P_ActivateLine to ZScript (along with constants for activation type) --- src/p_spec.cpp | 20 ++++++++++++++++++++ wadsrc/static/zscript/constants.txt | 18 ++++++++++++++++++ wadsrc/static/zscript/mapdata.txt | 1 + 3 files changed, 39 insertions(+) diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 2d7d3ddc0..e287ef047 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -242,6 +242,26 @@ bool P_ActivateLine (line_t *line, AActor *mo, int side, int activationType, DVe return true; } +DEFINE_ACTION_FUNCTION(_Line, Activate) +{ + PARAM_SELF_PROLOGUE(line_t); + PARAM_POINTER(mo, AActor); + PARAM_INT(side); + PARAM_INT(activationType); + PARAM_FLOAT_DEF(optx); + PARAM_FLOAT_DEF(opty); + PARAM_FLOAT_DEF(optz); + if ( optx == opty == optz == NAN ) + { + ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, NULL)); + } + else + { + DVector3 optpos = DVector3(optx, opty, optz); + ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, &optpos)); + } +} + //============================================================================ // // P_TestActivateLine diff --git a/wadsrc/static/zscript/constants.txt b/wadsrc/static/zscript/constants.txt index ef20e2310..fea498deb 100644 --- a/wadsrc/static/zscript/constants.txt +++ b/wadsrc/static/zscript/constants.txt @@ -1223,3 +1223,21 @@ enum ActorRenderFeatureFlag RFF_VOXELS = 1<<12, // renderer is capable of voxels }; +// Special activation types +enum SPAC +{ + SPAC_Cross = 1<<0, // when player crosses line + SPAC_Use = 1<<1, // when player uses line + SPAC_MCross = 1<<2, // when monster crosses line + SPAC_Impact = 1<<3, // when projectile hits line + SPAC_Push = 1<<4, // when player pushes line + SPAC_PCross = 1<<5, // when projectile crosses line + SPAC_UseThrough = 1<<6, // when player uses line (doesn't block) + // SPAC_PTOUCH is mapped to SPAC_PCross|SPAC_Impact + SPAC_AnyCross = 1<<7, // when anything without the MF2_TELEPORT flag crosses the line + SPAC_MUse = 1<<8, // monsters can use + SPAC_MPush = 1<<9, // monsters can push + SPAC_UseBack = 1<<10, // Can be used from the backside + + SPAC_PlayerActivate = (SPAC_Cross|SPAC_Use|SPAC_Impact|SPAC_Push|SPAC_AnyCross|SPAC_UseThrough|SPAC_UseBack), +}; diff --git a/wadsrc/static/zscript/mapdata.txt b/wadsrc/static/zscript/mapdata.txt index e219e835a..d7373d766 100644 --- a/wadsrc/static/zscript/mapdata.txt +++ b/wadsrc/static/zscript/mapdata.txt @@ -156,6 +156,7 @@ struct Line native play native Line getPortalDestination(); native int getPortalAlignment(); native int Index(); + native bool Activate(Actor activator, int side, int type, Vector3 pos = (double.nan, double.nan, double.nan)); int GetUDMFInt(Name nm) { From 08f3afab0b264700b011e091dd7552955575b30e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 7 Apr 2018 17:08:23 +0200 Subject: [PATCH 47/50] Separated P_ActivateLine ZScript export into two functions, one with and one without a vector parameter. --- src/p_spec.cpp | 26 ++++++++++++++------------ wadsrc/static/zscript/mapdata.txt | 3 ++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/p_spec.cpp b/src/p_spec.cpp index e287ef047..0bd3d9fdb 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -248,18 +248,20 @@ DEFINE_ACTION_FUNCTION(_Line, Activate) PARAM_POINTER(mo, AActor); PARAM_INT(side); PARAM_INT(activationType); - PARAM_FLOAT_DEF(optx); - PARAM_FLOAT_DEF(opty); - PARAM_FLOAT_DEF(optz); - if ( optx == opty == optz == NAN ) - { - ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, NULL)); - } - else - { - DVector3 optpos = DVector3(optx, opty, optz); - ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, &optpos)); - } + ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, NULL)); +} + +DEFINE_ACTION_FUNCTION(_Line, RemoteActivate) +{ + PARAM_SELF_PROLOGUE(line_t); + PARAM_POINTER(mo, AActor); + PARAM_INT(side); + PARAM_INT(activationType); + PARAM_FLOAT(optx); + PARAM_FLOAT(opty); + PARAM_FLOAT(optz); + DVector3 optpos = DVector3(optx, opty, optz); + ACTION_RETURN_BOOL(P_ActivateLine(self, mo, side, activationType, &optpos)); } //============================================================================ diff --git a/wadsrc/static/zscript/mapdata.txt b/wadsrc/static/zscript/mapdata.txt index d7373d766..4267b7b05 100644 --- a/wadsrc/static/zscript/mapdata.txt +++ b/wadsrc/static/zscript/mapdata.txt @@ -156,7 +156,8 @@ struct Line native play native Line getPortalDestination(); native int getPortalAlignment(); native int Index(); - native bool Activate(Actor activator, int side, int type, Vector3 pos = (double.nan, double.nan, double.nan)); + native bool Activate(Actor activator, int side, int type); + native bool RemoteActivate(Actor activator, int side, int type, Vector3 pos); int GetUDMFInt(Name nm) { From 8ff81c93e8ecf521e7d7a5be940eb6e4c8c53ab3 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 7 Apr 2018 17:43:46 +0200 Subject: [PATCH 48/50] Fix building on GCC7. --- src/p_spec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 0bd3d9fdb..3185b6c20 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -244,7 +244,7 @@ bool P_ActivateLine (line_t *line, AActor *mo, int side, int activationType, DVe DEFINE_ACTION_FUNCTION(_Line, Activate) { - PARAM_SELF_PROLOGUE(line_t); + PARAM_SELF_STRUCT_PROLOGUE(line_t); PARAM_POINTER(mo, AActor); PARAM_INT(side); PARAM_INT(activationType); @@ -253,7 +253,7 @@ DEFINE_ACTION_FUNCTION(_Line, Activate) DEFINE_ACTION_FUNCTION(_Line, RemoteActivate) { - PARAM_SELF_PROLOGUE(line_t); + PARAM_SELF_STRUCT_PROLOGUE(line_t); PARAM_POINTER(mo, AActor); PARAM_INT(side); PARAM_INT(activationType); From 80f57dfaf0716c48e85984690657396255e44a40 Mon Sep 17 00:00:00 2001 From: drfrag666 Date: Wed, 4 Apr 2018 11:24:28 +0200 Subject: [PATCH 49/50] - Increased size of the savegame comment area. --- src/menu/loadsavemenu.cpp | 6 ++++-- wadsrc/static/zscript/menu/loadsavemenu.txt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp index 7d4b1ebf4..3ce7c9a7d 100644 --- a/src/menu/loadsavemenu.cpp +++ b/src/menu/loadsavemenu.cpp @@ -487,7 +487,7 @@ unsigned FSavegameManager::ExtractSaveData(int index) arc("Comment", pcomment); comment = time; - if (time.Len() > 0) comment += "\n\n"; + if (time.Len() > 0) comment += "\n"; comment += pcomment; SaveComment = V_BreakLines(SmallFont, WindowSize, comment.GetChars()); @@ -619,10 +619,12 @@ void FSavegameManager::DrawSaveComment(FFont *font, int cr, int x, int y, int sc CleanXfac = CleanYfac = scalefactor; + int maxlines = screen->GetHeight()>400?10:screen->GetHeight()>240?7:screen->GetHeight()>200?8:5; + if (SmallFont->GetHeight() > 9) maxlines--; // not Doom // I'm not sure why SaveComment would go nullptr in this loop, but I got // a crash report where it was nullptr when i reached 1, so now I check // for that. - for (int i = 0; SaveComment != nullptr && SaveComment[i].Width >= 0 && i < 6; ++i) + for (int i = 0; SaveComment != nullptr && SaveComment[i].Width >= 0 && i < maxlines; ++i) { screen->DrawText(font, cr, x, y + font->GetHeight() * i * scalefactor, SaveComment[i].Text, DTA_CleanNoMove, true, TAG_DONE); } diff --git a/wadsrc/static/zscript/menu/loadsavemenu.txt b/wadsrc/static/zscript/menu/loadsavemenu.txt index 279024a58..eb27b6f6e 100644 --- a/wadsrc/static/zscript/menu/loadsavemenu.txt +++ b/wadsrc/static/zscript/menu/loadsavemenu.txt @@ -132,7 +132,8 @@ class LoadSaveMenu : ListMenu commentLeft = savepicLeft; commentTop = savepicTop + savepicHeight + 16; commentWidth = savepicWidth; - commentHeight = (51+(screen.GetHeight()>200?10:0))*CleanYfac; + //commentHeight = (51+(screen.GetHeight()>200?10:0))*CleanYfac; + commentHeight = listboxHeight - savepicHeight - 16; commentRight = commentLeft + commentWidth; commentBottom = commentTop + commentHeight; } From a23259f26ae08e54b6d95aed368dad9e7dc85ccf Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Fri, 13 Apr 2018 09:10:33 -0400 Subject: [PATCH 50/50] - remove TLS workaround and turn it into an actual error since it is required in order to even properly compile and not all systems properly detect this. --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbc6c0f22..f13efb0ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -409,8 +409,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int main() { i = 0; }" HAVE_THREAD_LOCAL) if( NOT HAVE_THREAD_LOCAL ) - message( WARNING "C++ compiler doesn't support thread_local storage duration specifier" ) - add_definitions( -Dthread_local= ) + message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" ) endif() # Check for functions that may or may not exist.