Skip to content

Commit 425389d

Browse files
committed
Code review and other improvements
1 parent 7b5380c commit 425389d

23 files changed

+13348
-5300
lines changed

Console/Console.cpp

Lines changed: 3079 additions & 425 deletions
Large diffs are not rendered by default.

Console/Console.vcxproj

Lines changed: 69 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -19,9 +19,9 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<VCProjectVersion>16.0</VCProjectVersion>
22+
<VCProjectVersion>17.0</VCProjectVersion>
2323
<Keyword>Win32Proj</Keyword>
24-
<ProjectGuid>{d5c7954f-a7b1-4806-855d-6ee2b1d4aad3}</ProjectGuid>
24+
<ProjectGuid>{91B8CCE1-6F06-4EE6-B632-A493CADDFEE1}</ProjectGuid>
2525
<RootNamespace>Console</RootNamespace>
2626
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
@@ -36,7 +36,7 @@
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
39-
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
<WholeProgramOptimization>false</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -49,7 +49,7 @@
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v143</PlatformToolset>
52-
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<WholeProgramOptimization>false</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -70,74 +70,122 @@
7070
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7171
</ImportGroup>
7272
<PropertyGroup Label="UserMacros" />
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74+
<TargetName>$(ProjectName)32</TargetName>
75+
<LinkIncremental>false</LinkIncremental>
76+
<OutDir>$(SolutionDir)build\</OutDir>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79+
<TargetName>$(ProjectName)32</TargetName>
80+
<LinkIncremental>false</LinkIncremental>
81+
<OutDir>$(SolutionDir)build\</OutDir>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
84+
<TargetName>$(ProjectName)</TargetName>
85+
<OutDir>$(SolutionDir)build\</OutDir>
86+
<LinkIncremental>false</LinkIncremental>
87+
</PropertyGroup>
88+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
89+
<TargetName>$(ProjectName)</TargetName>
90+
<OutDir>$(SolutionDir)build\</OutDir>
91+
<LinkIncremental>false</LinkIncremental>
92+
</PropertyGroup>
7393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7494
<ClCompile>
7595
<WarningLevel>Level3</WarningLevel>
76-
<SDLCheck>true</SDLCheck>
96+
<SDLCheck>false</SDLCheck>
7797
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7898
<ConformanceMode>true</ConformanceMode>
99+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
100+
<SupportJustMyCode>false</SupportJustMyCode>
101+
<BufferSecurityCheck>false</BufferSecurityCheck>
102+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
103+
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
104+
<LanguageStandard>stdcpp20</LanguageStandard>
105+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
79106
</ClCompile>
80107
<Link>
81108
<SubSystem>Console</SubSystem>
82109
<GenerateDebugInformation>true</GenerateDebugInformation>
83-
<GenerateMapFile>true</GenerateMapFile>
110+
<OptimizeReferences>false</OptimizeReferences>
111+
<EnableCOMDATFolding>false</EnableCOMDATFolding>
112+
<AdditionalDependencies>ntdll.lib;psapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
84113
</Link>
85114
</ItemDefinitionGroup>
86115
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87116
<ClCompile>
88117
<WarningLevel>Level3</WarningLevel>
89118
<FunctionLevelLinking>true</FunctionLevelLinking>
90119
<IntrinsicFunctions>true</IntrinsicFunctions>
91-
<SDLCheck>true</SDLCheck>
120+
<SDLCheck>false</SDLCheck>
92121
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93122
<ConformanceMode>true</ConformanceMode>
123+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
124+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
125+
<BufferSecurityCheck>false</BufferSecurityCheck>
126+
<LanguageStandard>stdcpp20</LanguageStandard>
127+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
94128
</ClCompile>
95129
<Link>
96130
<SubSystem>Console</SubSystem>
97-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
98-
<OptimizeReferences>true</OptimizeReferences>
131+
<EnableCOMDATFolding>false</EnableCOMDATFolding>
132+
<OptimizeReferences>false</OptimizeReferences>
99133
<GenerateDebugInformation>true</GenerateDebugInformation>
100-
<GenerateMapFile>true</GenerateMapFile>
134+
<AdditionalDependencies>ntdll.lib;psapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
101135
</Link>
102136
</ItemDefinitionGroup>
103137
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
104138
<ClCompile>
105139
<WarningLevel>Level3</WarningLevel>
106-
<SDLCheck>true</SDLCheck>
140+
<SDLCheck>false</SDLCheck>
107141
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108142
<ConformanceMode>true</ConformanceMode>
143+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
144+
<SupportJustMyCode>false</SupportJustMyCode>
145+
<BufferSecurityCheck>false</BufferSecurityCheck>
146+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
147+
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
148+
<LanguageStandard>stdcpp20</LanguageStandard>
149+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
109150
</ClCompile>
110151
<Link>
111152
<SubSystem>Console</SubSystem>
112153
<GenerateDebugInformation>true</GenerateDebugInformation>
113-
<GenerateMapFile>true</GenerateMapFile>
154+
<OptimizeReferences>false</OptimizeReferences>
155+
<EnableCOMDATFolding>false</EnableCOMDATFolding>
156+
<AdditionalDependencies>ntdll.lib;psapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
114157
</Link>
115158
</ItemDefinitionGroup>
116159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117160
<ClCompile>
118161
<WarningLevel>Level3</WarningLevel>
119162
<FunctionLevelLinking>true</FunctionLevelLinking>
120163
<IntrinsicFunctions>true</IntrinsicFunctions>
121-
<SDLCheck>true</SDLCheck>
164+
<SDLCheck>false</SDLCheck>
122165
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123166
<ConformanceMode>true</ConformanceMode>
167+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
168+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
169+
<BufferSecurityCheck>false</BufferSecurityCheck>
170+
<LanguageStandard>stdcpp20</LanguageStandard>
171+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
124172
</ClCompile>
125173
<Link>
126174
<SubSystem>Console</SubSystem>
127-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
128-
<OptimizeReferences>true</OptimizeReferences>
175+
<EnableCOMDATFolding>false</EnableCOMDATFolding>
176+
<OptimizeReferences>false</OptimizeReferences>
129177
<GenerateDebugInformation>true</GenerateDebugInformation>
130-
<GenerateMapFile>true</GenerateMapFile>
178+
<AdditionalDependencies>ntdll.lib;psapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
131179
</Link>
132180
</ItemDefinitionGroup>
133181
<ItemGroup>
134182
<ClCompile Include="Console.cpp" />
135-
<ClCompile Include="Detours.cpp" />
136-
<ClCompile Include="Terminal.cpp" />
183+
<ClCompile Include="Detours\Detours.cpp" />
184+
<ClCompile Include="Terminal\Terminal.cpp" />
137185
</ItemGroup>
138186
<ItemGroup>
139-
<ClInclude Include="Detours.h" />
140-
<ClInclude Include="Terminal.h" />
187+
<ClInclude Include="Detours\Detours.h" />
188+
<ClInclude Include="Terminal\Terminal.h" />
141189
</ItemGroup>
142190
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
143191
<ImportGroup Label="ExtensionTargets">

Console/Console.vcxproj.filters

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,30 @@
1313
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
16+
<Filter Include="Detours">
17+
<UniqueIdentifier>{dc79b947-45b3-4c94-a425-5db4fc0bfd54}</UniqueIdentifier>
18+
</Filter>
19+
<Filter Include="Terminal">
20+
<UniqueIdentifier>{42c765fe-42ee-4d1f-8dbc-8788dc7a632f}</UniqueIdentifier>
21+
</Filter>
1622
</ItemGroup>
1723
<ItemGroup>
1824
<ClCompile Include="Console.cpp">
1925
<Filter>Исходные файлы</Filter>
2026
</ClCompile>
21-
<ClCompile Include="Detours.cpp">
22-
<Filter>Исходные файлы</Filter>
27+
<ClCompile Include="Detours\Detours.cpp">
28+
<Filter>Detours</Filter>
2329
</ClCompile>
24-
<ClCompile Include="Terminal.cpp">
25-
<Filter>Исходные файлы</Filter>
30+
<ClCompile Include="Terminal\Terminal.cpp">
31+
<Filter>Terminal</Filter>
2632
</ClCompile>
2733
</ItemGroup>
2834
<ItemGroup>
29-
<ClInclude Include="Detours.h">
30-
<Filter>Файлы заголовков</Filter>
35+
<ClInclude Include="Detours\Detours.h">
36+
<Filter>Detours</Filter>
3137
</ClInclude>
32-
<ClInclude Include="Terminal.h">
33-
<Filter>Файлы заголовков</Filter>
38+
<ClInclude Include="Terminal\Terminal.h">
39+
<Filter>Terminal</Filter>
3440
</ClInclude>
3541
</ItemGroup>
3642
</Project>

0 commit comments

Comments
 (0)