彻底修复版本逻辑

Author: nahida-mouo

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

@@ -161,15 +161,25 @@ HRESULT __stdcall HutaoNative::IsCurrentWindowsVersionSupported(BOOL* isSupporte
     AssertNonNullAndReturn(isSupported);
 
     HutaoPrivateWindowsVersion winver;
-	GetWindowsVersion(&winver);
+    GetWindowsVersion(&winver);
 
-	if (winver.major > 10 || winver.minor > 0 || winver.build > 19045 || winver.revision >= 5371)
+    const DWORD targetMajor = 10;
+    const DWORD targetMinor = 0;
+    const DWORD targetBuild = 19045;
+    const DWORD targetRevision = 5371;
+
+    if (winver.major > targetMajor ||
+        (winver.major == targetMajor && winver.minor > targetMinor) ||
+        (winver.major == targetMajor && winver.minor == targetMinor && winver.build > targetBuild) ||
+        (winver.major == targetMajor && winver.minor == targetMinor && winver.build == targetBuild && winver.revision >= targetRevision))
+    {
+        *isSupported = TRUE;
+    }
+    else
     {
-         *isSupported = TRUE;
-         return S_OK;
+        *isSupported = FALSE;
     }
 
-    *isSupported = FALSE;
     return S_OK;
 }
 

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

@@ -1,31 +1,25 @@
 #include "pch.h"
 #include "HutaoNativeInputLowLevelKeyboardSource.h"
 
-// 全局变量来存储钩子句柄和回调函数
 static HHOOK g_keyboardHook = nullptr;
 static void* g_callback = nullptr;
 
-// 键盘钩子过程函数
 static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
     if (nCode >= 0 && g_callback != nullptr)
     {
-        // 调用回调函数
-        // 回调函数签名：BOOL (*callback)(uint, KBDLLHOOKSTRUCT*)
         typedef BOOL (CALLBACK* KeyboardCallback)(uint, KBDLLHOOKSTRUCT*);
         KeyboardCallback callback = reinterpret_cast<KeyboardCallback>(g_callback);
 
         KBDLLHOOKSTRUCT* pKeyboardStruct = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
         uint message = static_cast<uint>(wParam);
 
-        // 调用回调，如果返回TRUE表示已处理，停止传递
         if (callback && callback(message, pKeyboardStruct))
         {
-            return 1; // 阻止消息传递
+            return 1;
         }
     }
 
-    // 继续传递消息
     return CallNextHookEx(g_keyboardHook, nCode, wParam, lParam);
 }
 
@@ -36,17 +30,14 @@ HRESULT __stdcall HutaoNativeInputLowLevelKeyboardSource::Attach(intptr_t callba
         return E_INVALIDARG;
     }
 
-    // 如果已经安装了钩子，先移除
     if (g_keyboardHook != nullptr)
     {
         UnhookWindowsHookEx(g_keyboardHook);
         g_keyboardHook = nullptr;
     }
 
-    // 保存回调函数
     g_callback = reinterpret_cast<void*>(callback);
 
-    // 安装低级键盘钩子
     g_keyboardHook = SetWindowsHookExW(
         WH_KEYBOARD_LL,
         LowLevelKeyboardProc,
@@ -66,7 +57,6 @@ HRESULT __stdcall HutaoNativeInputLowLevelKeyboardSource::Attach(intptr_t callba
 
 HRESULT __stdcall HutaoNativeInputLowLevelKeyboardSource::Detach(intptr_t callback) noexcept
 {
-    // 验证回调函数是否匹配
     if (reinterpret_cast<void*>(callback) != g_callback)
     {
         return E_INVALIDARG;
@@ -80,6 +70,5 @@ HRESULT __stdcall HutaoNativeInputLowLevelKeyboardSource::Detach(intptr_t callba
         return S_OK;
     }
 
-    // 如果没有钩子，返回成功（已经处于分离状态）
     return S_OK;
 }