rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Windows helper function to check for Windows version 

Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
This commit is contained in:
Evan Maddock 2019-08-06 17:02:37 -04:00
parent 00c18b4c92
commit 0cd2e6bb6c
No known key found for this signature in database
GPG Key ID: 0305406A08B48987
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/platform/MSWindowsDesks.cpp
View File

@ -33,6 +33,7 @@
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include <malloc.h> #include <malloc.h>
#include <VersionHelpers.h>
// these are only defined when WINVER >= 0x0500 // these are only defined when WINVER >= 0x0500
#if !defined(SPI_GETMOUSESPEED) #if !defined(SPI_GETMOUSESPEED)
@ -606,16 +607,6 @@ MSWindowsDesks::deskThread(void* vdesk)
{ {
MSG msg; MSG msg;
BOOL vistaOrGreater = FALSE;
{
OSVERSIONINFOW osvi;
osvi.dwOSVersionInfoSize = sizeof(osvi);
if (GetVersionExW(&osvi)) {
vistaOrGreater = osvi.dwMajorVersion >= 6;
}
}
// use given desktop for this thread // use given desktop for this thread
Desk* desk = static_cast<Desk*>(vdesk); Desk* desk = static_cast<Desk*>(vdesk);
desk->m_threadID = GetCurrentThreadId(); desk->m_threadID = GetCurrentThreadId();
@ -703,7 +694,7 @@ MSWindowsDesks::deskThread(void* vdesk)
if (msg.lParam != 0) { if (msg.lParam != 0) {
mouse_event(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam, 0); mouse_event(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam, 0);
} }
else if (vistaOrGreater && msg.wParam != 0) { else if (IsWindowsVistaOrGreater() && msg.wParam != 0) {
mouse_event(MOUSEEVENTF_HWHEEL, 0, 0, (DWORD)msg.wParam, 0); mouse_event(MOUSEEVENTF_HWHEEL, 0, 0, (DWORD)msg.wParam, 0);
} }
break; break;