From 7b37eba0f9738c2e5b4ebc0b9128ffbed83e1ad8 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Thu, 11 Jul 2024 03:34:17 -0700
Subject: [PATCH] [PTRun]Don't apply title bar fix to Windows build 22000 to
 avoid crash (#33687)

---
 Directory.Build.props                                        | 2 +-
 src/common/Common.UI/OSVersionHelper.cs                      | 5 +++++
 .../launcher/PowerLauncher/ViewModel/MainViewModel.cs        | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index da2760b068..2226bab418 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -85,7 +85,7 @@
     <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
 
     <!-- Change this to bust the cache -->
-    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202406130737</MSBuildCacheCacheUniverse>
+    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202407100737</MSBuildCacheCacheUniverse>
 
     <!--
       Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
diff --git a/src/common/Common.UI/OSVersionHelper.cs b/src/common/Common.UI/OSVersionHelper.cs
index 8823ceaf85..aa2a2a953a 100644
--- a/src/common/Common.UI/OSVersionHelper.cs
+++ b/src/common/Common.UI/OSVersionHelper.cs
@@ -12,5 +12,10 @@ namespace Common.UI
         {
             return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;
         }
+
+        public static bool IsGreaterThanWindows11_21H2()
+        {
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build > 22000;
+        }
     }
 }
diff --git a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
index c717d16bc2..a912e54367 100644
--- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
+++ b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
@@ -1016,7 +1016,8 @@ namespace PowerLauncher.ViewModel
                 var window = Application.Current.MainWindow;
                 Wpf.Ui.Controls.WindowBackdrop.RemoveBackground(window);
 
-                if (OSVersionHelper.IsWindows11())
+                // Setting uint titlebarPvAttribute = 0xFFFFFFFE; works on 22H2 or higher, 21H2 (aka SV1) this value causes a crash
+                if (OSVersionHelper.IsGreaterThanWindows11_21H2())
                 {
                     // Taken from WPFUI's fix for the title bar issue. We should be able to remove this fix when WPF UI 4 is integrated.
                     // https://github.com/lepoco/wpfui/pull/1122/files#diff-196b404f4db09632665ef546da6c8e57302b2f3e3d082eb4b5c295ae3482d94a
@@ -1034,6 +1035,7 @@ namespace PowerLauncher.ViewModel
                         // NOTE: https://learn.microsoft.com/en-us/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
                         // Specifying DWMWA_COLOR_DEFAULT (value 0xFFFFFFFF) for the color will reset the window back to using the system's default behavior for the caption color.
                         uint titlebarPvAttribute = 0xFFFFFFFE;
+
                         _ = Wox.Plugin.Common.Win32.NativeMethods.DwmSetWindowAttribute(
                             windowSource.Handle,
                             (int)Wox.Plugin.Common.Win32.DwmWindowAttributes.CaptionColor, // CaptionColor attribute is only available on Windows 11.