Skip to content

Commit 7ef0467

Browse files
benoit-mortgat-stormshieldbenoit-mortgat-stormshield
committed
Use MSVC 143
1 parent 979b15a commit 7ef0467

File tree

2 files changed

+125
-106
lines changed

2 files changed

+125
-106
lines changed

‎src/HiveSwarming.vcxproj‎

Lines changed: 124 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,125 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
9-
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Debug|x64">
13-
<Configuration>Debug</Configuration>
14-
<Platform>x64</Platform>
15-
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Release|x64">
17-
<Configuration>Release</Configuration>
18-
<Platform>x64</Platform>
19-
</ProjectConfiguration>
20-
</ItemGroup>
21-
<ItemGroup>
22-
<ClCompile Include="RegfileToInternal.cpp" />
23-
<ClCompile Include="HiveToInternal.cpp" />
24-
<ClCompile Include="InternalToRegfile.cpp" />
25-
<ClCompile Include="InternalToHive.cpp" />
26-
<ClCompile Include="HiveSwarming.cpp" />
27-
<ClCompile Include="CommonFunctions.cpp" />
28-
</ItemGroup>
29-
<ItemGroup>
30-
<ClInclude Include="Constants.h" />
31-
<ClInclude Include="Conversions.h" />
32-
<ClInclude Include="CommonFunctions.h" />
33-
<ClInclude Include="resource.h" />
34-
</ItemGroup>
35-
<ItemGroup>
36-
<ResourceCompile Include="HiveSwarming.rc" />
37-
</ItemGroup>
38-
<PropertyGroup Label="Globals">
39-
<VCProjectVersion>16.0</VCProjectVersion>
40-
<ProjectGuid>{00DC3B6B-A592-4736-9CA9-130E4DF06CD4}</ProjectGuid>
41-
<RootNamespace>HiveSwarming</RootNamespace>
42-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
43-
</PropertyGroup>
44-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
45-
<PropertyGroup>
46-
<ConfigurationType>Application</ConfigurationType>
47-
<PlatformToolset>v142</PlatformToolset>
48-
<CharacterSet>Unicode</CharacterSet>
49-
<outdir>$(projectdir)output\$(platform)\$(configuration)\</outdir>
50-
<intdir>$(projectdir)intermediate\$(platform)\$(configuration)\</intdir>
51-
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
53-
<UseDebugLibraries>true</UseDebugLibraries>
54-
<LinkIncremental>true</LinkIncremental>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
57-
<UseDebugLibraries>false</UseDebugLibraries>
58-
<WholeProgramOptimization>true</WholeProgramOptimization>
59-
<LinkIncremental>false</LinkIncremental>
60-
</PropertyGroup>
61-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
62-
<ImportGroup Label="ExtensionSettings">
63-
</ImportGroup>
64-
<ImportGroup Label="Shared">
65-
</ImportGroup>
66-
<ImportGroup Label="PropertySheets">
67-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68-
</ImportGroup>
69-
<PropertyGroup Label="UserMacros" />
70-
<ItemDefinitionGroup>
71-
<ClCompile>
72-
<WarningLevel>Level3</WarningLevel>
73-
<SDLCheck>true</SDLCheck>
74-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75-
<ConformanceMode>true</ConformanceMode>
76-
<LanguageStandard>stdcpplatest</LanguageStandard>
77-
</ClCompile>
78-
<Link>
79-
<SubSystem>Console</SubSystem>
80-
<GenerateDebugInformation>true</GenerateDebugInformation>
81-
</Link>
82-
</ItemDefinitionGroup>
83-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
84-
<ClCompile>
85-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
87-
</ClCompile>
88-
<Link>
89-
</Link>
90-
</ItemDefinitionGroup>
91-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
92-
<ClCompile>
93-
<FunctionLevelLinking>true</FunctionLevelLinking>
94-
<IntrinsicFunctions>true</IntrinsicFunctions>
95-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
97-
</ClCompile>
98-
<Link>
99-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
100-
<OptimizeReferences>true</OptimizeReferences>
101-
</Link>
102-
</ItemDefinitionGroup>
103-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
104-
<ImportGroup Label="ExtensionTargets">
105-
</ImportGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
5+
<ProjectConfiguration Include="Debug|Win32">
6+
<Configuration>Debug</Configuration>
7+
<Platform>Win32</Platform>
8+
</ProjectConfiguration>
9+
<ProjectConfiguration Include="Release|Win32">
10+
<Configuration>Release</Configuration>
11+
<Platform>Win32</Platform>
12+
</ProjectConfiguration>
13+
<ProjectConfiguration Include="Debug|x64">
14+
<Configuration>Debug</Configuration>
15+
<Platform>x64</Platform>
16+
</ProjectConfiguration>
17+
<ProjectConfiguration Include="Release|x64">
18+
<Configuration>Release</Configuration>
19+
<Platform>x64</Platform>
20+
</ProjectConfiguration>
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ClCompile Include="RegfileToInternal.cpp" />
25+
<ClCompile Include="HiveToInternal.cpp" />
26+
<ClCompile Include="InternalToRegfile.cpp" />
27+
<ClCompile Include="InternalToHive.cpp" />
28+
<ClCompile Include="HiveSwarming.cpp" />
29+
<ClCompile Include="CommonFunctions.cpp" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ClInclude Include="Constants.h" />
34+
<ClInclude Include="Conversions.h" />
35+
<ClInclude Include="CommonFunctions.h" />
36+
<ClInclude Include="resource.h" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<ResourceCompile Include="HiveSwarming.rc" />
41+
</ItemGroup>
42+
43+
<PropertyGroup Label="Globals">
44+
<VCProjectVersion>16.0</VCProjectVersion>
45+
<ProjectGuid>{00DC3B6B-A592-4736-9CA9-130E4DF06CD4}</ProjectGuid>
46+
<RootNamespace>HiveSwarming</RootNamespace>
47+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
48+
</PropertyGroup>
49+
50+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
51+
52+
<PropertyGroup>
53+
<ConfigurationType>Application</ConfigurationType>
54+
<PlatformToolset>v143</PlatformToolset>
55+
<CharacterSet>Unicode</CharacterSet>
56+
<outdir>$(projectdir)output\$(platform)\$(configuration)\</outdir>
57+
<intdir>$(projectdir)intermediate\$(platform)\$(configuration)\</intdir>
58+
</PropertyGroup>
59+
60+
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
61+
<UseDebugLibraries>true</UseDebugLibraries>
62+
<LinkIncremental>true</LinkIncremental>
63+
</PropertyGroup>
64+
65+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
66+
<UseDebugLibraries>false</UseDebugLibraries>
67+
<WholeProgramOptimization>true</WholeProgramOptimization>
68+
<LinkIncremental>false</LinkIncremental>
69+
</PropertyGroup>
70+
71+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
72+
73+
<ImportGroup Label="ExtensionSettings">
74+
</ImportGroup>
75+
76+
<ImportGroup Label="Shared">
77+
</ImportGroup>
78+
79+
<ImportGroup Label="PropertySheets">
80+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
81+
</ImportGroup>
82+
83+
<PropertyGroup Label="UserMacros" />
84+
85+
<ItemDefinitionGroup>
86+
<ClCompile>
87+
<WarningLevel>Level3</WarningLevel>
88+
<SDLCheck>true</SDLCheck>
89+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90+
<ConformanceMode>true</ConformanceMode>
91+
<LanguageStandard>stdcpplatest</LanguageStandard>
92+
</ClCompile>
93+
<Link>
94+
<SubSystem>Console</SubSystem>
95+
<GenerateDebugInformation>true</GenerateDebugInformation>
96+
</Link>
97+
</ItemDefinitionGroup>
98+
99+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
100+
<ClCompile>
101+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
103+
</ClCompile>
104+
<Link>
105+
</Link>
106+
</ItemDefinitionGroup>
107+
108+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
109+
<ClCompile>
110+
<FunctionLevelLinking>true</FunctionLevelLinking>
111+
<IntrinsicFunctions>true</IntrinsicFunctions>
112+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
114+
</ClCompile>
115+
<Link>
116+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
117+
<OptimizeReferences>true</OptimizeReferences>
118+
</Link>
119+
</ItemDefinitionGroup>
120+
121+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
122+
123+
<ImportGroup Label="ExtensionTargets">
124+
</ImportGroup>
106125
</Project>

‎src/RegfileToInternal.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static HRESULT ValueListToInternal
157157
{
158158
std::wstring ReadValue{ &ValueList[0], 8 };
159159
std::wistringstream DwordReadingStream{ ReadValue, std::ios_base::in };
160-
DwordReadingStream >> std::hex >> std::setw(8) >> std::setfill(L'0') >> DwordValue;
160+
DwordReadingStream >> std::hex >> DwordValue;
161161

162162
std::wostringstream DwordVerificationStream;
163163
DwordVerificationStream << std::hex << std::setw(8) << std::setfill(L'0') << DwordValue;

0 commit comments

Comments
 (0)