Skip to content

Windows: Enable Segment Heap + Unify resource file #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjee21 wants to merge 3 commits into
base: master
Choose a base branch
from
+67 −35
Open

Windows: Enable Segment Heap + Unify resource file #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a58c5fa
Windows CLI: Enable Segment Heap
cjee21 May 13, 2026
0c02618
Windows CLI: Unify resource file
cjee21 May 13, 2026
5ba038a
Qt GUI: Enable Segment Heap
cjee21 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Project/CMake/CLI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ set(CLI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/CommandLine_Parser.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/Help.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Common/Core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../MSVC2022/CLI/MediaInfo_CLI.rc
${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/MediaInfo_CLI.rc
${CMAKE_CURRENT_SOURCE_DIR}/segmentheap.manifest
)

add_executable(mediainfo_cli ${CLI_SOURCES})
Expand Down
7 changes: 7 additions & 0 deletions Project/CMake/CLI/segmentheap.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">
<heapType>SegmentHeap</heapType>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>
26 changes: 25 additions & 1 deletion Project/MSVC2022/CLI/MediaInfo-CLI.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
Expand All @@ -152,6 +155,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -167,6 +173,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
Expand All @@ -182,6 +191,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -202,6 +214,9 @@
<Profile>true</Profile>
<CETCompat>true</CETCompat>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
Expand All @@ -220,6 +235,9 @@
<GenerateDebugInformation>No</GenerateDebugInformation>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand All @@ -240,6 +258,9 @@
<Profile>true</Profile>
<CETCompat>true</CETCompat>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
Expand All @@ -259,6 +280,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
Expand All @@ -276,7 +300,7 @@
<ClInclude Include="..\..\..\Source\Common\Utils.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="MediaInfo_CLI.rc" />
<ResourceCompile Include="..\..\..\Source\CLI\MediaInfo_CLI.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2022\Library\MediaInfoLib.vcxproj">
Expand Down
26 changes: 25 additions & 1 deletion Project/MSVC2026/CLI/MediaInfo-CLI.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
Expand All @@ -152,6 +155,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -167,6 +173,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
Expand All @@ -182,6 +191,9 @@
<SubSystem>Console</SubSystem>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -202,6 +214,9 @@
<Profile>true</Profile>
<CETCompat>true</CETCompat>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
Expand All @@ -220,6 +235,9 @@
<GenerateDebugInformation>No</GenerateDebugInformation>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand All @@ -240,6 +258,9 @@
<Profile>true</Profile>
<CETCompat>true</CETCompat>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
Expand All @@ -259,6 +280,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<Profile>true</Profile>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
Expand All @@ -276,7 +300,7 @@
<ClInclude Include="..\..\..\Source\Common\Utils.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="MediaInfo_CLI.rc" />
<ResourceCompile Include="..\..\..\Source\CLI\MediaInfo_CLI.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2026\Library\MediaInfoLib.vcxproj">
Expand Down
32 changes: 0 additions & 32 deletions Project/MSVC2026/CLI/MediaInfo_CLI.rc
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Project/QMake/GUI/MediaInfoQt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ unix {
win32 {
QMAKE_CXXFLAGS += /MP /guard:cf
QMAKE_LFLAGS += /guard:cf /CETCOMPAT
QMAKE_LFLAGS += /MANIFESTINPUT:$$_PRO_FILE_PWD_\segmentheap.manifest

contains(UWP, yes|1) {

Expand Down
7 changes: 7 additions & 0 deletions Project/QMake/GUI/segmentheap.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">
<heapType>SegmentHeap</heapType>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>
0 Project/MSVC2022/CLI/MediaInfo_CLI.rc → Source/CLI/MediaInfo_CLI.rc
View file
Open in desktop
File renamed without changes.
Loading