Tera TermRevision: 10707
https://osdn.net/projects/ttssh2/scm/svn/commits/10707
Author: zmatsuo
Date: 2023-05-15 00:37:41 +0900 (Mon, 15 May 2023)
Log Message:
-----------
ttpmenu でcomCtl32.dll バージョン 6 を使用するようにした
- ダイアログのボタンなど表示されるGUIパーツが新しいものになる
- マニフェストを追加
- マニフェスト自動生成をdisable
Modified Paths:
--------------
trunk/ttpmenu/CMakeLists.txt
trunk/ttpmenu/ttpmenu.rc
trunk/ttpmenu/ttpmenu.v16.vcxproj
trunk/ttpmenu/ttpmenu.v17.vcxproj
Added Paths:
-----------
trunk/ttpmenu/ttpmenu.manifest
-------------- next part --------------
Modified: trunk/ttpmenu/CMakeLists.txt
===================================================================
--- trunk/ttpmenu/CMakeLists.txt 2023-05-14 15:37:30 UTC (rev 10706)
+++ trunk/ttpmenu/CMakeLists.txt 2023-05-14 15:37:41 UTC (rev 10707)
@@ -66,6 +66,11 @@
.
)
+target_link_options(
+ ${PACKAGE_NAME}
+ PRIVATE
+ /MANIFEST:NO
+)
target_link_libraries(
${PACKAGE_NAME}
Added: trunk/ttpmenu/ttpmenu.manifest
===================================================================
--- trunk/ttpmenu/ttpmenu.manifest (rev 0)
+++ trunk/ttpmenu/ttpmenu.manifest 2023-05-14 15:37:41 UTC (rev 10707)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0"
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <description></description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ <!--assemblyIdentity
+ type="win32"
+ name=SXS_ASSEMBLY_NAME
+ version=SXS_ASSEMBLY_VERSION
+ processorArchitecture=SXS_PROCESSOR_ARCHITECTURE
+ /-->
+ </dependentAssembly>
+ </dependency>
+ <!--trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo-->
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- Windows Vista and Windows Server 2008 -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+
+ <!-- Windows 7 and Windows Server 2008 R2 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+
+ <!-- Windows 8 and Windows Server 2012 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+
+ <!-- Windows 8.1 and Windows Server 2012 R2 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
+</assembly>
Modified: trunk/ttpmenu/ttpmenu.rc
===================================================================
--- trunk/ttpmenu/ttpmenu.rc 2023-05-14 15:37:30 UTC (rev 10706)
+++ trunk/ttpmenu/ttpmenu.rc 2023-05-14 15:37:41 UTC (rev 10707)
@@ -239,6 +239,7 @@
#endif // \x89p\x8C\xEA (\x95č\x91) resources
/////////////////////////////////////////////////////////////////////////////
+1 RT_MANIFEST ttpmenu.manifest
#ifndef APSTUDIO_INVOKED
Modified: trunk/ttpmenu/ttpmenu.v16.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v16.vcxproj 2023-05-14 15:37:30 UTC (rev 10706)
+++ trunk/ttpmenu/ttpmenu.v16.vcxproj 2023-05-14 15:37:41 UTC (rev 10707)
@@ -44,11 +44,13 @@
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
Modified: trunk/ttpmenu/ttpmenu.v17.vcxproj
===================================================================
--- trunk/ttpmenu/ttpmenu.v17.vcxproj 2023-05-14 15:37:30 UTC (rev 10706)
+++ trunk/ttpmenu/ttpmenu.v17.vcxproj 2023-05-14 15:37:41 UTC (rev 10707)
@@ -44,11 +44,13 @@
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>