From df75efe8810c6a7d0dda9b343ff4c4f2c58ccf08 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Sat, 2 Nov 2024 14:15:09 +0300
Subject: [PATCH] version 4.3.2 fix PIKbdListener wheel on Windows

---
 CMakeLists.txt                                  | 2 +-
 libs/main/application/pilog.h                   | 4 ++--
 libs/main/client_server/piclientserver_server.h | 2 +-
 libs/main/console/pikbdlistener.cpp             | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8872a989..6264bba8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(PIP)
 set(PIP_MAJOR    4)
 set(PIP_MINOR    3)
-set(PIP_REVISION 1)
+set(PIP_REVISION 2)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
diff --git a/libs/main/application/pilog.h b/libs/main/application/pilog.h
index 15798a92..ceb6c60c 100644
--- a/libs/main/application/pilog.h
+++ b/libs/main/application/pilog.h
@@ -83,8 +83,8 @@ public:
 	//! \~russian Возвращает директорию для файлов.
 	PIString dir() const { return log_dir; }
 
-	//! \~english Set directory for log files. Should be set \b after \a setApplicationName()!
-	//! \~russian Устанавливает директорию для файлов. Должна быть установлена \b после вызова \a setApplicationName()!
+	//! \~english Set directory for log files. Should be set \b after \a setLogName()!
+	//! \~russian Устанавливает директорию для файлов. Должна быть установлена \b после вызова \a setLogName()!
 	void setDir(const PIString & d);
 
 
diff --git a/libs/main/client_server/piclientserver_server.h b/libs/main/client_server/piclientserver_server.h
index 784fa125..2827332b 100644
--- a/libs/main/client_server/piclientserver_server.h
+++ b/libs/main/client_server/piclientserver_server.h
@@ -49,6 +49,7 @@ public:
 	void listen(PINetworkAddress addr);
 	void listenAll(ushort port) { listen({0, port}); }
 
+	void stopServer();
 	void closeAll();
 
 	int getMaxClients() const { return max_clients; }
@@ -61,7 +62,6 @@ public:
 	Config & configuration() { return config; }
 
 private:
-	void stopServer();
 	void newClient(ServerClient * c);
 	void clientDisconnected(ServerClient * c);
 
diff --git a/libs/main/console/pikbdlistener.cpp b/libs/main/console/pikbdlistener.cpp
index 9e874a64..e5034f57 100644
--- a/libs/main/console/pikbdlistener.cpp
+++ b/libs/main/console/pikbdlistener.cpp
@@ -360,8 +360,7 @@ void PIKbdListener::readKeyboard() {
 		if (mer.dwEventFlags & MOUSE_WHEELED) {
 			memcpy((void *)(&we), (const void *)(&me), sizeof(me));
 			we.action    = MouseWheel;
-			we.direction = short((mer.dwButtonState >> 8) & 0xFFFF) > 0;
-			// piCout << "wheel" << we.direction;
+			we.direction = short((mer.dwButtonState >> 16) & 0xFFFF) > 0;
 			wheelEvent(we, kbddata_);
 			break;
 		} else {