Index: build/premake/mpt-OpenMPT.lua =================================================================== --- build/premake/mpt-OpenMPT.lua (revision 13976) +++ build/premake/mpt-OpenMPT.lua (working copy) @@ -139,12 +139,6 @@ defines { "MODPLUG_TRACKER" } dpiawareness "None" - filter {} - filter { "action:vs*", "architecture:x86" } - dataexecutionprevention "Off" - filter { "action:vs*", "architecture:x86_64" } - dataexecutionprevention "Off" - filter {} largeaddressaware ( true ) characterset(charset) if stringmode == "UTF8" then Index: build/vs2017win10/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-ANSI.vcxproj (revision 13976) +++ build/vs2017win10/OpenMPT-ANSI.vcxproj (working copy) @@ -588,7 +588,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -624,7 +623,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -734,7 +732,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -775,7 +772,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -897,7 +893,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -938,7 +933,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1053,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1088,7 +1081,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1198,7 +1190,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1239,7 +1230,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1361,7 +1351,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1402,7 +1391,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2017win10/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-UTF8.vcxproj (revision 13976) +++ build/vs2017win10/OpenMPT-UTF8.vcxproj (working copy) @@ -588,7 +588,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -624,7 +623,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -734,7 +732,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -775,7 +772,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -897,7 +893,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -938,7 +933,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1053,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1088,7 +1081,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1198,7 +1190,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1239,7 +1230,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1361,7 +1351,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1402,7 +1391,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2017win10/OpenMPT.vcxproj =================================================================== --- build/vs2017win10/OpenMPT.vcxproj (revision 13976) +++ build/vs2017win10/OpenMPT.vcxproj (working copy) @@ -588,7 +588,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -624,7 +623,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -734,7 +732,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -775,7 +772,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -897,7 +893,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -938,7 +933,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1053,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1088,7 +1081,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1198,7 +1190,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1239,7 +1230,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1361,7 +1351,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1402,7 +1391,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2017win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-ANSI.vcxproj (revision 13976) +++ build/vs2017win7/OpenMPT-ANSI.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -341,7 +340,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -382,7 +380,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -422,7 +419,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -463,7 +459,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -503,7 +498,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -537,7 +531,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -571,7 +564,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -612,7 +604,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -652,7 +643,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -693,7 +683,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -733,7 +722,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2017win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-UTF8.vcxproj (revision 13976) +++ build/vs2017win7/OpenMPT-UTF8.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -341,7 +340,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -382,7 +380,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -422,7 +419,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -463,7 +459,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -503,7 +498,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -537,7 +531,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -571,7 +564,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -612,7 +604,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -652,7 +643,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -693,7 +683,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -733,7 +722,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2017win7/OpenMPT.vcxproj =================================================================== --- build/vs2017win7/OpenMPT.vcxproj (revision 13976) +++ build/vs2017win7/OpenMPT.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -341,7 +340,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -382,7 +380,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -422,7 +419,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -463,7 +459,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -503,7 +498,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -537,7 +531,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -571,7 +564,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -612,7 +604,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -652,7 +643,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -693,7 +683,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -733,7 +722,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2019win10/OpenMPT-ANSI.vcxproj (revision 13976) +++ build/vs2019win10/OpenMPT-ANSI.vcxproj (working copy) @@ -586,7 +586,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -622,7 +621,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -732,7 +730,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -773,7 +770,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -895,7 +891,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -936,7 +931,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1051,7 +1045,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1086,7 +1079,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1196,7 +1188,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1237,7 +1228,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1359,7 +1349,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1400,7 +1389,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2019win10/OpenMPT-UTF8.vcxproj (revision 13976) +++ build/vs2019win10/OpenMPT-UTF8.vcxproj (working copy) @@ -586,7 +586,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -622,7 +621,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -732,7 +730,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -773,7 +770,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -895,7 +891,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -936,7 +931,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1051,7 +1045,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1086,7 +1079,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1196,7 +1188,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1237,7 +1228,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1359,7 +1349,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1400,7 +1389,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10/OpenMPT.vcxproj =================================================================== --- build/vs2019win10/OpenMPT.vcxproj (revision 13976) +++ build/vs2019win10/OpenMPT.vcxproj (working copy) @@ -586,7 +586,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -622,7 +621,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -732,7 +730,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -773,7 +770,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -895,7 +891,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -936,7 +931,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1051,7 +1045,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1086,7 +1079,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1196,7 +1188,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1237,7 +1228,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1359,7 +1349,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1400,7 +1389,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10clangcl/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2019win10clangcl/OpenMPT-ANSI.vcxproj (revision 13976) +++ build/vs2019win10clangcl/OpenMPT-ANSI.vcxproj (working copy) @@ -554,7 +554,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -590,7 +589,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -700,7 +698,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -741,7 +738,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -863,7 +859,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -904,7 +899,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1019,7 +1013,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1054,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1164,7 +1156,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1205,7 +1196,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1327,7 +1317,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1368,7 +1357,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10clangcl/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2019win10clangcl/OpenMPT-UTF8.vcxproj (revision 13976) +++ build/vs2019win10clangcl/OpenMPT-UTF8.vcxproj (working copy) @@ -554,7 +554,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -590,7 +589,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -700,7 +698,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -741,7 +738,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -863,7 +859,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -904,7 +899,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1019,7 +1013,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1054,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1164,7 +1156,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1205,7 +1196,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1327,7 +1317,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1368,7 +1357,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win10clangcl/OpenMPT.vcxproj =================================================================== --- build/vs2019win10clangcl/OpenMPT.vcxproj (revision 13976) +++ build/vs2019win10clangcl/OpenMPT.vcxproj (working copy) @@ -554,7 +554,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -590,7 +589,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -700,7 +698,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -741,7 +738,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -863,7 +859,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -904,7 +899,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1019,7 +1013,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1054,7 +1047,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1164,7 +1156,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1205,7 +1196,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1327,7 +1317,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -1368,7 +1357,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2019win7/OpenMPT-ANSI.vcxproj (revision 13976) +++ build/vs2019win7/OpenMPT-ANSI.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -342,7 +341,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -384,7 +382,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -425,7 +422,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -467,7 +463,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -508,7 +503,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -543,7 +537,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -578,7 +571,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -620,7 +612,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -661,7 +652,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -703,7 +693,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -744,7 +733,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2019win7/OpenMPT-UTF8.vcxproj (revision 13976) +++ build/vs2019win7/OpenMPT-UTF8.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -342,7 +341,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -384,7 +382,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -425,7 +422,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -467,7 +463,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -508,7 +503,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -543,7 +537,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -578,7 +571,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -620,7 +612,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -661,7 +652,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -703,7 +693,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -744,7 +733,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: build/vs2019win7/OpenMPT.vcxproj =================================================================== --- build/vs2019win7/OpenMPT.vcxproj (revision 13976) +++ build/vs2019win7/OpenMPT.vcxproj (working copy) @@ -306,7 +306,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -342,7 +341,6 @@ Windows true DebugFastLink - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -384,7 +382,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -425,7 +422,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -467,7 +463,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -508,7 +503,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -543,7 +537,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -578,7 +571,6 @@ Windows true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -620,7 +612,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -661,7 +652,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -703,7 +693,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) @@ -744,7 +733,6 @@ true true true - false true /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) Index: mptrack/TrackerSettings.cpp =================================================================== --- mptrack/TrackerSettings.cpp (revision 13976) +++ mptrack/TrackerSettings.cpp (working copy) @@ -307,7 +307,6 @@ , mruListLength(conf, U_("Misc"), U_("MRUListLength"), 10) // Plugins , bridgeAllPlugins(conf, U_("VST Plugins"), U_("BridgeAllPlugins"), false) - , FullyUnloadPlugins(conf, U_("VST Plugins"), U_("FullyUnloadPlugins"), true) , enableAutoSuspend(conf, U_("VST Plugins"), U_("EnableAutoSuspend"), false) , midiMappingInPluginEditor(conf, U_("VST Plugins"), U_("EnableMidiMappingInEditor"), true) , pluginProjectPath(conf, U_("VST Plugins"), U_("ProjectPath"), mpt::ustring()) @@ -314,6 +313,8 @@ , vstHostProductString(conf, U_("VST Plugins"), U_("HostProductString"), "OpenMPT") , vstHostVendorString(conf, U_("VST Plugins"), U_("HostVendorString"), "OpenMPT project") , vstHostVendorVersion(conf, U_("VST Plugins"), U_("HostVendorVersion"), Version::Current().GetRawVersion()) + // BrokenPlugsinWorkarounds + , BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin(conf, U_("BrokenPluginsWorkarounds"), U_("VSTNeverUnloadAnyPlugin"), false) // Update , UpdateEnabled(conf, U_("Update"), U_("Enabled"), true) , UpdateInstallAutomatically(conf, U_("Update"), U_("InstallAutomatically"), false) @@ -470,6 +471,11 @@ { vstHostVendorVersion = Version::Current().GetRawVersion(); } + if(storedVersion < MPT_V("1.30.00.02")) + { + BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin = !conf.Read(U_("VST Plugins"), U_("FullyUnloadPlugins"), true); + conf.Remove(U_("VST Plugins"), U_("FullyUnloadPlugins")); + } // Sound Settings if(storedVersion < MPT_V("1.22.07.30")) Index: mptrack/TrackerSettings.h =================================================================== --- mptrack/TrackerSettings.h (revision 13976) +++ mptrack/TrackerSettings.h (working copy) @@ -842,7 +842,6 @@ // Plugins Setting bridgeAllPlugins; - Setting FullyUnloadPlugins; Setting enableAutoSuspend; CachedSetting midiMappingInPluginEditor; Setting pluginProjectPath; @@ -850,6 +849,10 @@ CachedSetting vstHostVendorString; CachedSetting vstHostVendorVersion; + // BrokenPluingsWokrarounds + + Setting BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin; + // Update Setting UpdateEnabled; Index: mptrack/Vstplug.cpp =================================================================== --- mptrack/Vstplug.cpp (revision 13976) +++ mptrack/Vstplug.cpp (working copy) @@ -958,11 +958,16 @@ m_isInitialized = false; Dispatch(effClose, 0, 0, nullptr, 0); - // Buggy SynthEdit 1.4 plugins: Showing a SynthEdit 1.4 plugin's editor, fully unloading the plugin, - // then loading another (unrelated) SynthEdit 1.4 plugin and showing its editor causes a crash. - if(m_hLibrary && TrackerSettings::Instance().FullyUnloadPlugins) + if(TrackerSettings::Instance().BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin) { - FreeLibrary(m_hLibrary); + // Buggy SynthEdit 1.4 plugins: Showing a SynthEdit 1.4 plugin's editor, fully unloading the plugin, + // then loading another (unrelated) SynthEdit 1.4 plugin and showing its editor causes a crash. + } else + { + if(m_hLibrary) + { + FreeLibrary(m_hLibrary); + } } }