From 53b4ddb01308a2cf0ba5eb6ef21996180ea0394d Mon Sep 17 00:00:00 2001
From: iProgramInCpp <iprogramincpp@gmail.com>
Date: Mon, 27 May 2024 15:09:07 +0300
Subject: [PATCH] * Update MWAS, some more fixes. * Lower networker thread
 count to 4 with 2 interactive. Apparently works better in my Windows 2000 VM
 with no loss of interactivity.

---
 deps/mwas                       | 2 +-
 src/windows/NetworkerThread.hpp | 4 ++--
 src/windows/ProfilePopout.cpp   | 4 ++--
 src/windows/WinUtils.cpp        | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/deps/mwas b/deps/mwas
index b8fd963..2e9bba9 160000
--- a/deps/mwas
+++ b/deps/mwas
@@ -1 +1 @@
-Subproject commit b8fd96309d3e42665bec60155dd9b1322c639d17
+Subproject commit 2e9bba90644984ad6fa36312ef67382d76a20fee
diff --git a/src/windows/NetworkerThread.hpp b/src/windows/NetworkerThread.hpp
index 2ed87ce..8d2732f 100644
--- a/src/windows/NetworkerThread.hpp
+++ b/src/windows/NetworkerThread.hpp
@@ -26,8 +26,8 @@ struct NetworkResponse
 	int m_code; // 200 = OK, 404 = Not Found, 403 = Forbidden, 401 = Unauthorized
 };
 
-#define C_AMT_NETWORKER_THREADS (16)
-#define C_INTERACTIVE_NETWORKER_THREADS (8)
+#define C_AMT_NETWORKER_THREADS (4)
+#define C_INTERACTIVE_NETWORKER_THREADS (2)
 
 class NetworkerThread
 {
diff --git a/src/windows/ProfilePopout.cpp b/src/windows/ProfilePopout.cpp
index f8af96d..c266eea 100644
--- a/src/windows/ProfilePopout.cpp
+++ b/src/windows/ProfilePopout.cpp
@@ -495,12 +495,12 @@ void DeferredShowProfilePopout(const ShowProfilePopoutParams& params)
 	}
 
 	POINT pt { x + wndWidth / 2, y + wndHeight / 2 };
-	HMONITOR mon = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);
+	HMONITOR mon = ri::MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);
 
 	if (mon) {
 		MONITORINFO mi{};
 		mi.cbSize = sizeof mi;
-		GetMonitorInfo(mon, &mi);
+		ri::GetMonitorInfo(mon, &mi);
 
 		if (x  < mi.rcWork.left)
 			x  = mi.rcWork.left;
diff --git a/src/windows/WinUtils.cpp b/src/windows/WinUtils.cpp
index 8a6d1f8..df72c34 100644
--- a/src/windows/WinUtils.cpp
+++ b/src/windows/WinUtils.cpp
@@ -782,7 +782,9 @@ int MapIconToOldIfNeeded(int iconID)
 		case IDI_TYPING_FRAME2: return IDI_TYPING_FRAME2_2K;
 		case IDI_TYPING_FRAME3: return IDI_TYPING_FRAME3_2K;
 		case IDI_REPLY_PIECE: return IDI_REPLY_PIECE_2K;
+		case IDI_SHIFT_RIGHT: return IDI_SHIFT_RIGHT_2K;
 		case IDI_NEW_INLINE: return IDI_NEW_INLINE_2K;
+		case IDI_SHIFT_LEFT: return IDI_SHIFT_LEFT_2K;
 		case IDI_CATEGORY: return IDI_CATEGORY_2K;
 		case IDI_CHANNEL: return IDI_CHANNEL_2K;
 		case IDI_MEMBERS: return IDI_MEMBERS_2K;