From 15de3cc16c137a3e51677e0dd7abf9ac17cbe2cf Mon Sep 17 00:00:00 2001
From: Tony Butler <spudz76@gmail.com>
Date: Fri, 28 Jan 2022 21:09:24 -0700
Subject: [PATCH 1/3] Add MSVC/2022 to version.h

---
 src/version.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/version.h b/src/version.h
index 377a4053d..57180c2bd 100644
--- a/src/version.h
+++ b/src/version.h
@@ -33,7 +33,9 @@
 #define APP_VER_PATCH  4
 
 #ifdef _MSC_VER
-#   if (_MSC_VER >= 1920)
+#   if (_MSC_VER >= 1930)
+#       define MSVC_VERSION 2022
+#   elif (_MSC_VER >= 1920 && _MSC_VER < 1930)
 #       define MSVC_VERSION 2019
 #   elif (_MSC_VER >= 1910 && _MSC_VER < 1920)
 #       define MSVC_VERSION 2017

From 14117e965840d6549fe31738c1fdedc5b898cdee Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Mon, 31 Jan 2022 14:29:41 +0700
Subject: [PATCH 2/3] #2910 Fixed donation for GhostRider/RTM.

---
 src/base/net/stratum/AutoClient.cpp     | 6 ++++++
 src/base/net/stratum/EthStratumClient.h | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/base/net/stratum/AutoClient.cpp b/src/base/net/stratum/AutoClient.cpp
index 702c0fa04..675be865a 100644
--- a/src/base/net/stratum/AutoClient.cpp
+++ b/src/base/net/stratum/AutoClient.cpp
@@ -65,6 +65,12 @@ bool xmrig::AutoClient::parseLogin(const rapidjson::Value &result, int *code)
     m_mode = ETH_MODE;
     setAlgo(algo);
 
+#   ifdef XMRIG_ALGO_GHOSTRIDER
+    if (algo.family() == Algorithm::GHOSTRIDER) {
+        setExtraNonce2Size(Json::getUint64(result, "extra_nonce2_size"));
+    }
+#   endif
+
     return true;
 }
 
diff --git a/src/base/net/stratum/EthStratumClient.h b/src/base/net/stratum/EthStratumClient.h
index c1fde9b62..ebfda6ac3 100644
--- a/src/base/net/stratum/EthStratumClient.h
+++ b/src/base/net/stratum/EthStratumClient.h
@@ -47,6 +47,10 @@ protected:
 
     void setExtraNonce(const rapidjson::Value &nonce);
 
+#   ifdef XMRIG_ALGO_GHOSTRIDER
+    inline void setExtraNonce2Size(uint64_t size)   { m_extraNonce2Size = size; }
+#   endif
+
 private:
     static const char *errorMessage(const rapidjson::Value &error);
 

From 802029e5f56b891ae4b2e1c5714feb5997ce02d9 Mon Sep 17 00:00:00 2001
From: xmrig <support@xmrig.com>
Date: Fri, 4 Feb 2022 15:14:46 +0700
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e71916fe3..8834cd641 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v6.16.4
+- [#2904](https://github.com/xmrig/xmrig/pull/2904) Fixed unaligned memory accesses.
+- [#2908](https://github.com/xmrig/xmrig/pull/2908) Added MSVC/2022 to `version.h`.
+- [#2910](https://github.com/xmrig/xmrig/issues/2910) Fixed donation for GhostRider/RTM.
+
 # v6.16.3
 - [#2778](https://github.com/xmrig/xmrig/pull/2778) Fixed `READY threads X/X` display after algorithm switching.
 - [#2782](https://github.com/xmrig/xmrig/pull/2782) Updated GhostRider documentation.