From bf5ab14a213dd8fabb5bf1dab9d73b40623c09ff Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sun, 8 Feb 2026 12:37:27 +0000
Subject: [PATCH] Also build regex_tre on Windows.

---
 modules/CMakeLists.txt       |  1 +
 modules/chanserv/cs_mode.cpp |  2 +-
 modules/extra/regex_tre.cpp  | 11 ++++++++---
 src/win32/conanfile.txt      |  1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 8fdb89c08..f933e2afc 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -24,6 +24,7 @@ if(WIN32 AND DEFINED CMAKE_TOOLCHAIN_FILE)
   enable_extra("mysql" "libmysqlclient")
   enable_extra("regex_pcre2" "PCRE2")
   enable_extra("regex_posix" "PCRE2")
+  enable_extra("regex_tre" "tre")
   enable_extra("sqlite" "SQLite3")
   enable_extra("ssl_openssl" "OpenSSL")
   # this uses Wldap so should always be available
diff --git a/modules/chanserv/cs_mode.cpp b/modules/chanserv/cs_mode.cpp
index 69656b91e..d9cc3ceac 100644
--- a/modules/chanserv/cs_mode.cpp
+++ b/modules/chanserv/cs_mode.cpp
@@ -434,7 +434,7 @@ class CommandCSMode final
 						break;
 					}
 					Anope::string mode_param;
-					if (NeedsParam(cm, adding) && !sep.GetToken(mode_param))
+					if (NeedsParam(cm, adding && setting) && !sep.GetToken(mode_param))
 					{
 						missingparam.Push(cm, mode_param, adding);
 						break;
diff --git a/modules/extra/regex_tre.cpp b/modules/extra/regex_tre.cpp
index 88a805d60..b9493ffe7 100644
--- a/modules/extra/regex_tre.cpp
+++ b/modules/extra/regex_tre.cpp
@@ -13,9 +13,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 /// BEGIN CMAKE
-/// pkg_check_modules("TRE" IMPORTED_TARGET REQUIRED "tre")
-/// target_link_libraries(${SO} PRIVATE PkgConfig::TRE)
-/// target_compile_options(${SO} PRIVATE "-Wno-error=date-time") # Workaround for TRE bug 117
+/// if(WIN32)
+///   find_package("tre" REQUIRED)
+///   target_link_libraries(${SO} PRIVATE "tre::tre")
+/// else()
+///   pkg_check_modules("TRE" IMPORTED_TARGET REQUIRED "tre")
+///   target_link_libraries(${SO} PRIVATE PkgConfig::TRE)
+///   target_compile_options(${SO} PRIVATE "-Wno-error=date-time") # Workaround for TRE bug 117
+/// endif()
 /// END CMAKE
 
 #include "module.h"
diff --git a/src/win32/conanfile.txt b/src/win32/conanfile.txt
index 5add2972b..2dd7f1d0e 100644
--- a/src/win32/conanfile.txt
+++ b/src/win32/conanfile.txt
@@ -5,6 +5,7 @@ libmysqlclient/8.1.0
 openssl/3.6.1
 pcre2/10.44
 sqlite3/3.51.0
+tre/cci.20230717
 
 [tool_requires]
 gettext/0.26