Merge remote-tracking branch 'upstream/master'

larryli · Mar 27, 2024 · e2ccb06 · e2ccb06
2 parents 9d674c3 + 5d572c5
commit e2ccb06
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ build.ninja
 /CMakeCache.txt
 CMakeFiles/
 Debug/
+Release/
 Win32/
 cmake_install.cmake
 /shipped.txt
@@ -68,6 +69,7 @@ cmake_install.cmake
 /*.cnt
 /*.hlp
 /.bmake
+/build
 /build.log
 /build.out
 /empty.h

diff --git a/utils/buildinfo.c b/utils/buildinfo.c
@@ -44,6 +44,8 @@ char *buildinfo(const char *newline)
      * cases, two different compiler versions have the same _MSC_VER
      * value, and have to be distinguished by _MSC_FULL_VER.
      */
+#elif _MSC_VER == 1939
+    put_fmt(buf, " 2022 (17.9)");
 #elif _MSC_VER == 1938
     put_fmt(buf, " 2022 (17.8)");
 #elif _MSC_VER == 1937

diff --git a/windows/pageant.mft b/windows/pageant.mft
@@ -23,17 +23,11 @@
    </dependency>
    <!-- Declare us to be "DPI-aware". -->
    <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
        <dpiAware>true</dpiAware>
-       <dpiAwareness
-           xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-         PerMonitorV2
-       </dpiAwareness>
-     </asmv3:windowsSettings>
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"> 
-       <activeCodePage>zh-CN</activeCodePage> 
+       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+       <!-- CP936 -->
+       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">zh-CN</activeCodePage>
      </asmv3:windowsSettings>
    </asmv3:application>
 </assembly>
diff --git a/windows/putty.mft b/windows/putty.mft
@@ -23,17 +23,11 @@
    </dependency>
    <!-- Declare us to be "DPI-aware". -->
    <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
        <dpiAware>true</dpiAware>
-       <dpiAwareness
-           xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-         PerMonitorV2
-       </dpiAwareness>
-     </asmv3:windowsSettings>
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"> 
-       <activeCodePage>zh-CN</activeCodePage> 
+       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+       <!-- CP936 -->
+       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">zh-CN</activeCodePage>
      </asmv3:windowsSettings>
    </asmv3:application>
 </assembly>
diff --git a/windows/puttygen.mft b/windows/puttygen.mft
@@ -23,17 +23,11 @@
    </dependency>
    <!-- Declare us to be "DPI-aware". -->
    <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
        <dpiAware>true</dpiAware>
-       <dpiAwareness
-           xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-         PerMonitorV2
-       </dpiAwareness>
-     </asmv3:windowsSettings>
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"> 
-       <activeCodePage>zh-CN</activeCodePage> 
+       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+       <!-- CP936 -->
+       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">zh-CN</activeCodePage>
      </asmv3:windowsSettings>
    </asmv3:application>
 </assembly>
diff --git a/windows/puttytel.mft b/windows/puttytel.mft
@@ -23,17 +23,11 @@
    </dependency>
    <!-- Declare us to be "DPI-aware". -->
    <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
        <dpiAware>true</dpiAware>
-       <dpiAwareness
-           xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
-         PerMonitorV2
-       </dpiAwareness>
-     </asmv3:windowsSettings>
-     <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"> 
-       <activeCodePage>zh-CN</activeCodePage> 
+       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+       <!-- CP936 -->
+       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">zh-CN</activeCodePage>
      </asmv3:windowsSettings>
    </asmv3:application>
 </assembly>