move to WindowsTargetPlatformVersion 10.x for x64 build targets and e…

…nabled permissive- where possible.
CobaltFusion · Jul 12, 2018 · 358ddb5 · 358ddb5
1 parent b8c3f35
commit 358ddb5
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 21 deletions.
diff --git a/CobaltFusion/CobaltFusion.vcxproj b/CobaltFusion/CobaltFusion.vcxproj
@@ -22,14 +22,14 @@
     <ProjectGuid>{218AB179-4C19-4264-BD55-DF89A9F321CA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CobaltFusion</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -42,7 +42,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -108,6 +108,7 @@
       <AdditionalIncludeDirectories>../include;../libsnappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -144,6 +145,7 @@
       <AdditionalIncludeDirectories>../include;../libsnappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/CobaltFusionTest/CobaltFusionTest.vcxproj b/CobaltFusionTest/CobaltFusionTest.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{30E249B7-F460-4FD3-9C45-58C55AEF7EF6}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CobaltFusionTest</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -108,6 +108,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +147,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/DbgMsgSrc/DbgMsgSrc.vcxproj b/DbgMsgSrc/DbgMsgSrc.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{722E0592-E026-4D51-87EC-6ACA85B385F4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DbgMsgSrc</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -112,6 +112,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -154,6 +155,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/DbgMsgSrc/dbgstream.h b/DbgMsgSrc/dbgstream.h
@@ -46,10 +46,10 @@ class basic_debugbuf : public std::basic_streambuf<Elem, Tr>
 	using int_type = std::basic_streambuf<Elem, Tr>::int_type;
 	virtual int_type overflow(int_type c) override
 	{
-		if (c == traits_type::eof())
+		if (c == std::basic_streambuf<Elem, Tr>::traits_type::eof())
 			return 0;
 
-		m_buf += traits_type::to_char_type(c);
+		m_buf += std::basic_streambuf<Elem, Tr>::traits_type::to_char_type(c);
 		if (c == '\n')
 			sync();
 		return c;

diff --git a/DebugView++/DebugView++.vcxproj b/DebugView++/DebugView++.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E37BA0C9-8A2F-4F2E-BBF8-839F3429D3A7}</ProjectGuid>
     <Keyword>AtlProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -157,6 +157,7 @@
       <AdditionalOptions>-Zm250 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -260,6 +261,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>

diff --git a/DebugView++Lib/DebugView++Lib.vcxproj b/DebugView++Lib/DebugView++Lib.vcxproj
@@ -23,7 +23,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DebugViewPPLib</RootNamespace>
     <ProjectName>DebugView++Lib</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -110,6 +110,7 @@
       <AdditionalIncludeDirectories>..\Libraries\TabbingFramework;..\Libraries\PropertyGrid;..\CobaltFusion;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm250 %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -152,6 +153,7 @@
       <AdditionalIncludeDirectories>..\Libraries\TabbingFramework;..\Libraries\PropertyGrid;..\CobaltFusion;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm250 %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/DebugView++Test/DebugView++Test.vcxproj b/DebugView++Test/DebugView++Test.vcxproj
@@ -23,7 +23,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DebugViewPPTest</RootNamespace>
     <ProjectName>DebugView++Test</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -115,6 +115,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -155,6 +156,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/DebugViewConsole/DebugViewConsole.vcxproj b/DebugViewConsole/DebugViewConsole.vcxproj
@@ -23,7 +23,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DebugViewConsole</RootNamespace>
     <ProjectName>DebugViewConsole</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -119,6 +119,7 @@
       <AdditionalIncludeDirectories>../include;../Libraries/docopt</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm250 /Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -159,6 +160,7 @@
       <AdditionalIncludeDirectories>../include;../Libraries/docopt</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm250 /Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj b/GDIGraphicsPOC/GDIGraphicsPOC.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{77DB6FEA-B721-4C03-A151-763ECF4A80DB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>GDIGraphicsPOC</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -114,6 +114,7 @@
       <AdditionalIncludeDirectories>TabbingFramework;..\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -152,6 +153,7 @@
       <AdditionalIncludeDirectories>TabbingFramework;..\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/IndexedStorageLib/IndexedStorageLib.vcxproj b/IndexedStorageLib/IndexedStorageLib.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{69756714-C1EB-47AF-B852-FF253D8DDDA8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>IndexedStorageLib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,6 +105,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,6 +144,7 @@
       <AdditionalIncludeDirectories>../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/Win32Lib/Win32Lib.vcxproj b/Win32Lib/Win32Lib.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{7AA3A43A-F0CD-4BD8-BC04-5A30F7260C38}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32Lib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,6 +105,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,6 +144,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/include/CobaltFusion/hstream.h b/include/CobaltFusion/hstream.h
@@ -32,7 +32,7 @@ class basic_handlebuf : public std::basic_streambuf<Elem, Tr>
 		{
 			DWORD written;
 			if (!WriteFile(m_handle, m_writeBuffer.data(), static_cast<DWORD>(m_writeBuffer.size()), &written, nullptr))
-				return traits_type::eof();
+				return std::basic_streambuf<Elem, Tr>::traits_type::eof();
 
 			m_writeBuffer.clear();
 		}
@@ -41,10 +41,10 @@ class basic_handlebuf : public std::basic_streambuf<Elem, Tr>
 
     virtual int_type overflow(int_type c) override
 	{
-		if (c == traits_type::eof())
+		if (c == std::basic_streambuf<Elem, Tr>::traits_type::eof())
 			return c;
 
-		m_writeBuffer.push_back(traits_type::to_char_type(c));
+		m_writeBuffer.push_back(std::basic_streambuf<Elem, Tr>::traits_type::to_char_type(c));
 		if (c == '\n')
 			sync();
 		return c;
@@ -53,7 +53,7 @@ class basic_handlebuf : public std::basic_streambuf<Elem, Tr>
     virtual int_type underflow() override
 	{
 		if (gptr() < egptr()) // buffer not exhausted
-			return traits_type::to_int_type(*gptr());
+			return std::basic_streambuf<Elem, Tr>::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<Elem, Tr>
 		// Read from m_handle in to the provided buffer
 		DWORD read;
 		if (!ReadFile(m_handle, start, static_cast<DWORD>((m_readBuffer.size() - (start - base))*sizeof(Elem)), &read, nullptr) || read == 0)
-			return traits_type::eof();
+			return std::basic_streambuf<Elem, Tr>::traits_type::eof();
 
 		// Set buffer pointers
 		setg(base, start, start + read/sizeof(Elem));
 
-		return traits_type::to_int_type(*gptr());
+		return std::basic_streambuf<Elem, Tr>::traits_type::to_int_type(*gptr());
 	}
 
 private:

diff --git 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
@@ -22,7 +22,7 @@
     <ProjectGuid>{B1AEE15F-4CAF-4ACA-B5DC-756EC3AFA77A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libsnappy</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -107,6 +107,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,6 +144,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>