Merge PT upstream #9

.github/actions/spell-check/expect.txt

@@ -26,7 +26,6 @@ AFFINETRANSFORM
 affordances
 AFX
 AGGREGATABLE
-ahk
 AHybrid
 akv
 ALarger
@@ -1049,6 +1048,7 @@ NNN
 NOACTIVATE
 NOAGGREGATION
 NOASYNC
+NOCHANGEDIR
 NOCLIP
 NOCLOSEPROCESS
 NOCOALESCE

.pipelines/v2/templates/job-build-project.yml

@@ -205,13 +205,6 @@ jobs:
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml
 
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
-    displayName: Work around DD-1541167 (VCToolsVersion)
-    ${{ if eq(parameters.useVSPreview, true) }}:
-      env:
-        VCWhereExtraVersionTarget: '-prerelease'
-
   - pwsh: |-
       & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
     displayName: Download and install WiX 3.14 development build

src/common/ManagedTelemetry/Telemetry/DataDiagnosticsSettings.cs

@@ -20,16 +20,16 @@ public static bool GetEnabledValue()
             try
             {
                 registryValue = Registry.GetValue(DataDiagnosticsRegistryKey, DataDiagnosticsRegistryValueName, 0);
+
+                if (registryValue is not null)
+                {
+                    return (int)registryValue == 1 ? true : false;
+                }
             }
             catch
             {
             }
 
-            if (registryValue is not null)
-            {
-                return (int)registryValue == 1 ? true : false;
-            }
-
             return false;
         }
 

src/common/SettingsAPI/settings_helpers.cpp

@@ -174,9 +174,8 @@ namespace PTSettingsHelper
             return;
         }
 
-        const bool value = enabled;
-        const size_t buf_size = sizeof(bool);
-        if (RegSetValueExW(key, DataDiagnosticsRegValueName, 0, REG_QWORD, reinterpret_cast<const BYTE*>(&value), buf_size) != ERROR_SUCCESS)
+        const DWORD value = enabled ? 1 : 0;
+        if (RegSetValueExW(key, DataDiagnosticsRegValueName, 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value)) != ERROR_SUCCESS)
         {
             RegCloseKey(key);
             return;

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -65,6 +65,7 @@ namespace
 class AdvancedPaste : public PowertoyModuleIface
 {
 private:
+
     AdvancedPasteProcessManager m_process_manager;
     bool m_enabled = false;
 

src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs

@@ -262,6 +262,10 @@ private static void SendClipboardDataUsingTCP(byte[] bytes, bool image)
 
             new Task(() =>
             {
+                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                 System.Threading.Thread thread = Thread.CurrentThread;
                 thread.Name = $"{nameof(SendClipboardDataUsingTCP)}.{thread.ManagedThreadId}";
                 Thread.UpdateThreads(thread);
@@ -386,6 +390,10 @@ internal static void GetRemoteClipboard(string postAction)
 
                 new Task(() =>
                 {
+                    // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                    // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                    using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                     System.Threading.Thread thread = Thread.CurrentThread;
                     thread.Name = $"{nameof(ConnectAndGetData)}.{thread.ManagedThreadId}";
                     Thread.UpdateThreads(thread);

src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs

@@ -72,6 +72,10 @@ private static void WatchDogThread()
 
         private static void HelperThread()
         {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = System.Threading.ExecutionContext.SuppressFlow();
+
             try
             {
                 while (true)

src/modules/MouseWithoutBorders/App/Class/Program.cs

@@ -379,6 +379,10 @@ internal static void StartInputCallbackThread()
 
         private static void InputCallbackThread()
         {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
             Common.InputCallbackThreadID = Thread.CurrentThread.ManagedThreadId;
             while (!Common.InitDone)
             {

src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs

@@ -681,6 +681,10 @@ internal int TcpSend(TcpSk tcp, DATA data)
 
         private void TCPServerThread(object param)
         {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
             try
             {
                 TcpListener server = param as TcpListener;
@@ -768,6 +772,10 @@ private void StartNewTcpServer(TcpSk tcp, string machineName)
         {
             void ServerThread()
             {
+                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                 try
                 {
                     // Receiving packages
@@ -876,6 +884,10 @@ internal void StartNewTcpClient(string machineName)
         {
             void ClientThread(object obj)
             {
+                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                 IPHostEntry host;
                 bool useName2IP = false;
                 List<IPAddress> validAddresses = new();
@@ -1117,6 +1129,10 @@ private void StartNewTcpClientThread(string machineName, IPAddress ip)
         {
             void NewTcpClient()
             {
+                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                 TcpClient tcpClient = null;
 
                 try
@@ -1549,6 +1565,10 @@ private void MainTCPRoutine(TcpSk tcp, string machineName, bool isClient)
 
         private static void AcceptConnectionAndSendClipboardData(object param)
         {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
             TcpListener server = param as TcpListener;
 
             do
@@ -1590,6 +1610,10 @@ private static void AcceptConnectionAndSendClipboardData(object param)
                     {
                         new Task(() =>
                         {
+                            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                            using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
                             System.Threading.Thread thread = Thread.CurrentThread;
                             thread.Name = $"{nameof(SendOrReceiveClipboardData)}.{thread.ManagedThreadId}";
                             Thread.UpdateThreads(thread);

src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h

@@ -343,6 +343,21 @@ namespace newplus::utilities
         }
     }
 
+    inline void update_last_write_time(const std::filesystem::path path)
+    {
+        const std::filesystem::file_time_type now = std::filesystem::file_time_type::clock::now();
+
+        std::filesystem::last_write_time(path, now);
+
+        if (std::filesystem::is_directory(path))
+        {
+            for (const auto& entry : std::filesystem::recursive_directory_iterator(path))
+            {
+                std::filesystem::last_write_time(entry.path(), now);
+            }
+        }
+    }
+
     inline HRESULT copy_template(const template_item* template_entry, const ComPtr<IUnknown> site_of_folder)
     {
         HRESULT hr = S_OK;
@@ -376,6 +391,9 @@ namespace newplus::utilities
             // Copy file and determine final filename
             std::filesystem::path target_final_fullpath = template_entry->copy_object_to(GetActiveWindow(), target_fullpath);
 
+            // Touch all files and set last modified to "now"
+            update_last_write_time(target_final_fullpath);
+
             // Consider copy completed. If we do tracing after enter_rename_mode, then rename mode won't consistently work
             trace.UpdateState(true);
             Trace::EventCopyTemplate(target_final_fullpath.extension().c_str());

src/modules/ZoomIt/ZoomIt/Zoomit.cpp

@@ -6023,6 +6023,12 @@ LRESULT APIENTRY MainWndProc(
         // Apply tray icon setting
         EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
 
+        // This is also called by ZoomIt when it starts and loads the Settings. Opacity is added after loading from registry, so we use the same pattern.
+        if ((g_PenColor >> 24) == 0)
+        {
+            g_PenColor |= 0xFF << 24;
+        }
+
         // Apply hotkey settings
         UnregisterAllHotkeys(hWnd);
         g_ToggleMod = GetKeyMod(g_ToggleKey);
@@ -7416,19 +7422,19 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
     if( !ShowEula( APPNAME, NULL, NULL )) return 1;
 
 #ifdef __ZOOMIT_POWERTOYS__
+    if (powertoys_gpo::getConfiguredZoomItEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        Logger::warn(L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
+        return 1;
+    }
+
     Shared::Trace::ETWTrace* trace = nullptr;
     std::wstring pid = std::wstring(lpCmdLine); // The PowerToys pid is the argument to the process.
     auto mainThreadId = GetCurrentThreadId();
     if (!pid.empty())
     {
         g_StartedByPowerToys = TRUE;
 
-        if (powertoys_gpo::getConfiguredZoomItEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
-        {
-            Logger::warn(L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
-            return 1;
-        }
-
         trace = new Shared::Trace::ETWTrace();
         Trace::RegisterProvider();
         trace->UpdateState(true);

src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp

@@ -105,9 +105,12 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                     }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
-                        // PowerToys settings likes colors as #FFFFFF strings.
+                        /* PowerToys settings likes colors as #FFFFFF strings.
+                        But currently these Settings are internal state for ZoomIt, not something that we really need to send Settings.
+                        Code is kept here as a reference if a future color Setting ends up being configured.
                         hstring s = winrt::to_hstring(std::format("#{:02x}{:02x}{:02x}", value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF));
                         _settings.add_property(curSetting->ValueName, s);
+                        */
                     }
                 }
                 break;
@@ -211,6 +214,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                     }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
+                        /* PowerToys settings likes colors as #FFFFFF strings.
+                        But currently these Settings are internal state for ZoomIt, not something that we really need to save from Settings.
+                        Code is kept here as a reference if a future color Setting ends up being configured.
                         auto possibleValue = valuesFromSettings.get_string_value(curSetting->ValueName);
                         if (possibleValue.has_value())
                         {
@@ -219,8 +225,8 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                             {
                                 *static_cast<PDWORD>(curSetting->Setting) = RGB(r, g, b);
                             }
-
                         }
+                        */
                     }
                 }
                 break;

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs

@@ -13,6 +13,7 @@
 using Microsoft.PowerToys.Run.Plugin.Calculator.Properties;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Wox.Plugin;
+using Wox.Plugin.Logger;
 
 namespace Microsoft.PowerToys.Run.Plugin.Calculator
 {
@@ -212,8 +213,18 @@ public void UpdateSettings(PowerLauncherPluginSettings settings)
                 var optionReplaceInput = settings.AdditionalOptions.FirstOrDefault(x => x.Key == ReplaceInput);
                 replaceInput = optionReplaceInput?.Value ?? replaceInput;
 
-                var optionTrigMode = settings.AdditionalOptions.FirstOrDefault(x => x.Key == TrigMode);
-                trigMode = (CalculateEngine.TrigMode)int.Parse(optionTrigMode.ComboBoxValue.ToString(CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
+                try
+                {
+                    var optionTrigMode = settings.AdditionalOptions.FirstOrDefault(x => x.Key == TrigMode);
+                    if (optionTrigMode != null)
+                    {
+                        trigMode = (CalculateEngine.TrigMode)int.Parse(optionTrigMode.ComboBoxValue.ToString(CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log.Exception("Error while trying to load Trigonometry Mode setting: {ex.Message}", ex, GetType());
+                }
             }
 
             _inputUseEnglishFormat = inputUseEnglishFormat;