0001113: Avoid delay-loading of libraries that we ship - OpenMPT Issue Tracker

ID	Project	Category	View Status	Date Submitted	Last Update

0001113	OpenMPT	General	public	2018-04-11 06:59	2019-11-04 08:50

Reporter	manx	Assigned To	manx
Priority	normal	Severity	major	Reproducibility	have not tried
Status	resolved	Resolution	fixed
Target Version	OpenMPT 1.29.01.00 / libopenmpt 0.5.0 (upgrade first)	Fixed in Version	OpenMPT 1.29.00.* (old testing)

Summary	0001113: Avoid delay-loading of libraries that we ship
Description	OpenMPT currently delay-loads soundtouch, lame and mpg123. This has the advantage of allowing to start mptrack.exe even without them being available. However, in my opinion the disadvantages far outweigh the advantages: We need to handle errors when soundtouch is not available, requiring code that would otherwise be completely unnecessary because it would be simply impossible to start OpenMPT without soundtouch. This incurs also GUI elements that need to notify the user and explain the problem. It reduces functionality without the user being necessarily aware of the fact that starting mptrack.exe without soundtouch in fact does not implement the complete advertised functionality. Not knowing which MP3 decoder will be used complicates code and introduces inconsistencies when loading MP3s. mpg123 is by far the most flexible MP3 decoder library which allows for the most fine-grained control with regard to loading weird or corrupt MP3 files. Using external MP3 samples can thus change behaviour significantly depending on whether mpg123 is available or not (in which case we fall back to MediaFoundation).
Tags	No tags attached.
Attached Files	delayimp-v3.patch (100,146 bytes) Index: build/premake/mpt-OpenMPT.lua =================================================================== --- build/premake/mpt-OpenMPT.lua (revision 11462) +++ build/premake/mpt-OpenMPT.lua (working copy) @@ -159,23 +159,7 @@ "soundtouch", "vorbis", } - filter { "configurations:Shared" } - filter { "not configurations:Shared" } - linkoptions { - "/DELAYLOAD:openmpt-lame.dll", - "/DELAYLOAD:openmpt-mpg123.dll", - "/DELAYLOAD:openmpt-soundtouch.dll", - } filter {} - if not _OPTIONS["xp"] then - linkoptions { - "/DELAYLOAD:mf.dll", - "/DELAYLOAD:mfplat.dll", - "/DELAYLOAD:mfreadwrite.dll", --- "/DELAYLOAD:mfuuid.dll", -- static library - "/DELAYLOAD:propsys.dll", - } - end filter { "action:vs" } files { "../../build/vs/debug/openmpt.natvis", Index: build/vs2015win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2015win7/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT-ANSI.vcxproj (working copy) @@ -290,7 +290,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -321,7 +320,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -361,7 +359,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -400,7 +397,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -440,7 +436,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -479,7 +474,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -512,7 +506,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -545,7 +538,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -585,7 +577,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -624,7 +615,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +654,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -703,7 +692,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2015win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2015win7/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT-UTF8.vcxproj (working copy) @@ -290,7 +290,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -321,7 +320,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -361,7 +359,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -400,7 +397,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -440,7 +436,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -479,7 +474,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -512,7 +506,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -545,7 +538,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -585,7 +577,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -624,7 +615,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +654,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -703,7 +692,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2015win7/OpenMPT.vcxproj =================================================================== --- build/vs2015win7/OpenMPT.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT.vcxproj (working copy) @@ -290,7 +290,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -321,7 +320,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -361,7 +359,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -400,7 +397,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -440,7 +436,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -479,7 +474,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -512,7 +506,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -545,7 +538,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -585,7 +577,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -624,7 +615,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +654,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -703,7 +692,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2015winxp/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT-ANSI.vcxproj (working copy) @@ -292,7 +292,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -324,7 +323,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -365,7 +363,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -405,7 +402,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -446,7 +442,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -486,7 +481,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2015winxp/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT-UTF8.vcxproj (working copy) @@ -292,7 +292,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -324,7 +323,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -365,7 +363,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -405,7 +402,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -446,7 +442,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -486,7 +481,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2015winxp/OpenMPT.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT.vcxproj (working copy) @@ -292,7 +292,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -324,7 +323,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -365,7 +363,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -405,7 +402,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -446,7 +442,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -486,7 +481,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win10/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT-ANSI.vcxproj (working copy) @@ -562,7 +562,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -596,7 +595,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -630,7 +628,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +661,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -706,7 +702,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -747,7 +742,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -788,7 +782,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -829,7 +822,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -871,7 +863,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -912,7 +903,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -953,7 +943,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -994,7 +983,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1029,7 +1017,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1064,7 +1051,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1099,7 +1085,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1134,7 +1119,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1176,7 +1160,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1217,7 +1200,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1258,7 +1240,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1299,7 +1280,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1341,7 +1321,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1382,7 +1361,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1423,7 +1401,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1464,7 +1441,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win10/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT-UTF8.vcxproj (working copy) @@ -562,7 +562,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -596,7 +595,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -630,7 +628,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +661,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -706,7 +702,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -747,7 +742,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -788,7 +782,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -829,7 +822,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -871,7 +863,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -912,7 +903,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -953,7 +943,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -994,7 +983,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1029,7 +1017,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1064,7 +1051,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1099,7 +1085,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1134,7 +1119,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1176,7 +1160,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1217,7 +1200,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1258,7 +1240,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1299,7 +1280,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1341,7 +1321,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1382,7 +1361,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1423,7 +1401,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1464,7 +1441,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win10/OpenMPT.vcxproj =================================================================== --- build/vs2017win10/OpenMPT.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT.vcxproj (working copy) @@ -562,7 +562,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -596,7 +595,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -630,7 +628,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -664,7 +661,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -706,7 +702,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -747,7 +742,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -788,7 +782,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -829,7 +822,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -871,7 +863,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -912,7 +903,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -953,7 +943,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -994,7 +983,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1029,7 +1017,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1064,7 +1051,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1099,7 +1085,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1134,7 +1119,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1176,7 +1160,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1217,7 +1200,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1258,7 +1240,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1299,7 +1280,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1341,7 +1321,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1382,7 +1361,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1423,7 +1401,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -1464,7 +1441,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT-ANSI.vcxproj (working copy) @@ -293,7 +293,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -327,7 +326,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -369,7 +367,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -410,7 +407,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -452,7 +448,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -493,7 +488,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -528,7 +522,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -563,7 +556,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -605,7 +597,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -646,7 +637,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -688,7 +678,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -729,7 +718,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT-UTF8.vcxproj (working copy) @@ -293,7 +293,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -327,7 +326,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -369,7 +367,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -410,7 +407,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -452,7 +448,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -493,7 +488,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -528,7 +522,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -563,7 +556,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -605,7 +597,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -646,7 +637,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -688,7 +678,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -729,7 +718,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017win7/OpenMPT.vcxproj =================================================================== --- build/vs2017win7/OpenMPT.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT.vcxproj (working copy) @@ -293,7 +293,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -327,7 +326,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -369,7 +367,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -410,7 +407,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -452,7 +448,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -493,7 +488,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -528,7 +522,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -563,7 +556,6 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -605,7 +597,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -646,7 +637,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -688,7 +678,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -729,7 +718,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017winxp/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT-ANSI.vcxproj (working copy) @@ -294,7 +294,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -328,7 +327,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -370,7 +368,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -411,7 +408,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -453,7 +449,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -494,7 +489,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017winxp/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT-UTF8.vcxproj (working copy) @@ -294,7 +294,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -328,7 +327,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -370,7 +368,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -411,7 +408,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -453,7 +449,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -494,7 +489,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: build/vs2017winxp/OpenMPT.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT.vcxproj (working copy) @@ -294,7 +294,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -328,7 +327,6 @@ <FullProgramDatabaseFile>true</FullProgramDatabaseFile> <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -370,7 +368,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -411,7 +408,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -453,7 +449,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> @@ -494,7 +489,6 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LargeAddressAware>true</LargeAddressAware> - <AdditionalOptions>/DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>false</DataExecutionPrevention> </Link> <Manifest> Index: common/BuildSettings.h =================================================================== --- common/BuildSettings.h (revision 11462) +++ common/BuildSettings.h (working copy) @@ -503,14 +503,6 @@ #endif // arch #endif // ENABLE_ASM -#if defined(MPT_WITH_LAME) && defined(MPT_BUILD_MSVC) && defined(MPT_BUILD_MSVC_STATIC) && defined(MODPLUG_TRACKER) && !MPT_OS_WINDOWS_WINRT -#define MPT_ENABLE_LAME_DELAYLOAD -#endif - -#if defined(MPT_WITH_MPG123) && defined(MPT_BUILD_MSVC) && defined(MPT_BUILD_MSVC_STATIC) && defined(MODPLUG_TRACKER) && !MPT_OS_WINDOWS_WINRT -#define MPT_ENABLE_MPG123_DELAYLOAD -#endif - #if defined(ENABLE_TESTS) && defined(MODPLUG_NO_FILESAVE) #undef MODPLUG_NO_FILESAVE // tests recommend file saving #endif @@ -548,18 +540,6 @@ #define MPT_ENABLE_DYNBIND // Tracker requires dynamic library loading for export codecs #endif -#if defined(MPT_ENABLE_LAME_DELAYLOAD) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // static MSVC builds require dynbind to load delay-loaded DLLs -#endif - -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // static MSVC builds require dynbind to load delay-loaded DLLs -#endif - -#if defined(MPT_WITH_MEDIAFOUNDATION) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // MediaFoundation needs dynamic loading in order to test availability of delay loaded libs -#endif - #if (defined(MPT_WITH_MPG123) \|\| defined(MPT_WITH_MINIMP3)) && !defined(MPT_ENABLE_MP3_SAMPLES) #define MPT_ENABLE_MP3_SAMPLES #endif Index: mptrack/Ctrl_smp.cpp =================================================================== --- mptrack/Ctrl_smp.cpp (revision 11462) +++ mptrack/Ctrl_smp.cpp (working copy) @@ -35,7 +35,6 @@ #include "../soundbase/SampleFormatCopy.h" #include "FileDialog.h" #include "ProgressDialog.h" -#include "../common/ComponentManager.h" #include "../include/r8brain/CDSPResampler.h" #include "../soundlib/MixFuncTable.h" @@ -2109,37 +2108,6 @@ } -#ifdef MPT_BUILD_MSVC_SHARED - -class ComponentSoundTouch - : public ComponentBuiltin -{ - MPT_DECLARE_COMPONENT_MEMBERS -public: - ComponentSoundTouch() - : ComponentBuiltin() - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentSoundTouch, "") - -#else - -class ComponentSoundTouch - : public ComponentBundledDLL -{ - MPT_DECLARE_COMPONENT_MEMBERS -public: - ComponentSoundTouch() - : ComponentBundledDLL(P_("openmpt-soundtouch")) - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentSoundTouch, "") - -#endif - - enum TimeStretchPitchShiftResult { kUnknown, @@ -2198,19 +2166,10 @@ if(m_ratio < 0.5f) return kStretchTooShort; if(m_ratio > 2.0f) return kStretchTooLong; - // Check whether the DLL file exists. - ComponentHandle<ComponentSoundTouch> soundTouch; - if(!IsComponentAvailable(soundTouch)) - { - MsgBox(IDS_SOUNDTOUCH_LOADFAILURE); - return kAbort; - } - HANDLE handleSt = soundtouch_createInstance(); if(handleSt == NULL) { - MsgBox(IDS_SOUNDTOUCH_LOADFAILURE); - return kAbort; + MPT_EXCEPTION_THROW_OUT_OF_MEMORY(); } // Get number of channels & sample size Index: mptrack/mptrack.rc =================================================================== --- mptrack/mptrack.rc (revision 11462) +++ mptrack/mptrack.rc (working copy) @@ -2761,7 +2761,6 @@ STRINGTABLE BEGIN - IDS_SOUNDTOUCH_LOADFAILURE "Unable to load OpenMPT_soundtouch_f32.dll." IDS_ERR_FILEOPEN "Unable to open file." IDS_ERR_FILETYPE "Unsupported file type" IDS_ERR_SAVEINS "Unable to save instrument" Index: mptrack/MPTrackLink.cpp =================================================================== --- mptrack/MPTrackLink.cpp (revision 11462) +++ mptrack/MPTrackLink.cpp (working copy) @@ -16,7 +16,6 @@ #if defined(MPT_BUILD_MSVC) #if MPT_COMPILER_MSVC \|\| MPT_COMPILER_CLANG -#pragma comment(lib, "delayimp.lib") #pragma comment(lib, "version.lib") #pragma comment(lib, "rpcrt4.lib") #pragma comment(lib, "shlwapi.lib") Index: mptrack/resource.h =================================================================== --- mptrack/resource.h (revision 11462) +++ mptrack/resource.h (working copy) @@ -41,7 +41,6 @@ #define IDS_UNABLE_TO_LOAD_KEYBINDINGS 212 #define IDS_CANT_OPEN_FILE_FOR_WRITING 213 #define IDS_PATTERN_CLEANUP_UNAVAILABLE 215 -#define IDS_SOUNDTOUCH_LOADFAILURE 230 #define IDS_ERR_FILEOPEN 234 #define IDS_ERR_FILETYPE 235 #define IDS_ERR_SAVEINS 236 Index: mptrack/StreamEncoderMP3.cpp =================================================================== --- mptrack/StreamEncoderMP3.cpp (revision 11462) +++ mptrack/StreamEncoderMP3.cpp (working copy) @@ -13,8 +13,6 @@ #include "StreamEncoder.h" #include "StreamEncoderMP3.h" -#include "../common/ComponentManager.h" - #include "Mptrack.h" #include "../soundlib/Sndfile.h" @@ -350,42 +348,6 @@ typedef lame_global_flags lame_t; -class ComponentLame -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - : public ComponentBundledDLL -#else - : public ComponentBuiltin -#endif -{ - MPT_DECLARE_COMPONENT_MEMBERS - -public: - ComponentLame() -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - : ComponentBundledDLL(P_("openmpt-lame")) -#else - : ComponentBuiltin() -#endif - { - return; - } - bool DoInitialize() override - { -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - if(!ComponentBundledDLL::DoInitialize()) - { - return false; - } -#endif - return true; - } - virtual ~ComponentLame() - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentLame, "") - - static void GenreEnumCallback(int num, const char name, void cookie) { MPT_UNREFERENCED_PARAMETER(num); @@ -430,7 +392,6 @@ class MP3LameStreamWriter : public StreamWriterBase { private: - const ComponentLame &lame; bool compatible; Encoder::Mode Mode; bool gfp_inited; @@ -446,9 +407,8 @@ std::streamoff id3v2Size; FileTags Tags; public: - MP3LameStreamWriter(const ComponentLame &lame_, std::ostream &stream, bool compatible, const Encoder::Settings &settings, const FileTags &tags) + MP3LameStreamWriter(std::ostream &stream, bool compatible, const Encoder::Settings &settings, const FileTags &tags) : StreamWriterBase(stream) - , lame(lame_) , compatible(compatible) { Mode = Encoder::ModeInvalid; @@ -703,21 +663,15 @@ #ifdef MPT_WITH_LAME if(type == MP3EncoderLame) { - if(IsComponentAvailable(m_Lame)) - { - m_Type = MP3EncoderLame; - SetTraits(BuildTraits(false)); - return; - } + m_Type = MP3EncoderLame; + SetTraits(BuildTraits(false)); + return; } if(type == MP3EncoderLameCompatible) { - if(IsComponentAvailable(m_Lame)) - { - m_Type = MP3EncoderLameCompatible; - SetTraits(BuildTraits(true)); - return; - } + m_Type = MP3EncoderLameCompatible; + SetTraits(BuildTraits(true)); + return; } #endif // MPT_WITH_LAME } @@ -727,8 +681,8 @@ { return false #ifdef MPT_WITH_LAME - \|\| ((m_Type == MP3EncoderLame) && IsComponentAvailable(m_Lame)) - \|\| ((m_Type == MP3EncoderLameCompatible) && IsComponentAvailable(m_Lame)) + \|\| (m_Type == MP3EncoderLame) + \|\| (m_Type == MP3EncoderLameCompatible) #endif // MPT_WITH_LAME ; } @@ -743,7 +697,7 @@ #ifdef MPT_WITH_LAME } else if(m_Type == MP3EncoderLame \|\| m_Type == MP3EncoderLameCompatible) { - result = std::make_unique<MP3LameStreamWriter>(*m_Lame, file, (m_Type == MP3EncoderLameCompatible), settings, tags); + result = std::make_unique<MP3LameStreamWriter>(file, (m_Type == MP3EncoderLameCompatible), settings, tags); #endif // MPT_WITH_LAME } return result; Index: mptrack/StreamEncoderMP3.h =================================================================== --- mptrack/StreamEncoderMP3.h (revision 11462) +++ mptrack/StreamEncoderMP3.h (working copy) @@ -14,8 +14,6 @@ #include "StreamEncoder.h" -#include "../common/ComponentManager.h" - OPENMPT_NAMESPACE_BEGIN @@ -34,10 +32,6 @@ private: -#ifdef MPT_WITH_LAME - ComponentHandle<ComponentLame> m_Lame; -#endif - MP3EncoderType m_Type; public: Index: soundlib/SampleFormatMediaFoundation.cpp =================================================================== --- soundlib/SampleFormatMediaFoundation.cpp (revision 11462) +++ soundlib/SampleFormatMediaFoundation.cpp (working copy) @@ -136,12 +136,11 @@ } -class ComponentMediaFoundation : public ComponentLibrary +class ComponentMediaFoundation : public ComponentBuiltin { MPT_DECLARE_COMPONENT_MEMBERS public: ComponentMediaFoundation() - : ComponentLibrary(ComponentTypeSystem) { return; } @@ -151,17 +150,6 @@ { return false; } -#if !MPT_OS_WINDOWS_WINRT - if(!(true - && AddLibrary("mf", mpt::LibraryPath::System(P_("mf"))) - && AddLibrary("mfplat", mpt::LibraryPath::System(P_("mfplat"))) - && AddLibrary("mfreadwrite", mpt::LibraryPath::System(P_("mfreadwrite"))) - && AddLibrary("propsys", mpt::LibraryPath::System(P_("propsys"))) - )) - { - return false; - } -#endif // !MPT_OS_WINDOWS_WINRT if(!SUCCEEDED(MFStartup(MF_VERSION))) { return false; Index: soundlib/SampleFormatMP3.cpp =================================================================== --- soundlib/SampleFormatMP3.cpp (revision 11462) +++ soundlib/SampleFormatMP3.cpp (working copy) @@ -56,11 +56,7 @@ typedef ssize_t mpg123_ssize_t; class ComponentMPG123 -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - : public ComponentBundledDLL -#else : public ComponentBuiltin -#endif { MPT_DECLARE_COMPONENT_MEMBERS @@ -90,22 +86,12 @@ public: ComponentMPG123() -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - : ComponentBundledDLL(P_("openmpt-mpg123")) -#else : ComponentBuiltin() -#endif { return; } bool DoInitialize() override { -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - if(!ComponentBundledDLL::DoInitialize()) - { - return false; - } -#endif if(mpg123_init() != 0) { return false; delayimp-v3.patch (100,146 bytes)

Has the bug occurred in previous versions?
Tested code revision (in case you know it)

manx 2018-04-11 07:13 administrator ~0003498	We should also consider avoiding delay-loading MediaFoundation. MediaFoundation is only enabled in modern OpenMPT builds which require Windows 7 which has MediaFoundation always available. All supported Wine versions at least implement a stub that properly exports all symbols and fails initialization, so we can detect that and continue. For Windows Server, MediaFoundation can be installed via a download from Microsoft. For the remote case of someone desiring to not have MediaFoundation installed for whatever reasons, they can always use the Win32old or Win64old builds. Not delay-loading MediaFoundation has the advantage of completely avoiding the dependency on delayimp.lib.

manx 2018-04-11 08:41 administrator ~0003499	Importance of having mpg123 non-optional increased in particular for OpenMPT with r10069 .

manx 2018-05-02 06:08 administrator ~0003514	Component blocking support for mpg123 and soundtouch is removed in r10194.

manx 2018-05-28 18:02 administrator ~0003537	Since r10317, this also affects Lame.

manx 2019-07-03 08:35 administrator ~0003968	We cannot avoid delay-loading MediaFoundation, because Windows 10 N actually comes without the DLLs by default.

manx 2019-07-03 08:48 administrator ~0003969	Implemented in r11694.

Date Modified	Username	Field	Change
2018-04-11 06:59	manx	New Issue
2018-04-11 07:13	manx	Note Added: 0003498
2018-04-11 08:41	manx	Note Added: 0003499
2018-04-15 16:49	manx	Relationship added	related to 0001097
2018-05-02 06:02	manx	Target Version	=> OpenMPT 1.?? (long term goals)
2018-05-02 06:08	manx	Note Added: 0003514
2018-05-28 18:02	manx	Note Added: 0003537
2018-05-28 18:02	manx	Description Updated
2018-05-28 18:03	manx	Relationship added	related to 0001095
2019-03-10 12:58	manx	Description Updated
2019-03-10 12:58	manx	Assigned To	=> manx
2019-03-10 12:58	manx	Status	new => acknowledged
2019-03-10 12:58	manx	Target Version	OpenMPT 1.?? (long term goals) => OpenMPT 1.29.01.00 / libopenmpt 0.5.0 (upgrade first)
2019-03-16 10:33	manx	File Added: delayimp-v3.patch
2019-07-03 08:35	manx	Note Added: 0003968
2019-07-03 08:48	manx	Status	acknowledged => resolved
2019-07-03 08:48	manx	Resolution	open => fixed
2019-07-03 08:48	manx	Fixed in Version	=> OpenMPT 1.29.00.* (old testing)
2019-07-03 08:48	manx	Note Added: 0003969