From 10ffd1af6b25d4cb91c2f019e1ca86690cc61f62 Mon Sep 17 00:00:00 2001 From: BrunoCostaGH <54143084+BrunoCostaGH@users.noreply.github.com> Date: Fri, 18 Apr 2025 16:27:57 +0100 Subject: [PATCH 1/3] fix: retarget solution to Windows SDK 10.0 and VS 22 --- A320UE/A320UE.vcxproj | 10 +++++----- BetterMouseYoke/BetterMouseYoke.vcxproj | 10 +++++----- CycleQuickLooks/CycleQuickLooks.vcxproj | 10 +++++----- MouseButtons/MouseButtons.vcxproj | 10 +++++----- PluginLoader/PluginLoader.vcxproj | 10 +++++----- ToggleMouseLook/ToggleMouseLook.vcxproj | 10 +++++----- Util/Util.vcxproj | 10 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/A320UE/A320UE.vcxproj b/A320UE/A320UE.vcxproj index c343400..69e5ca4 100644 --- a/A320UE/A320UE.vcxproj +++ b/A320UE/A320UE.vcxproj @@ -38,32 +38,32 @@ {3684F283-A3DB-48E7-BD8F-C9351A38138F} Win32Proj A320UE - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/BetterMouseYoke/BetterMouseYoke.vcxproj b/BetterMouseYoke/BetterMouseYoke.vcxproj index fc33a97..cb68a0f 100644 --- a/BetterMouseYoke/BetterMouseYoke.vcxproj +++ b/BetterMouseYoke/BetterMouseYoke.vcxproj @@ -34,32 +34,32 @@ {D9E54848-F19F-4DBD-B4EC-4871922541CA} Win32Proj BetterMouseYoke - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/CycleQuickLooks/CycleQuickLooks.vcxproj b/CycleQuickLooks/CycleQuickLooks.vcxproj index a1915c8..fbc7930 100644 --- a/CycleQuickLooks/CycleQuickLooks.vcxproj +++ b/CycleQuickLooks/CycleQuickLooks.vcxproj @@ -31,32 +31,32 @@ {9FD9E482-7A36-4B3A-B352-79C35D744F98} Win32Proj CycleQuickLooks - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/MouseButtons/MouseButtons.vcxproj b/MouseButtons/MouseButtons.vcxproj index 255ae40..d668092 100644 --- a/MouseButtons/MouseButtons.vcxproj +++ b/MouseButtons/MouseButtons.vcxproj @@ -35,32 +35,32 @@ {71988D8C-AEF8-45DB-8609-69E6F6315C71} Win32Proj MouseButtons - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/PluginLoader/PluginLoader.vcxproj b/PluginLoader/PluginLoader.vcxproj index eff2608..2f15741 100644 --- a/PluginLoader/PluginLoader.vcxproj +++ b/PluginLoader/PluginLoader.vcxproj @@ -34,32 +34,32 @@ {6A2982AA-8DC6-4217-94ED-87D956767507} Win32Proj PluginLoader - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/ToggleMouseLook/ToggleMouseLook.vcxproj b/ToggleMouseLook/ToggleMouseLook.vcxproj index c1dfe37..1ec126e 100644 --- a/ToggleMouseLook/ToggleMouseLook.vcxproj +++ b/ToggleMouseLook/ToggleMouseLook.vcxproj @@ -34,32 +34,32 @@ {5AF5AA8B-673B-4D43-B077-EB5F9AAAE4A5} Win32Proj ToggleMouseLook - 10.0.17134.0 + 10.0 DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet DynamicLibrary true - v141 + v143 NotSet DynamicLibrary false - v141 + v143 true NotSet diff --git a/Util/Util.vcxproj b/Util/Util.vcxproj index ceb4ba9..c7b4b1c 100644 --- a/Util/Util.vcxproj +++ b/Util/Util.vcxproj @@ -36,32 +36,32 @@ {1A1C2295-5251-42A2-A088-3E027FA34795} Win32Proj Util - 10.0.17134.0 + 10.0 StaticLibrary true - v141 + v143 NotSet StaticLibrary false - v141 + v143 true NotSet StaticLibrary true - v141 + v143 NotSet StaticLibrary false - v141 + v143 true NotSet From fb5544f3c90ac4c460a83e4170681af62dcd73d4 Mon Sep 17 00:00:00 2001 From: BrunoCostaGH <54143084+BrunoCostaGH@users.noreply.github.com> Date: Fri, 18 Apr 2025 16:44:34 +0100 Subject: [PATCH 2/3] fix: add explicit windows sdk targeted version --- A320UE/A320UE.vcxproj | 2 +- BetterMouseYoke/BetterMouseYoke.vcxproj | 2 +- CycleQuickLooks/CycleQuickLooks.vcxproj | 2 +- MouseButtons/MouseButtons.vcxproj | 2 +- PluginLoader/PluginLoader.vcxproj | 2 +- ToggleMouseLook/ToggleMouseLook.vcxproj | 2 +- Util/Util.vcxproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/A320UE/A320UE.vcxproj b/A320UE/A320UE.vcxproj index 69e5ca4..0b75b4a 100644 --- a/A320UE/A320UE.vcxproj +++ b/A320UE/A320UE.vcxproj @@ -38,7 +38,7 @@ {3684F283-A3DB-48E7-BD8F-C9351A38138F} Win32Proj A320UE - 10.0 + 10.0.22621.0 diff --git a/BetterMouseYoke/BetterMouseYoke.vcxproj b/BetterMouseYoke/BetterMouseYoke.vcxproj index cb68a0f..4c4f9c8 100644 --- a/BetterMouseYoke/BetterMouseYoke.vcxproj +++ b/BetterMouseYoke/BetterMouseYoke.vcxproj @@ -34,7 +34,7 @@ {D9E54848-F19F-4DBD-B4EC-4871922541CA} Win32Proj BetterMouseYoke - 10.0 + 10.0.22621.0 diff --git a/CycleQuickLooks/CycleQuickLooks.vcxproj b/CycleQuickLooks/CycleQuickLooks.vcxproj index fbc7930..3f1cf44 100644 --- a/CycleQuickLooks/CycleQuickLooks.vcxproj +++ b/CycleQuickLooks/CycleQuickLooks.vcxproj @@ -31,7 +31,7 @@ {9FD9E482-7A36-4B3A-B352-79C35D744F98} Win32Proj CycleQuickLooks - 10.0 + 10.0.22621.0 diff --git a/MouseButtons/MouseButtons.vcxproj b/MouseButtons/MouseButtons.vcxproj index d668092..e691d74 100644 --- a/MouseButtons/MouseButtons.vcxproj +++ b/MouseButtons/MouseButtons.vcxproj @@ -35,7 +35,7 @@ {71988D8C-AEF8-45DB-8609-69E6F6315C71} Win32Proj MouseButtons - 10.0 + 10.0.22621.0 diff --git a/PluginLoader/PluginLoader.vcxproj b/PluginLoader/PluginLoader.vcxproj index 2f15741..f79e95d 100644 --- a/PluginLoader/PluginLoader.vcxproj +++ b/PluginLoader/PluginLoader.vcxproj @@ -34,7 +34,7 @@ {6A2982AA-8DC6-4217-94ED-87D956767507} Win32Proj PluginLoader - 10.0 + 10.0.22621.0 diff --git a/ToggleMouseLook/ToggleMouseLook.vcxproj b/ToggleMouseLook/ToggleMouseLook.vcxproj index 1ec126e..8394348 100644 --- a/ToggleMouseLook/ToggleMouseLook.vcxproj +++ b/ToggleMouseLook/ToggleMouseLook.vcxproj @@ -34,7 +34,7 @@ {5AF5AA8B-673B-4D43-B077-EB5F9AAAE4A5} Win32Proj ToggleMouseLook - 10.0 + 10.0.22621.0 diff --git a/Util/Util.vcxproj b/Util/Util.vcxproj index c7b4b1c..242dec0 100644 --- a/Util/Util.vcxproj +++ b/Util/Util.vcxproj @@ -36,7 +36,7 @@ {1A1C2295-5251-42A2-A088-3E027FA34795} Win32Proj Util - 10.0 + 10.0.22621.0 From 33158faf1f76b152375efdbb6a6782f04d4103f7 Mon Sep 17 00:00:00 2001 From: BrunoCostaGH <54143084+BrunoCostaGH@users.noreply.github.com> Date: Sun, 20 Apr 2025 00:21:40 +0100 Subject: [PATCH 3/3] fix: added window title fallback to work with X-Plane 12.2 --- BetterMouseYoke/plugin.c | 7 +++++-- MouseButtons/plugin.c | 7 +++++-- ToggleMouseLook/plugin.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/BetterMouseYoke/plugin.c b/BetterMouseYoke/plugin.c index 5b75bab..6133345 100644 --- a/BetterMouseYoke/plugin.c +++ b/BetterMouseYoke/plugin.c @@ -96,8 +96,11 @@ PLUGIN_API int XPluginStart(char *name, char *sig, char *desc) { #ifdef IBM xp_hwnd = FindWindowA("X-System", "X-System"); if (!xp_hwnd) { - _log("could not find X-Plane 11 window"); - return 0; + xp_hwnd = FindWindowA("X-System", "X-Plane"); + if (!xp_hwnd) { + _log("could not find X-Plane window"); + return 0; + } } if (!hook_set_cursor(1)) { _log("could not hook SetCursor function"); diff --git a/MouseButtons/plugin.c b/MouseButtons/plugin.c index 3655949..9397f8c 100644 --- a/MouseButtons/plugin.c +++ b/MouseButtons/plugin.c @@ -171,8 +171,11 @@ LRESULT CALLBACK xp_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, int hook_wnd_proc() { xp_hwnd = FindWindowA("X-System", "X-System"); if (!xp_hwnd) { - _log("could not find X-Plane 11 window"); - return 0; + xp_hwnd = FindWindowA("X-System", "X-Plane"); + if (!xp_hwnd) { + _log("could not find X-Plane window"); + return 0; + } } old_wnd_proc = (WNDPROC)SetWindowLongPtrA(xp_hwnd, GWLP_WNDPROC, (LONG_PTR)&xp_wnd_proc); diff --git a/ToggleMouseLook/plugin.c b/ToggleMouseLook/plugin.c index 549c996..c6e3750 100644 --- a/ToggleMouseLook/plugin.c +++ b/ToggleMouseLook/plugin.c @@ -151,8 +151,11 @@ LRESULT CALLBACK xp_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, int hook_wnd_proc() { xp_hwnd = FindWindowA("X-System", "X-System"); if (!xp_hwnd) { - _log("could not find X-Plane 11 window"); - return 0; + xp_hwnd = FindWindowA("X-System", "X-Plane"); + if (!xp_hwnd) { + _log("could not find X-Plane window"); + return 0; + } } old_wnd_proc = (WNDPROC) SetWindowLongPtrA(xp_hwnd, GWLP_WNDPROC, (LONG_PTR) &xp_wnd_proc);