Merge branch 'dev/ani/advanced-paste-semantic-kernel' into dev/ani/ad…

…vanced-paste-transcoding
microsoft · Nov 27, 2024 · 0aa7e4f · 0aa7e4f
2 parents 308fe14 + b6b503b
commit 0aa7e4f
Show file tree

Hide file tree

Showing 72 changed files with 2,977 additions and 1,077 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -102,6 +102,7 @@ backtracer
 bbwe
 bck
 BESTEFFORT
+bezelled
 bhid
 BIF
 bigbar
@@ -726,6 +727,7 @@ ISSEPARATOR
 ITask
 ith
 ITHUMBNAIL
+ITwoWayPipeMessageIPCManaged
 IUI
 IUnknown
 IUse
@@ -996,6 +998,7 @@ newitem
 newpath
 newplus
 NEWPLUSCONTEXTMENU
+NEWPLUSSHELLEXTENSIONWIN
 newrow
 newsgroups
 NIF
@@ -1167,6 +1170,7 @@ pnid
 Pnp
 Popups
 POPUPWINDOW
+POSITIONITEM
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST

diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
@@ -181,6 +181,7 @@
 
                 "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
                 "WinUI3Apps\\NewPlusPackage.msix",
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
 
                 "PowerAccent.Core.dll",
                 "PowerToys.PowerAccent.dll",

diff --git a/PowerToys.sln b/PowerToys.sln
@@ -632,6 +632,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBorders.UnitTes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "src\modules\Workspaces\WorkspacesCsharpLibrary\WorkspacesCsharpLibrary.csproj", "{89D0E199-B17A-418C-B2F8-7375B6708357}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
 Global
@@ -2794,6 +2796,18 @@ Global
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Release|x64.Build.0 = Release|x64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Release|x86.ActiveCfg = Release|x64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Release|x86.Build.0 = Release|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|x64.ActiveCfg = Debug|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|x64.Build.0 = Debug|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|x86.ActiveCfg = Debug|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Debug|x86.Build.0 = Debug|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|ARM64.Build.0 = Release|ARM64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.ActiveCfg = Release|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.Build.0 = Release|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x86.ActiveCfg = Release|x64
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x86.Build.0 = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
@@ -3038,6 +3052,7 @@ Global
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
 		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/installer/PowerToysSetup/NewPlus.wxs b/installer/PowerToysSetup/NewPlus.wxs
@@ -18,6 +18,19 @@
       <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
          <!-- Generated by generateFileComponents.ps1 -->
          <!--NewPlusAssetsFiles_Component_Def-->
+
+         <!-- NewPlus Shell Extension for Win10 registration -->
+         <Component Id="NewPlus_ShellExtension_win10" Guid="D5456D4A-6EEC-4B85-944D-6A6A4A74FFA6" Win64="yes">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{FF90D477-E32A-4BE8-8CC5-A502A97F5401}">
+               <RegistryValue Type="string" Value="NewPlus Shell Extension Win10" />
+               <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+               <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.NewPlus.ShellExtension.win10.dll" />
+               <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+            </RegistryKey>
+            <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\NewPlusShellExtensionWin10">
+               <RegistryValue Type="string" Value="{FF90D477-E32A-4BE8-8CC5-A502A97F5401}"/>
+            </RegistryKey>
+         </Component>
       </DirectoryRef>
 
       <ComponentGroup Id="NewPlusComponentGroup">
@@ -27,6 +40,7 @@
             </RegistryKey>
             <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
          </Component>
+         <ComponentRef Id="NewPlus_ShellExtension_win10" />
       </ComponentGroup>
 
 

diff --git a/src/common/ManagedCommon/Logger.cs b/src/common/ManagedCommon/Logger.cs
@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 using PowerToys.Interop;
 
@@ -52,16 +53,18 @@ public static void InitializeLogger(string applicationLogPath, bool isLocalLow =
             Trace.AutoFlush = true;
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogError(string message)
         {
             Log(message, Error);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogError(string message, Exception ex)
         {
             if (ex == null)
             {
-                LogError(message);
+                Log(message, Error);
             }
             else
             {
@@ -84,26 +87,31 @@ public static void LogError(string message, Exception ex)
             }
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogWarning(string message)
         {
             Log(message, Warning);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogInfo(string message)
         {
             Log(message, Info);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogDebug(string message)
         {
             Log(message, Debug);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogTrace()
         {
             Log(string.Empty, TraceFlag);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void Log(string message, string type)
         {
             Trace.WriteLine("[" + DateTime.Now.TimeOfDay + "] [" + type + "] " + GetCallerInfo());
@@ -116,13 +124,49 @@ private static void Log(string message, string type)
             Trace.Unindent();
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         private static string GetCallerInfo()
         {
             StackTrace stackTrace = new();
 
-            var methodName = stackTrace.GetFrame(3)?.GetMethod();
-            var className = methodName?.DeclaringType.Name;
-            return className + "::" + methodName?.Name;
+            var callerMethod = GetCallerMethod(stackTrace);
+
+            return $"{callerMethod?.DeclaringType?.Name}::{callerMethod.Name}";
+        }
+
+        private static MethodBase GetCallerMethod(StackTrace stackTrace)
+        {
+            const int topFrame = 3;
+
+            var topMethod = stackTrace.GetFrame(topFrame)?.GetMethod();
+
+            try
+            {
+                if (topMethod?.Name == nameof(IAsyncStateMachine.MoveNext) && typeof(IAsyncStateMachine).IsAssignableFrom(topMethod?.DeclaringType))
+                {
+                    // Async method; return actual method as determined by heuristic:
+                    // "Nearest method on stack to async state-machine's MoveNext() in same namespace but in a different type".
+                    // There are tighter ways of determining the actual method, but this is good enough and probably faster.
+                    for (int deepFrame = topFrame + 1; deepFrame < stackTrace.FrameCount; deepFrame++)
+                    {
+                        var deepMethod = stackTrace.GetFrame(deepFrame)?.GetMethod();
+
+                        if (deepMethod?.DeclaringType != topMethod?.DeclaringType && deepMethod?.DeclaringType?.Namespace == topMethod?.DeclaringType?.Namespace)
+                        {
+                            return deepMethod;
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // Ignore exceptions in Release. The code above won't throw, but if it does, we don't want to crash the app.
+#if DEBUG
+                throw;
+#endif
+            }
+
+            return topMethod;
         }
     }
 }
diff --git a/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs b/src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs
@@ -2,8 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Globalization;
 using System.Reflection;
-
+using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJump.Common.Helpers;
 using MouseJump.Common.Imaging;
@@ -16,7 +17,7 @@ namespace MouseJump.Common.UnitTests.Helpers;
 public static class DrawingHelperTests
 {
     [TestClass]
-    public sealed class GetPreviewLayoutTests
+    public sealed class RenderPreviewTests
     {
         public sealed class TestCase
         {
@@ -46,7 +47,7 @@ public static IEnumerable<object[]> GetTestCases()
             yield return new object[]
             {
                 new TestCase(
-                    previewStyle: StyleHelper.DefaultPreviewStyle,
+                    previewStyle: StyleHelper.BezelledPreviewStyle,
                     screens: new List<RectangleInfo>()
                     {
                         new(0, 0, 500, 500),
@@ -62,7 +63,7 @@ public static IEnumerable<object[]> GetTestCases()
             yield return new object[]
             {
                 new TestCase(
-                    previewStyle: StyleHelper.DefaultPreviewStyle,
+                    previewStyle: StyleHelper.BezelledPreviewStyle,
                     screens: new List<RectangleInfo>()
                     {
                         new(5120, 349, 1920, 1080),
@@ -79,7 +80,7 @@ public static IEnumerable<object[]> GetTestCases()
         public void RunTestCases(TestCase data)
         {
             // load the fake desktop image
-            using var desktopImage = GetPreviewLayoutTests.LoadImageResource(data.DesktopImageFilename);
+            using var desktopImage = RenderPreviewTests.LoadImageResource(data.DesktopImageFilename);
 
             // draw the preview image
             var previewLayout = LayoutHelper.GetPreviewLayout(
@@ -90,28 +91,29 @@ public void RunTestCases(TestCase data)
             using var actual = DrawingHelper.RenderPreview(previewLayout, imageCopyService);
 
             // load the expected image
-            var expected = GetPreviewLayoutTests.LoadImageResource(data.ExpectedImageFilename);
+            var expected = RenderPreviewTests.LoadImageResource(data.ExpectedImageFilename);
 
             // compare the images
-            var screens = System.Windows.Forms.Screen.AllScreens;
             AssertImagesEqual(expected, actual);
         }
 
         private static Bitmap LoadImageResource(string filename)
         {
-            // assume embedded resources are in the same source folder as this
-            // class, and the namespace hierarchy matches the folder structure.
-            // that way we can build resource names from the current namespace
-            var resourcePrefix = typeof(DrawingHelperTests).Namespace;
-            var resourceName = $"{resourcePrefix}.{filename}";
-
             var assembly = Assembly.GetExecutingAssembly();
+            var assemblyName = new AssemblyName(assembly.FullName ?? throw new InvalidOperationException());
+            var resourceName = $"{typeof(DrawingHelperTests).Namespace}.{filename.Replace("/", ".")}";
             var resourceNames = assembly.GetManifestResourceNames();
             if (!resourceNames.Contains(resourceName))
             {
-                var message = $"Embedded resource '{resourceName}' does not exist. " +
-                    "Valid resource names are: \r\n" + string.Join("\r\n", resourceNames);
-                throw new InvalidOperationException(message);
+                var message = new StringBuilder();
+                message.AppendLine(CultureInfo.InvariantCulture, $"Embedded resource '{resourceName}' does not exist.");
+                message.AppendLine($"Known resources:");
+                foreach (var name in resourceNames)
+                {
+                    message.AppendLine(name);
+                }
+
+                throw new InvalidOperationException(message.ToString());
             }
 
             var stream = assembly.GetManifestResourceStream(resourceName)
@@ -121,7 +123,7 @@ private static Bitmap LoadImageResource(string filename)
         }
 
         /// <summary>
-        /// Naive / brute force image comparison - we can optimise this later :-)
+        /// Naive / brute force image comparison - we can optimize this later :-)
         /// </summary>
         private static void AssertImagesEqual(Bitmap expected, Bitmap actual)
         {