From d219b78d4c79aa2db495589ccece16fe7f2ab00b Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Thu, 16 May 2024 13:25:54 +0200
Subject: [PATCH] CI: added MSVC 2022 build

---
 .github/workflows/c-cpp.yml | 5 ++++-
 tests/src/check_win7.py     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e92b7b2..b54ec34 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -427,6 +427,7 @@ jobs:
     strategy:
       matrix:
         config:
+          - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "ON", upnp: "ON", grpc: "ON"}
           - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "ON", upnp: "ON", grpc: "ON"}
           - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "ON", upnp: "ON", grpc: "OFF"}
           - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "OFF", upnp: "ON", grpc: "OFF"}
@@ -473,10 +474,12 @@ jobs:
         & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool_tests.vcxproj
 
     - name: Run tests
+      shell: cmd
       run: |
         cd tests/build/Debug
         7z x *.gz
-        ./p2pool_tests.exe
+        call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
+        p2pool_tests.exe
 
     - name: Archive binary
       uses: actions/upload-artifact@v4
diff --git a/tests/src/check_win7.py b/tests/src/check_win7.py
index 2b846d4..fc80355 100644
--- a/tests/src/check_win7.py
+++ b/tests/src/check_win7.py
@@ -101,6 +101,7 @@ allowedAPIs = {
 	"SetFileCompletionNotificationModes",
 	"WideCharToMultiByte",
 	"DuplicateHandle",
+	"TryAcquireSRWLockExclusive",
 	"TryAcquireSRWLockShared",
 	"InitializeConditionVariable",
 	"WakeConditionVariable",