From bc69cd951cbb06de735be160a273a981b77a03bf Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 7 May 2026 19:02:21 -0700 Subject: [PATCH 1/2] May 2026 --- .nuget/directxtk12_desktop_win10.nuspec | 2 +- .nuget/directxtk12_uwp.nuspec | 2 +- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- README.md | 2 +- build/CompilerAndLinker.cmake | 4 ++-- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.nuget/directxtk12_desktop_win10.nuspec b/.nuget/directxtk12_desktop_win10.nuspec index 175e7cf7..35c509c0 100644 --- a/.nuget/directxtk12_desktop_win10.nuspec +++ b/.nuget/directxtk12_desktop_win10.nuspec @@ -34,7 +34,7 @@ SpriteBatch - simple & efficient 2D sprite rendering SpriteFont - bitmap based text rendering VertexTypes - structures for commonly used vertex data formats WICTextureLoader - WIC-based image file texture loader - Matches the March 31, 2026 release on GitHub. + Matches the May 7, 2026 release on GitHub. DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Windows 10 or later. http://go.microsoft.com/fwlink/?LinkID=615561 diff --git a/.nuget/directxtk12_uwp.nuspec b/.nuget/directxtk12_uwp.nuspec index 85b0a8a7..2bacd46c 100644 --- a/.nuget/directxtk12_uwp.nuspec +++ b/.nuget/directxtk12_uwp.nuspec @@ -34,7 +34,7 @@ SpriteBatch - simple & efficient 2D sprite rendering SpriteFont - bitmap based text rendering VertexTypes - structures for commonly used vertex data formats WICTextureLoader - WIC-based image file texture loader - Matches the March 31, 2026 release on GitHub. + Matches the May 7, 2026 release on GitHub. http://go.microsoft.com/fwlink/?LinkID=615561 images\icon.jpg diff --git a/CHANGELOG.md b/CHANGELOG.md index a966b213..906ae47c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT ## Release History +### May 7, 2026 +* SpriteFont file loader updated to fix a potential overflow issue in 32-bit (x86) builds +* XWB reader updated to resolve a potential overflow issue when reading a malformed wavebank file +* CMake project updates +* Minor comments cleanup + ### March 31, 2026 * Added SpriteFont **SetPixelAlignment** method for opt-in pixel snapping support * Updated D3DX12 internal copy with latest changes from DirectX-Headers GitHub diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e62f409..122a66f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if(POLICY CMP0162) cmake_policy(SET CMP0162 NEW) endif() -set(DIRECTXTK12_VERSION 1.6.5) +set(DIRECTXTK12_VERSION 1.6.6) if(XBOX_CONSOLE_TARGET STREQUAL "durango") set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") diff --git a/README.md b/README.md index 1ce0983a..0b05ce7f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=615561 Copyright (c) Microsoft Corporation. -## March 31, 2026 +## May 7, 2026 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 12 C++ code for Win32 desktop applications for Windows 11 and Windows 10, game titles for Xbox Series X\|S and Xbox One, and Universal Windows Platform (UWP) apps for Windows 11 and Windows 10. diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake index b096663a..9e69cd83 100644 --- a/build/CompilerAndLinker.cmake +++ b/build/CompilerAndLinker.cmake @@ -67,7 +67,7 @@ endif() #--- General MSVC-like SDL options if(MSVC) - list(APPEND COMPILER_SWITCHES "$<$>:/guard:cf>") + list(APPEND COMPILER_SWITCHES /Gd /GS /Zc:forScope /Zc:inline /Zc:wchar_t $<$>:/guard:cf>) list(APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO) if(WINDOWS_STORE) @@ -130,7 +130,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel") list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161) elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - list(APPEND COMPILER_SWITCHES /sdl /Zc:forScope /Zc:inline /Zc:wchar_t /fp:fast) + list(APPEND COMPILER_SWITCHES /sdl /fp:fast) if(WINDOWS_STORE) list(APPEND COMPILER_SWITCHES /await) From 72d3fbff9d5e607bb61cf20de81f69dce296dca4 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 7 May 2026 22:31:00 -0700 Subject: [PATCH 2/2] Minor code review feedback --- Src/DDS.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/DDS.h b/Src/DDS.h index c668beba..f5375df5 100644 --- a/Src/DDS.h +++ b/Src/DDS.h @@ -11,7 +11,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. // -// http://go.microsoft.com/fwlink/?LinkId=248926 +// https://go.microsoft.com/fwlink/?LinkId=248926 // https://go.microsoft.com/fwlink/?LinkId=248929 // https://go.microsoft.com/fwlink/?LinkID=615561 //--------------------------------------------------------------------------------------