修复hotkey实现

Author: nahida-mouo

src/Snap.Hutao.Remastered.Native.Packaging/Snap.Hutao.Remastered.Native.Packaging.csproj

@@ -5,7 +5,7 @@
 		<NoPackageAnalysis>true</NoPackageAnalysis>
 
 		<PackageId>Snap.Hutao.Remastered.Native</PackageId>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 		<Authors>SnapHutaoRemasteringProject</Authors>
 		<Description>Native x64 libraries for Snap.Hutao.Remastered</Description>
 		<PackageTags>native;snap;hutao</PackageTags>

src/Snap.Hutao.Remastered.Native/HotKeyCallbackManager.cpp

@@ -34,4 +34,4 @@ void HotKeyCallbackManager::ClearCallback()
 	callback_ = {};
 }
 
-HotKeyCallbackManager gotKeyCallbackManager = HotKeyCallbackManager();
+HotKeyCallbackManager hotKeyCallbackManager = HotKeyCallbackManager();

src/Snap.Hutao.Remastered.Native/HotKeyCallbackManager.h

@@ -18,4 +18,4 @@ class HotKeyCallbackManager
 	HutaoNativeHotKeyBeforeSwitchCallback callback_ = {};
 };
 
-extern HotKeyCallbackManager gotKeyCallbackManager;
+extern HotKeyCallbackManager hotKeyCallbackManager;

src/Snap.Hutao.Remastered.Native/HutaoNativeExports.cpp

@@ -53,6 +53,6 @@ DLL_EXPORT BOOL HutaoHResultIsWin32(HRESULT hr, WIN32_ERROR error)
 
 DLL_EXPORT HRESULT HutaoNativeHotKeyInitializeBeforeSwitchCallback(HutaoNativeHotKeyBeforeSwitchCallback callback)
 {
-	gotKeyCallbackManager.Initialize(callback);
+	hotKeyCallbackManager.Initialize(callback);
     return S_OK;
 }

src/Snap.Hutao.Remastered.Native/HutaoNativeHotKeyAction.cpp

@@ -1,11 +1,11 @@
 #include "pch.h"
 #include "HutaoNativeHotKeyAction.h"
 #include "HutaoNativeHotKeyActionCallback.h"
+#include "HotKeyCallbackManager.h"
 #include <chrono>
 #include <thread>
 
 const wchar_t* WINDOW_CLASS_NAME = L"HutaoNativeHotKeyActionWindowClass";
-const UINT WMOTKEY_MESSAGE = WM_APP + 2;
 
 UINT HutaoNativeHotKeyAction::s_nextHotKeyId = 0x4000; // 从0x4000开始，避免与系统热键冲突
 
@@ -83,27 +83,34 @@ LRESULT CALLBACK HutaoNativeHotKeyAction::WndProc(HWND hWnd, UINT message, WPARA
     HutaoNativeHotKeyAction* pThis = reinterpret_cast<HutaoNativeHotKeyAction*>(GetWindowLongPtrW(hWnd, GWLP_USERDATA));
     if (pThis != nullptr)
     {
-        if (message == WMOTKEY_MESSAGE)
+        if (message == WM_HOTKEY)
         {
-            // 热键被触发，切换动作状态
-            bool wasRunning = pThis->m_isRunning.load();
-            
-            if (wasRunning)
-            {
-                pThis->StopAction();
-            }
-            else
+            if (static_cast<int>(wParam) == pThis->motKeyId)
             {
-                pThis->ExecuteAction();
+                if (hotKeyCallbackManager.InvokeCallback())
+                {
+                    return 0;
+                }
+                
+                bool wasRunning = pThis->m_isRunning.load();
+                
+                if (wasRunning)
+                {
+                    pThis->StopAction();
+                }
+                else
+                {
+                    pThis->ExecuteAction();
+                }
+                
+                // 调用回调函数通知状态变化
+                if (pThis->m_callback.has_value())
+                {
+                    pThis->m_callback.value()(!wasRunning ? TRUE : FALSE, pThis->m_userData);
+                }
+                
+                return 0;
             }
-            
-            // 调用回调函数通知状态变化
-            if (pThis->m_callback.has_value())
-            {
-                pThis->m_callback.value()(!wasRunning ? TRUE : FALSE, pThis->m_userData);
-            }
-            
-            return 0;
         }
     }