mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 02:36:19 +02:00
fb5ed13386
## 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.
36 lines
1.6 KiB
C++
36 lines
1.6 KiB
C++
#pragma once
|
|
#include "KeyboardHook.g.h"
|
|
#include <mutex>
|
|
#include <unordered_set>
|
|
|
|
namespace winrt::PowerToys::Interop::implementation
|
|
{
|
|
struct KeyboardHook : KeyboardHookT<KeyboardHook>
|
|
{
|
|
// KeyboardHook() = default;
|
|
|
|
KeyboardHook(winrt::PowerToys::Interop::KeyboardEventCallback const& keyboardEventCallback, winrt::PowerToys::Interop::IsActiveCallback const& isActiveCallback, winrt::PowerToys::Interop::FilterKeyboardEvent const& filterKeyboardEvent);
|
|
void Start();
|
|
void Close();
|
|
|
|
private:
|
|
winrt::PowerToys::Interop::KeyboardEventCallback keyboardEventCallback;
|
|
winrt::PowerToys::Interop::IsActiveCallback isActiveCallback;
|
|
winrt::PowerToys::Interop::FilterKeyboardEvent filterKeyboardEvent;
|
|
|
|
// This class used to be C++/CX, which meant it ran on .NET runtime and was able to send function pointer for delegates as hook procedures for SetWindowsHookEx which kept an object reference.
|
|
// There doesn't seem to be a way to do this outside of the .NET runtime that allows us to get a proper C-style function.
|
|
// The alternative when porting to C++/winrt is to keep track of every instance and use a single proc instead of one per object. This should also make it lighter.
|
|
static std::mutex instancesMutex;
|
|
static std::unordered_set<KeyboardHook*> instances;
|
|
static inline HHOOK hookHandle = nullptr;
|
|
static LRESULT CALLBACK HookProc(int nCode, WPARAM wParam, LPARAM lParam);
|
|
};
|
|
}
|
|
namespace winrt::PowerToys::Interop::factory_implementation
|
|
{
|
|
struct KeyboardHook : KeyboardHookT<KeyboardHook, implementation::KeyboardHook>
|
|
{
|
|
};
|
|
}
|