Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Revert back to using boost::regex, std::wregex doesn't work for name validation

Browse Source 
Closes #20094

(cherry picked from commit 6691e41873)
This commit is contained in:
Shauren
2017-08-03 00:13:21 +02:00
parent f15b4f5043
commit 50a64ccd1e
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dep/boost/CMakeLists.txt
View File

@@ -37,11 +37,6 @@ endif()
include (CheckCXXSourceCompiles)
check_cxx_source_compiles("
#include <regex>
int main() { std::wregex r(L\".*\"); }"
STD_HAS_WORKING_WREGEX)
if (WIN32)
# On windows the requirements are higher according to the wiki.
set(BOOST_REQUIRED_VERSION 1.66)
@@ -49,11 +44,7 @@ else()
set(BOOST_REQUIRED_VERSION 1.58)
endif()
if (STD_HAS_WORKING_WREGEX)
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams)
else()
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex)
endif()
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex)
# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
@@ -98,8 +89,6 @@ if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
-DBOOST_NO_CXX11_SCOPED_ENUMS)
endif()
if (NOT STD_HAS_WORKING_WREGEX)
target_compile_definitions(boost
INTERFACE
-DTC_HAS_BROKEN_WSTRING_REGEX)
endif()
target_compile_definitions(boost
INTERFACE
-DTC_HAS_BROKEN_WSTRING_REGEX)

8
src/server/game/DataStores/DB2Stores.cpp
View File

@@ -1093,7 +1093,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul
std::wstring name;
ASSERT(Utf8toWStr(namesProfanity->Name, name));
if (namesProfanity->Language != -1)
_nameValidators[namesProfanity->Language].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize);
_nameValidators[namesProfanity->Language].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize);
else
{
for (uint32 i = 0; i < TOTAL_LOCALES; ++i)
@@ -1101,7 +1101,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul
if (i == LOCALE_none)
continue;
_nameValidators[i].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize);
_nameValidators[i].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize);
}
}
}
@@ -1110,7 +1110,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul
{
std::wstring name;
ASSERT(Utf8toWStr(namesReserved->Name, name));
_nameValidators[TOTAL_LOCALES].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize);
_nameValidators[TOTAL_LOCALES].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize);
}
for (NamesReservedLocaleEntry const* namesReserved : sNamesReservedLocaleStore)
@@ -1124,7 +1124,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul
continue;
if (namesReserved->LocaleMask & (1 << i))
_nameValidators[i].emplace_back(name, Trinity::regex::icase | Trinity::regex::optimize);
_nameValidators[i].emplace_back(name, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize);
}
}