Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor]Port C++/CX to C++/WinRT (#34198)

Browse Source 
## Summary of the Pull Request
Removes all C++/CX code, replacing it with C++/WinRT.

## Detailed Description of the Pull Request / Additional comments
Removes all C++/CX code.
Renames interop namespaces to be better consumed by CsWinRT.
Standardizes all projects on net8.0-windows10.0.20348.0, which is a
requirement for C++/WinRT usage.
FileLocksmithLibInterop brought to stdcpplatest and static analysis
errors were corrected.
Removed now unneeded string conversion code from
FileLocksmithLibInterop.
Changed interop KeyboardHook to use a single hook across all instances.
Required because on C++/WinRT we don't have the .NET runtime to bind a
object instance to a delegate and be able to pass it to a C function
pointer argument (still no idea why this worked correctly on C++/CX to
be honest). This change actually makes us create less low level keyboard
hooks.
Changed some code that depended on arrays since WinRT/C++ returns null
instead of an empty array through the interface.

## Validation Steps Performed
Built and tested runtime.
This commit is contained in:
Jaime Bernardo
2024-08-08 15:26:43 +01:00
committed by GitHub
parent b16e82c837
commit fb5ed13386
136 changed files with 1511 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings-ui/Settings.UI.Library/GeneralSettings.cs
View File

@@ -104,7 +104,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
private static string DefaultPowertoysVersion()
{
return interop.CommonManaged.GetProductVersion();
return global::PowerToys.Interop.CommonManaged.GetProductVersion();
}
// This function is to implement the ISettingsConfig interface.

2
src/settings-ui/Settings.UI.Library/HotkeySettingsControlHook.cs
View File

@@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
using System;
using interop;
using PowerToys.Interop;
namespace Microsoft.PowerToys.Settings.UI.Library
{

4
src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj
View File

@@ -4,9 +4,8 @@
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<PropertyGroup>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
<Description>PowerToys Settings UI Library</Description>
<AssemblyName>PowerToys.Settings.UI.Lib</AssemblyName>
</PropertyGroup>
@@ -24,6 +23,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" />
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>

6
src/settings-ui/Settings.UI.Library/Utilities/Helper.cs
View File

@@ -96,7 +96,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
return Directory.GetParent(settingsPath).FullName;
}
private static readonly interop.LayoutMapManaged LayoutMap = new interop.LayoutMapManaged();
private static readonly global::PowerToys.Interop.LayoutMapManaged LayoutMap = new global::PowerToys.Interop.LayoutMapManaged();
public static string GetKeyName(uint key)
{
@@ -110,7 +110,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
public static string GetProductVersion()
{
return interop.CommonManaged.GetProductVersion();
return global::PowerToys.Interop.CommonManaged.GetProductVersion();
}
public static int CompareVersions(string version1, string version2)
@@ -148,6 +148,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
}
}
public const uint VirtualKeyWindows = interop.Constants.VK_WIN_BOTH;
public static readonly uint VirtualKeyWindows = global::PowerToys.Interop.Constants.VK_WIN_BOTH;
}
}

2
src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
View File

@@ -9,7 +9,6 @@ using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using interop;
using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Helpers;
using Microsoft.PowerToys.Settings.UI.Library;
@@ -18,6 +17,7 @@ using Microsoft.PowerToys.Settings.UI.Services;
using Microsoft.PowerToys.Settings.UI.Views;
using Microsoft.PowerToys.Telemetry;
using Microsoft.UI.Xaml;
using PowerToys.Interop;
using Windows.UI.Popups;
using WinRT.Interop;
using WinUIEx;

2
src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml.cs
View File

@@ -5,13 +5,13 @@ using System;
using System.Collections.ObjectModel;
using System.Threading;
using global::Windows.System;
using interop;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.ViewModels;
using Microsoft.PowerToys.Settings.UI.Views;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using PowerToys.Interop;
namespace Microsoft.PowerToys.Settings.UI.Flyout
{

2
src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
View File

@@ -4,7 +4,6 @@
using System;
using System.Threading;
using global::Windows.System;
using interop;
using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Controls;
using Microsoft.PowerToys.Settings.UI.Library;
@@ -14,6 +13,7 @@ using Microsoft.PowerToys.Telemetry;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using PowerToys.Interop;
using WinUIEx;
namespace Microsoft.PowerToys.Settings.UI.Flyout

2
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeEnvironmentVariables.xaml.cs
View File

@@ -3,13 +3,13 @@
// See the LICENSE file in the project root for more information.
using System.Threading;
using interop;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
using Microsoft.PowerToys.Settings.UI.Views;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using PowerToys.Interop;
namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
{

2
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml.cs
View File

@@ -3,13 +3,13 @@
// See the LICENSE file in the project root for more information.
using System.Threading;
using interop;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
using Microsoft.PowerToys.Settings.UI.Views;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using PowerToys.Interop;
namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
{

2
src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
View File

@@ -3,13 +3,13 @@
// See the LICENSE file in the project root for more information.
using System;
using interop;
using Microsoft.PowerToys.Settings.UI.Helpers;
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
using Microsoft.PowerToys.Settings.UI.OOBE.Views;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using PowerToys.Interop;
using Windows.Graphics;
using WinUIEx;
using WinUIEx.Messaging;

2
src/settings-ui/Settings.UI/ViewModels/EnvironmentVariablesViewModel.cs
View File

@@ -6,11 +6,11 @@ using System;
using System.Runtime.CompilerServices;
using System.Threading;
using global::PowerToys.GPOWrapper;
using interop;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
using PowerToys.Interop;
using Settings.UI.Library.Enumerations;
namespace Microsoft.PowerToys.Settings.UI.ViewModels

2
src/settings-ui/Settings.UI/ViewModels/HostsViewModel.cs
View File

@@ -6,11 +6,11 @@ using System;
using System.Runtime.CompilerServices;
using System.Threading;
using global::PowerToys.GPOWrapper;
using interop;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
using PowerToys.Interop;
using Settings.UI.Library.Enumerations;
namespace Microsoft.PowerToys.Settings.UI.ViewModels

5
src/settings-ui/Settings.UI/ViewModels/VideoConferenceViewModel.cs
View File

@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text.Json;
@@ -58,8 +59,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
Settings = videoConferenceSettingsRepository.SettingsConfig;
CameraNames = interop.CommonManaged.GetAllVideoCaptureDeviceNames();
MicrophoneNames = interop.CommonManaged.GetAllActiveMicrophoneDeviceNames();
CameraNames = global::PowerToys.Interop.CommonManaged.GetAllVideoCaptureDeviceNames().ToList();
MicrophoneNames = global::PowerToys.Interop.CommonManaged.GetAllActiveMicrophoneDeviceNames().ToList();
MicrophoneNames.Insert(0, "[All]");
var shouldSaveSettings = false;