From c09bb808663c121e32b4fabc2796891d526ee8ce Mon Sep 17 00:00:00 2001 From: Silarn Date: Fri, 5 Apr 2019 23:06:52 -0500 Subject: [PATCH 1/3] Change to upstream 0.x spdlog branch --- .gitmodules | 2 +- spdlog | 2 +- src/shared/shmlogger.cpp | 8 +++----- src/shared/shmlogger.h | 1 + src/usvfs_proxy/main.cpp | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4f5ca60f..d19a1482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = https://github.com/fmtlib/fmt.git [submodule "spdlog"] path = spdlog - url = https://github.com/TanninOne/spdlog.git + url = https://github.com/gabime/spdlog.git diff --git a/spdlog b/spdlog index e6cefe81..560df287 160000 --- a/spdlog +++ b/spdlog @@ -1 +1 @@ -Subproject commit e6cefe81c1e736864f5e08893ca6eb07d352d368 +Subproject commit 560df2878ad308b27873b3cc5e810635d69cfad6 diff --git a/src/shared/shmlogger.cpp b/src/shared/shmlogger.cpp index ae90af6c..a13b7a80 100644 --- a/src/shared/shmlogger.cpp +++ b/src/shared/shmlogger.cpp @@ -176,15 +176,13 @@ void spdlog::sinks::shm_sink::output(level::level_enum lev, switch (lev) { case level::trace: case level::debug: - case level::notice: { + case level::info: { // m_LogQueue.send(message.c_str(), count, 0); sent = m_LogQueue.try_send(message.c_str(), static_cast(count), 0); } break; - case level::alert: - case level::critical: - case level::emerg: - case level::err: { + case level::err: + case level::critical: { m_LogQueue.send(message.c_str(), static_cast(count), 0); } break; default: { diff --git a/src/shared/shmlogger.h b/src/shared/shmlogger.h index 7e376342..473f431e 100644 --- a/src/shared/shmlogger.h +++ b/src/shared/shmlogger.h @@ -27,6 +27,7 @@ along with usvfs. If not, see . #include #include #include +#include #include typedef boost::interprocess::message_queue_t message_queue_interop; diff --git a/src/usvfs_proxy/main.cpp b/src/usvfs_proxy/main.cpp index 93e00403..c1f4a983 100644 --- a/src/usvfs_proxy/main.cpp +++ b/src/usvfs_proxy/main.cpp @@ -116,7 +116,7 @@ int main(int argc, char **argv) { exceptionDialog(__LINE__, 2, e.what(), e2.what()); // no way to log this } catch (const std::exception &) { - logger->critical() << e.what(); + logger->critical(e.what()); } return 1; } @@ -216,7 +216,7 @@ int main(int argc, char **argv) { // no way to log this exceptionDialog(__LINE__, 2, e.what(), e2.what()); } catch (const std::exception &) { - logger->critical() << e.what(); + logger->critical(e.what()); } } } From f42b331d7f1757c5b201e964f1a09b2f1bc8821a Mon Sep 17 00:00:00 2001 From: Silarn Date: Fri, 5 Apr 2019 23:08:00 -0500 Subject: [PATCH 2/3] Update project to use v142 and latest W10 API version (rather than specific) --- vsbuild/asmjit.vcxproj | 10 +++++----- vsbuild/fmt.vcxproj | 10 +++++----- vsbuild/shared.vcxproj | 10 +++++----- vsbuild/shared_test.vcxproj | 10 +++++----- vsbuild/spdlog.vcxproj | 10 +++++----- vsbuild/test_file_operations.vcxproj | 10 +++++----- vsbuild/testinject_bin.vcxproj | 10 +++++----- vsbuild/testinject_dll.vcxproj | 10 +++++----- vsbuild/thooklib.vcxproj | 10 +++++----- vsbuild/thooklib_test.vcxproj | 10 +++++----- vsbuild/tinjectlib.vcxproj | 10 +++++----- vsbuild/tinjectlib_test.vcxproj | 10 +++++----- vsbuild/tvfs_test.vcxproj | 10 +++++----- vsbuild/udis86.vcxproj | 12 ++++++------ vsbuild/usvfs_dll.vcxproj | 10 +++++----- vsbuild/usvfs_helper.vcxproj | 10 +++++----- vsbuild/usvfs_proxy.vcxproj | 10 +++++----- vsbuild/usvfs_test.vcxproj | 10 +++++----- vsbuild/usvfs_test_runner.vcxproj | 10 +++++----- 19 files changed, 96 insertions(+), 96 deletions(-) diff --git a/vsbuild/asmjit.vcxproj b/vsbuild/asmjit.vcxproj index 6a169f8a..33203567 100644 --- a/vsbuild/asmjit.vcxproj +++ b/vsbuild/asmjit.vcxproj @@ -79,32 +79,32 @@ 15.0 {5338B9D6-C2A9-4DED-B7E8-31292B96CBF2} asmjit - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/fmt.vcxproj b/vsbuild/fmt.vcxproj index 24146f2d..e6b7af19 100644 --- a/vsbuild/fmt.vcxproj +++ b/vsbuild/fmt.vcxproj @@ -22,32 +22,32 @@ 15.0 {E75F344A-1373-4E3F-97EA-BC80CA42E0F0} fmt - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/shared.vcxproj b/vsbuild/shared.vcxproj index 1e85c6e3..537a95a5 100644 --- a/vsbuild/shared.vcxproj +++ b/vsbuild/shared.vcxproj @@ -22,32 +22,32 @@ 15.0 {2BB3300B-F08A-4063-95C4-8A0FADAE6C51} shared - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/shared_test.vcxproj b/vsbuild/shared_test.vcxproj index 7b2cf4d0..77fe9e42 100644 --- a/vsbuild/shared_test.vcxproj +++ b/vsbuild/shared_test.vcxproj @@ -22,32 +22,32 @@ 15.0 {26B28EFA-5EEB-45AC-AF8F-C20F478070F8} sharedtest - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/spdlog.vcxproj b/vsbuild/spdlog.vcxproj index e9fa42d8..ad45f5b0 100644 --- a/vsbuild/spdlog.vcxproj +++ b/vsbuild/spdlog.vcxproj @@ -22,32 +22,32 @@ 15.0 {CDADDEC0-B72B-43B4-831F-72BA85B72805} spdlog - 10.0.16299.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/vsbuild/test_file_operations.vcxproj b/vsbuild/test_file_operations.vcxproj index 6c7f2971..2dc21bf1 100644 --- a/vsbuild/test_file_operations.vcxproj +++ b/vsbuild/test_file_operations.vcxproj @@ -22,32 +22,32 @@ 15.0 {0B2FF5AF-8580-458C-8EF4-10E6B6398D3A} testfileoperations - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/testinject_bin.vcxproj b/vsbuild/testinject_bin.vcxproj index 855f3318..83d8f9d5 100644 --- a/vsbuild/testinject_bin.vcxproj +++ b/vsbuild/testinject_bin.vcxproj @@ -22,32 +22,32 @@ 15.0 {5705ABC8-8CF4-4A1C-AACF-22554B38E04A} testinjectbin - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/testinject_dll.vcxproj b/vsbuild/testinject_dll.vcxproj index 5d8616fe..7d872001 100644 --- a/vsbuild/testinject_dll.vcxproj +++ b/vsbuild/testinject_dll.vcxproj @@ -22,32 +22,32 @@ 15.0 {D536BD2F-BA2D-4C70-A2F8-EF08580F8280} testinjectdll - 10.0.16299.0 + 10.0 DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/thooklib.vcxproj b/vsbuild/thooklib.vcxproj index 1dbdb82f..b95263dc 100644 --- a/vsbuild/thooklib.vcxproj +++ b/vsbuild/thooklib.vcxproj @@ -22,32 +22,32 @@ 15.0 {1CE90F86-126E-40AB-BD8B-08B25FD2E68E} thooklib - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/thooklib_test.vcxproj b/vsbuild/thooklib_test.vcxproj index 3cbff648..af19ce6c 100644 --- a/vsbuild/thooklib_test.vcxproj +++ b/vsbuild/thooklib_test.vcxproj @@ -22,32 +22,32 @@ 15.0 {931A68BE-AF5F-48C9-AFAE-C8DC08103E33} thooklibtest - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/tinjectlib.vcxproj b/vsbuild/tinjectlib.vcxproj index 41ca3368..da60a0a8 100644 --- a/vsbuild/tinjectlib.vcxproj +++ b/vsbuild/tinjectlib.vcxproj @@ -22,32 +22,32 @@ 15.0 {D18D0B1C-37B4-48A8-88C0-399DE2815C05} tinjectlib - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/tinjectlib_test.vcxproj b/vsbuild/tinjectlib_test.vcxproj index 77121770..57bf8785 100644 --- a/vsbuild/tinjectlib_test.vcxproj +++ b/vsbuild/tinjectlib_test.vcxproj @@ -22,32 +22,32 @@ 15.0 {5F393577-7E8E-43A4-B476-BFCC78147D0D} tinjectlibtest - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/tvfs_test.vcxproj b/vsbuild/tvfs_test.vcxproj index 65cf92d6..bee11a01 100644 --- a/vsbuild/tvfs_test.vcxproj +++ b/vsbuild/tvfs_test.vcxproj @@ -22,32 +22,32 @@ 15.0 {1DDD14EC-2274-4793-803E-B64D278AFD7A} usvfstest - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/udis86.vcxproj b/vsbuild/udis86.vcxproj index 1f7b72f8..5ad94eec 100644 --- a/vsbuild/udis86.vcxproj +++ b/vsbuild/udis86.vcxproj @@ -22,32 +22,32 @@ 15.0 {5B0E078A-D196-4EBB-BD6E-DCFB48B15E90} udis86 - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode @@ -192,4 +192,4 @@ - + \ No newline at end of file diff --git a/vsbuild/usvfs_dll.vcxproj b/vsbuild/usvfs_dll.vcxproj index 1973e02e..cb76b298 100644 --- a/vsbuild/usvfs_dll.vcxproj +++ b/vsbuild/usvfs_dll.vcxproj @@ -22,32 +22,32 @@ 15.0 {562B0058-4701-4284-8B40-D87648A3F64C} usvfsdll - 10.0.16299.0 + 10.0 DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/usvfs_helper.vcxproj b/vsbuild/usvfs_helper.vcxproj index e6c6fa3b..1bf2a8b6 100644 --- a/vsbuild/usvfs_helper.vcxproj +++ b/vsbuild/usvfs_helper.vcxproj @@ -22,32 +22,32 @@ 15.0 {BA5B2CAC-8B75-4C6B-83C7-FFB963E872B6} usvfshelper - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/vsbuild/usvfs_proxy.vcxproj b/vsbuild/usvfs_proxy.vcxproj index 92db5baf..a1ffb7be 100644 --- a/vsbuild/usvfs_proxy.vcxproj +++ b/vsbuild/usvfs_proxy.vcxproj @@ -22,32 +22,32 @@ 15.0 {50AC03C1-BB24-4033-90E6-ABE65BCC13DC} usvfsproxy - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/usvfs_test.vcxproj b/vsbuild/usvfs_test.vcxproj index cc3dbc0f..f4fe449d 100644 --- a/vsbuild/usvfs_test.vcxproj +++ b/vsbuild/usvfs_test.vcxproj @@ -22,32 +22,32 @@ 15.0 {CEAF96EC-0BAA-4C02-B91B-5C4C49B5455B} usvfstest - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/vsbuild/usvfs_test_runner.vcxproj b/vsbuild/usvfs_test_runner.vcxproj index 0ef7bbd1..b5d2818e 100644 --- a/vsbuild/usvfs_test_runner.vcxproj +++ b/vsbuild/usvfs_test_runner.vcxproj @@ -22,32 +22,32 @@ 15.0 {0452CB4D-A906-4717-94AC-7A450E479BE1} usvfstestrunner - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode From 80d50b0eff697d6672e0b29171df2ba511d39706 Mon Sep 17 00:00:00 2001 From: Silarn Date: Sat, 6 Apr 2019 02:36:13 -0500 Subject: [PATCH 3/3] Update the appveyor image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1a531dc9..271cd3e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: 1.0.{build} -image: Visual Studio 2017 +image: Visual Studio 2019 Preview configuration: Release platform: - x64