From 358ddb526e2435f2e8f0a2362a74bcb01310b605 Mon Sep 17 00:00:00 2001 From: Jan Wilmans Date: Thu, 12 Jul 2018 02:27:14 +0200 Subject: [PATCH] move to WindowsTargetPlatformVersion 10.x for x64 build targets and enabled permissive- where possible. --- CobaltFusion/CobaltFusion.vcxproj | 8 +++++--- CobaltFusionTest/CobaltFusionTest.vcxproj | 4 +++- DbgMsgSrc/DbgMsgSrc.vcxproj | 4 +++- DbgMsgSrc/dbgstream.h | 4 ++-- DebugView++/DebugView++.vcxproj | 4 +++- DebugView++Lib/DebugView++Lib.vcxproj | 4 +++- DebugView++Test/DebugView++Test.vcxproj | 4 +++- DebugViewConsole/DebugViewConsole.vcxproj | 4 +++- GDIGraphicsPOC/GDIGraphicsPOC.vcxproj | 4 +++- IndexedStorageLib/IndexedStorageLib.vcxproj | 4 +++- Win32Lib/Win32Lib.vcxproj | 4 +++- include/CobaltFusion/hstream.h | 12 ++++++------ include/Win32/Win32Lib.h | 2 ++ libsnappy/libsnappy.vcxproj | 4 +++- 14 files changed, 45 insertions(+), 21 deletions(-) diff --git a/CobaltFusion/CobaltFusion.vcxproj b/CobaltFusion/CobaltFusion.vcxproj index d360c1af..67fd2c93 100644 --- a/CobaltFusion/CobaltFusion.vcxproj +++ b/CobaltFusion/CobaltFusion.vcxproj @@ -22,14 +22,14 @@ {218AB179-4C19-4264-BD55-DF89A9F321CA} Win32Proj CobaltFusion - 8.1 + 10.0.17134.0 StaticLibrary true Unicode - v141 + v141_xp StaticLibrary @@ -42,7 +42,7 @@ false true Unicode - v141 + v141_xp StaticLibrary @@ -108,6 +108,7 @@ ../include;../libsnappy;%(AdditionalIncludeDirectories) MultiThreadedDebug true + true Windows @@ -144,6 +145,7 @@ ../include;../libsnappy;%(AdditionalIncludeDirectories) MultiThreaded true + true Windows diff --git a/CobaltFusionTest/CobaltFusionTest.vcxproj b/CobaltFusionTest/CobaltFusionTest.vcxproj index 9f9ac679..24dfaf58 100644 --- a/CobaltFusionTest/CobaltFusionTest.vcxproj +++ b/CobaltFusionTest/CobaltFusionTest.vcxproj @@ -22,7 +22,7 @@ {30E249B7-F460-4FD3-9C45-58C55AEF7EF6} Win32Proj CobaltFusionTest - 8.1 + 10.0.17134.0 @@ -108,6 +108,7 @@ ../include MultiThreadedDebug true + true Console @@ -146,6 +147,7 @@ ../include MultiThreaded true + true Console diff --git a/DbgMsgSrc/DbgMsgSrc.vcxproj b/DbgMsgSrc/DbgMsgSrc.vcxproj index 4ce75875..e2be8398 100644 --- a/DbgMsgSrc/DbgMsgSrc.vcxproj +++ b/DbgMsgSrc/DbgMsgSrc.vcxproj @@ -22,7 +22,7 @@ {722E0592-E026-4D51-87EC-6ACA85B385F4} Win32Proj DbgMsgSrc - 8.1 + 10.0.17134.0 @@ -112,6 +112,7 @@ MultiThreadedDebug /Zc:strictStrings %(AdditionalOptions) true + true Console @@ -154,6 +155,7 @@ MultiThreaded /Zc:strictStrings %(AdditionalOptions) true + true Console diff --git a/DbgMsgSrc/dbgstream.h b/DbgMsgSrc/dbgstream.h index 4d5c2833..69e94ab9 100644 --- a/DbgMsgSrc/dbgstream.h +++ b/DbgMsgSrc/dbgstream.h @@ -46,10 +46,10 @@ class basic_debugbuf : public std::basic_streambuf using int_type = std::basic_streambuf::int_type; virtual int_type overflow(int_type c) override { - if (c == traits_type::eof()) + if (c == std::basic_streambuf::traits_type::eof()) return 0; - m_buf += traits_type::to_char_type(c); + m_buf += std::basic_streambuf::traits_type::to_char_type(c); if (c == '\n') sync(); return c; diff --git a/DebugView++/DebugView++.vcxproj b/DebugView++/DebugView++.vcxproj index 8a5fc372..0f0a71ee 100644 --- a/DebugView++/DebugView++.vcxproj +++ b/DebugView++/DebugView++.vcxproj @@ -21,7 +21,7 @@ {E37BA0C9-8A2F-4F2E-BBF8-839F3429D3A7} AtlProj - 8.1 + 10.0.17134.0 @@ -157,6 +157,7 @@ -Zm250 %(AdditionalOptions) MultiThreadedDebug true + false false @@ -260,6 +261,7 @@ true MultiThreaded true + false false diff --git a/DebugView++Lib/DebugView++Lib.vcxproj b/DebugView++Lib/DebugView++Lib.vcxproj index ad581319..4790e9d1 100644 --- a/DebugView++Lib/DebugView++Lib.vcxproj +++ b/DebugView++Lib/DebugView++Lib.vcxproj @@ -23,7 +23,7 @@ Win32Proj DebugViewPPLib DebugView++Lib - 8.1 + 10.0.17134.0 @@ -110,6 +110,7 @@ ..\Libraries\TabbingFramework;..\Libraries\PropertyGrid;..\CobaltFusion;..\include;%(AdditionalIncludeDirectories) -Zm250 %(AdditionalOptions) true + false Windows @@ -152,6 +153,7 @@ ..\Libraries\TabbingFramework;..\Libraries\PropertyGrid;..\CobaltFusion;..\include;%(AdditionalIncludeDirectories) -Zm250 %(AdditionalOptions) true + false Windows diff --git a/DebugView++Test/DebugView++Test.vcxproj b/DebugView++Test/DebugView++Test.vcxproj index 9c2ee211..3806331e 100644 --- a/DebugView++Test/DebugView++Test.vcxproj +++ b/DebugView++Test/DebugView++Test.vcxproj @@ -23,7 +23,7 @@ Win32Proj DebugViewPPTest DebugView++Test - 8.1 + 10.0.17134.0 @@ -115,6 +115,7 @@ ../include /Zc:strictStrings %(AdditionalOptions) true + true Console @@ -155,6 +156,7 @@ ../include /Zc:strictStrings %(AdditionalOptions) true + true Console diff --git a/DebugViewConsole/DebugViewConsole.vcxproj b/DebugViewConsole/DebugViewConsole.vcxproj index 592fea54..95fcf730 100644 --- a/DebugViewConsole/DebugViewConsole.vcxproj +++ b/DebugViewConsole/DebugViewConsole.vcxproj @@ -23,7 +23,7 @@ Win32Proj DebugViewConsole DebugViewConsole - 8.1 + 10.0.17134.0 @@ -119,6 +119,7 @@ ../include;../Libraries/docopt -Zm250 /Zc:strictStrings %(AdditionalOptions) true + false Console @@ -159,6 +160,7 @@ ../include;../Libraries/docopt -Zm250 /Zc:strictStrings %(AdditionalOptions) true + false Console diff --git a/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj b/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj index e215f0e9..23c68475 100644 --- a/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj +++ b/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj @@ -22,7 +22,7 @@ {77DB6FEA-B721-4C03-A151-763ECF4A80DB} Win32Proj GDIGraphicsPOC - 8.1 + 10.0.17134.0 @@ -114,6 +114,7 @@ TabbingFramework;..\include MultiThreadedDebug true + false Windows @@ -152,6 +153,7 @@ TabbingFramework;..\include MultiThreaded true + false Windows diff --git a/IndexedStorageLib/IndexedStorageLib.vcxproj b/IndexedStorageLib/IndexedStorageLib.vcxproj index b043c87f..c5507ead 100644 --- a/IndexedStorageLib/IndexedStorageLib.vcxproj +++ b/IndexedStorageLib/IndexedStorageLib.vcxproj @@ -22,7 +22,7 @@ {69756714-C1EB-47AF-B852-FF253D8DDDA8} Win32Proj IndexedStorageLib - 8.1 + 10.0.17134.0 @@ -105,6 +105,7 @@ ../include /permissive- %(AdditionalOptions) true + true Windows @@ -143,6 +144,7 @@ ../include /permissive- %(AdditionalOptions) true + true Windows diff --git a/Win32Lib/Win32Lib.vcxproj b/Win32Lib/Win32Lib.vcxproj index bc505b52..69aa79b3 100644 --- a/Win32Lib/Win32Lib.vcxproj +++ b/Win32Lib/Win32Lib.vcxproj @@ -22,7 +22,7 @@ {7AA3A43A-F0CD-4BD8-BC04-5A30F7260C38} Win32Proj Win32Lib - 8.1 + 10.0.17134.0 @@ -105,6 +105,7 @@ MultiThreadedDebug /Zc:strictStrings %(AdditionalOptions) true + true Windows @@ -143,6 +144,7 @@ MultiThreaded /Zc:strictStrings %(AdditionalOptions) true + true Windows diff --git a/include/CobaltFusion/hstream.h b/include/CobaltFusion/hstream.h index ac873098..35a0d45f 100644 --- a/include/CobaltFusion/hstream.h +++ b/include/CobaltFusion/hstream.h @@ -32,7 +32,7 @@ class basic_handlebuf : public std::basic_streambuf { DWORD written; if (!WriteFile(m_handle, m_writeBuffer.data(), static_cast(m_writeBuffer.size()), &written, nullptr)) - return traits_type::eof(); + return std::basic_streambuf::traits_type::eof(); m_writeBuffer.clear(); } @@ -41,10 +41,10 @@ class basic_handlebuf : public std::basic_streambuf virtual int_type overflow(int_type c) override { - if (c == traits_type::eof()) + if (c == std::basic_streambuf::traits_type::eof()) return c; - m_writeBuffer.push_back(traits_type::to_char_type(c)); + m_writeBuffer.push_back(std::basic_streambuf::traits_type::to_char_type(c)); if (c == '\n') sync(); return c; @@ -53,7 +53,7 @@ class basic_handlebuf : public std::basic_streambuf virtual int_type underflow() override { if (gptr() < egptr()) // buffer not exhausted - return traits_type::to_int_type(*gptr()); + return std::basic_streambuf::traits_type::to_int_type(*gptr()); Elem* base = &m_readBuffer.front(); Elem* start = base; @@ -69,12 +69,12 @@ class basic_handlebuf : public std::basic_streambuf // Read from m_handle in to the provided buffer DWORD read; if (!ReadFile(m_handle, start, static_cast((m_readBuffer.size() - (start - base))*sizeof(Elem)), &read, nullptr) || read == 0) - return traits_type::eof(); + return std::basic_streambuf::traits_type::eof(); // Set buffer pointers setg(base, start, start + read/sizeof(Elem)); - return traits_type::to_int_type(*gptr()); + return std::basic_streambuf::traits_type::to_int_type(*gptr()); } private: diff --git a/include/Win32/Win32Lib.h b/include/Win32/Win32Lib.h index 09db83cf..886b8b00 100644 --- a/include/Win32/Win32Lib.h +++ b/include/Win32/Win32Lib.h @@ -199,9 +199,11 @@ void SetEvent(HANDLE hEvent); Handle CreateMutex(const SECURITY_ATTRIBUTES* pMutexAttributes, bool initialOwner, const wchar_t* pName); +#ifdef DACL_MODIFY void SetSecurityInfo(HANDLE hObject, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, const PSID psidOwner, const PSID psidGroup, const PACL pDacl, const PACL pSacl); void DeleteObjectDACL(HANDLE hObject); void AdjustObjectDACL(HANDLE hObject); +#endif void SetPrivilege(const wchar_t* privilege, bool enablePrivilege); void SetPrivilege(HANDLE hToken, const wchar_t* privilege, bool enablePrivilege); diff --git a/libsnappy/libsnappy.vcxproj b/libsnappy/libsnappy.vcxproj index 729c8007..2b06402f 100644 --- a/libsnappy/libsnappy.vcxproj +++ b/libsnappy/libsnappy.vcxproj @@ -22,7 +22,7 @@ {B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A} Win32Proj libsnappy - 8.1 + 10.0.17134.0 @@ -107,6 +107,7 @@ MultiThreadedDebug /permissive- %(AdditionalOptions) true + true Windows @@ -143,6 +144,7 @@ MultiThreaded /permissive- %(AdditionalOptions) true + true Windows