timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-06-14 03:16:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to VS2017

Browse Source
This commit is contained in:
ge0rdi
2017-12-23 20:25:22 +01:00
parent 2c670949da
commit 58597db5f0
132 changed files with 7085 additions and 11001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClassicShellSrc/ClassicShellLib/ClassicShellLib.rc
+1 -1
View File
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcproj
-510
View File
@@ -1,510 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="ClassicShellLib"
ProjectGUID="{D42FE717-485B-492D-884A-1999F6D51154}"
RootNamespace="ClassicShellLib"
SccProjectName="Perforce Project"
SccLocalPath=".."
SccProvider="MSSCCI:Perforce SCM"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:X86"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(ConfigurationName)64"
IntermediateDirectory="$(ConfigurationName)64"
ConfigurationType="4"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:X64"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
UseOfATL="1"
CharacterSet="1"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:X86"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(ConfigurationName)64"
IntermediateDirectory="$(ConfigurationName)64"
ConfigurationType="4"
UseOfATL="1"
CharacterSet="1"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:X64"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath="..\ClassicShellSetup\ClassicShell.ico"
>
</File>
<File
RelativePath=".\ClassicShellLib.rc"
>
</File>
<File
RelativePath=".\flags.bmp"
>
</File>
<File
RelativePath=".\flags24.bmp"
>
</File>
<File
RelativePath=".\padlock.ico"
>
</File>
<File
RelativePath=".\play.ico"
>
</File>
<File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\warning.ico"
>
</File>
</Filter>
<Filter
Name="Strings"
>
<File
RelativePath=".\Assert.cpp"
>
</File>
<File
RelativePath=".\Assert.h"
>
</File>
<File
RelativePath=".\FNVHash.cpp"
>
</File>
<File
RelativePath=".\FNVHash.h"
>
</File>
<File
RelativePath=".\StringSet.cpp"
>
</File>
<File
RelativePath=".\StringSet.h"
>
</File>
<File
RelativePath=".\StringUtils.cpp"
>
</File>
<File
RelativePath=".\StringUtils.h"
>
</File>
</Filter>
<Filter
Name="Resources"
>
<File
RelativePath=".\ComHelper.h"
>
</File>
<File
RelativePath=".\FileHelper.cpp"
>
</File>
<File
RelativePath=".\FileHelper.h"
>
</File>
<File
RelativePath=".\IatHookHelper.cpp"
>
</File>
<File
RelativePath=".\IatHookHelper.h"
>
</File>
<File
RelativePath=".\Instance.cpp"
>
</File>
<File
RelativePath=".\ResourceHelper.cpp"
>
</File>
<File
RelativePath=".\ResourceHelper.h"
>
</File>
<File
RelativePath=".\TrackResources.cpp"
>
</File>
<File
RelativePath=".\TrackResources.h"
>
</File>
</Filter>
<Filter
Name="Settings"
>
<File
RelativePath=".\DownloadHelper.cpp"
>
</File>
<File
RelativePath=".\DownloadHelper.h"
>
</File>
<File
RelativePath=".\LanguageSettingsHelper.cpp"
>
</File>
<File
RelativePath=".\LanguageSettingsHelper.h"
>
</File>
<File
RelativePath=".\Settings.cpp"
>
</File>
<File
RelativePath=".\Settings.h"
>
</File>
<File
RelativePath=".\SettingsParser.cpp"
>
</File>
<File
RelativePath=".\SettingsParser.h"
>
</File>
<File
RelativePath=".\SettingsUIHelper.cpp"
>
</File>
<File
RelativePath=".\SettingsUIHelper.h"
>
</File>
<File
RelativePath=".\Translations.cpp"
>
</File>
<File
RelativePath=".\Translations.h"
>
</File>
</Filter>
<Filter
Name="Lib"
>
<File
RelativePath=".\stdafx.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\stdafx.h"
>
</File>
<File
RelativePath=".\targetver.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj
+191
View File
@@ -0,0 +1,191 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D42FE717-485B-492D-884A-1999F6D51154}</ProjectGuid>
<RootNamespace>ClassicShellLib</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(Configuration)64\</OutDir>
<IntDir>$(Configuration)64\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(Configuration)64\</OutDir>
<IntDir>$(Configuration)64\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<Image Include="..\ClassicShellSetup\ClassicShell.ico" />
<Image Include="flags.bmp" />
<Image Include="flags24.bmp" />
<Image Include="padlock.ico" />
<Image Include="play.ico" />
<Image Include="warning.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ClassicShellLib.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Assert.h" />
<ClInclude Include="ComHelper.h" />
<ClInclude Include="DownloadHelper.h" />
<ClInclude Include="FileHelper.h" />
<ClInclude Include="FNVHash.h" />
<ClInclude Include="IatHookHelper.h" />
<ClInclude Include="LanguageSettingsHelper.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="ResourceHelper.h" />
<ClInclude Include="Settings.h" />
<ClInclude Include="SettingsParser.h" />
<ClInclude Include="SettingsUIHelper.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="StringSet.h" />
<ClInclude Include="StringUtils.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="TrackResources.h" />
<ClInclude Include="Translations.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Assert.cpp" />
<ClCompile Include="DownloadHelper.cpp" />
<ClCompile Include="FileHelper.cpp" />
<ClCompile Include="FNVHash.cpp" />
<ClCompile Include="IatHookHelper.cpp" />
<ClCompile Include="Instance.cpp" />
<ClCompile Include="LanguageSettingsHelper.cpp" />
<ClCompile Include="ResourceHelper.cpp" />
<ClCompile Include="Settings.cpp" />
<ClCompile Include="SettingsParser.cpp" />
<ClCompile Include="SettingsUIHelper.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringSet.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="TrackResources.cpp" />
<ClCompile Include="Translations.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
ClassicShellSrc/ClassicShellLib/ClassicShellLib.vcxproj.filters
+152
View File
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="Strings">
<UniqueIdentifier>{2dafcc43-3a9f-4c0e-8d8a-b43c78f07e35}</UniqueIdentifier>
</Filter>
<Filter Include="Resources">
<UniqueIdentifier>{48a0589e-ec5e-4ded-b507-ca72c33429c7}</UniqueIdentifier>
</Filter>
<Filter Include="Settings">
<UniqueIdentifier>{402c170e-bb90-4637-85b7-98857963160f}</UniqueIdentifier>
</Filter>
<Filter Include="Lib">
<UniqueIdentifier>{40e914e4-1c35-4b97-a4f6-15dce5ff5b20}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Image Include="..\ClassicShellSetup\ClassicShell.ico">
<Filter>Resource Files</Filter>
</Image>
<Image Include="flags.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="flags24.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="padlock.ico">
<Filter>Resource Files</Filter>
</Image>
<Image Include="play.ico">
<Filter>Resource Files</Filter>
</Image>
<Image Include="warning.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ClassicShellLib.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="Assert.h">
<Filter>Strings</Filter>
</ClInclude>
<ClInclude Include="FNVHash.h">
<Filter>Strings</Filter>
</ClInclude>
<ClInclude Include="StringSet.h">
<Filter>Strings</Filter>
</ClInclude>
<ClInclude Include="StringUtils.h">
<Filter>Strings</Filter>
</ClInclude>
<ClInclude Include="ComHelper.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="FileHelper.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="IatHookHelper.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="ResourceHelper.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="TrackResources.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="DownloadHelper.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="LanguageSettingsHelper.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="Settings.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="SettingsParser.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="SettingsUIHelper.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="Translations.h">
<Filter>Settings</Filter>
</ClInclude>
<ClInclude Include="stdafx.h">
<Filter>Lib</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
<Filter>Lib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Assert.cpp">
<Filter>Strings</Filter>
</ClCompile>
<ClCompile Include="FNVHash.cpp">
<Filter>Strings</Filter>
</ClCompile>
<ClCompile Include="StringSet.cpp">
<Filter>Strings</Filter>
</ClCompile>
<ClCompile Include="StringUtils.cpp">
<Filter>Strings</Filter>
</ClCompile>
<ClCompile Include="FileHelper.cpp">
<Filter>Resources</Filter>
</ClCompile>
<ClCompile Include="IatHookHelper.cpp">
<Filter>Resources</Filter>
</ClCompile>
<ClCompile Include="Instance.cpp">
<Filter>Resources</Filter>
</ClCompile>
<ClCompile Include="ResourceHelper.cpp">
<Filter>Resources</Filter>
</ClCompile>
<ClCompile Include="TrackResources.cpp">
<Filter>Resources</Filter>
</ClCompile>
<ClCompile Include="DownloadHelper.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="LanguageSettingsHelper.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="Settings.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="SettingsParser.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="SettingsUIHelper.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="Translations.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
<Filter>Lib</Filter>
</ClCompile>
</ItemGroup>
</Project>
ClassicShellSrc/ClassicShellLib/IatHookHelper.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ IatHookData *SetIatHook( IMAGE_DOS_HEADER *dosHeader, DWORD iatOffset, DWORD int
{
if (origThunk->u1.Ordinal&IMAGE_ORDINAL_FLAG)
{
if (IS_INTRESOURCE(targetProc) && IMAGE_ORDINAL(origThunk->u1.Ordinal)==(WORD)targetProc)
if (IS_INTRESOURCE(targetProc) && IMAGE_ORDINAL(origThunk->u1.Ordinal)==(uintptr_t)targetProc)
break;
}
else
ClassicShellSrc/ClassicShellLib/ResourceHelper.cpp
+2 -1
View File
@@ -611,7 +611,7 @@ HBITMAP LoadImageResource( HMODULE hModule, const wchar_t *name, bool bTopDown,
{
for (UINT y=0;y<height;y++)
{
WICRect rc={0,y,width,1};
WICRect rc={0,(INT)y,(INT)width,1};
pConverter->CopyPixels(&rc,width*4,width*4,bits+(height-y-1)*width*4);
}
}
@@ -645,6 +645,7 @@ WORD GetWinVersion( void )
static WORD version;
if (!version)
{
#pragma warning(suppress:4996)
DWORD ver=GetVersion();
version=MAKEWORD(HIBYTE(ver),LOBYTE(ver));
}
ClassicShellSrc/ClassicShellLib/Settings.cpp
+15 -15
View File
@@ -2585,8 +2585,8 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
fprintf_s(fAdmx,admxText1);
fprintf_s(fAdmx,g_AdmxText1b);
fprintf_s(fAdml,"%s",ReplaceStrings(CStringA(g_AdmlText1a),docMap));
fprintf_s(fAdml,"%s",ReplaceStrings(CStringA(admlText1),docMap));
fprintf_s(fAdml,"%s",(const char*)ReplaceStrings(CStringA(g_AdmlText1a),docMap));
fprintf_s(fAdml,"%s",(const char*)ReplaceStrings(CStringA(admlText1),docMap));
// policies and strings
int stringIdx=1;
@@ -2616,14 +2616,14 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
// name string
int nameIdx=stringIdx++;
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s</string>\r\n",prefix,nameIdx,EscapeXmlString(pDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting->nameID):pDoc->nameOverride));
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s</string>\r\n",prefix,nameIdx,(const char*)EscapeXmlString(pDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting->nameID):pDoc->nameOverride));
// tip string
int tipIdx=stringIdx++;
CStringA tip=pDoc->tipOverride;
if (tip.IsEmpty()) tip=LoadStringUTF8(pSetting->tipID);
tip+=pDoc->tipAddition;
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s\r\n\r\n%s</string>\r\n",prefix,tipIdx,EscapeXmlString(tip),ReplaceStrings(g_StateTip,docMap));
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s\r\n\r\n%s</string>\r\n",prefix,tipIdx,(const char*)EscapeXmlString(tip),(const char*)ReplaceStrings(g_StateTip,docMap));
// policy
fprintf_s(fAdmx,"\t\t<policy name=\"%s%S\" class=\"Both\" displayName=\"$(string.%sstr_%d)\" explainText=\"$(string.%sstr_%d)\" presentation=\"$(presentation.%s%S)\" key=\"%s\">\r\n",
@@ -2671,16 +2671,16 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
fprintf_s(fAdmx,"\t\t\t<elements>\r\n");
fprintf_s(fAdmx,"\t\t\t\t<enum id=\"State\" valueName=\"%S_State\">\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState1)\"><value><decimal value=\"0\" /></value></item>\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState2)\"><value><decimal value=\"1\" /></value></item>\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState3)\"><value><decimal value=\"2\" /></value></item>\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState1)\"><value><decimal value=\"0\" /></value></item>\r\n");
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState2)\"><value><decimal value=\"1\" /></value></item>\r\n");
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.SettingState3)\"><value><decimal value=\"2\" /></value></item>\r\n");
fprintf_s(fAdmx,"\t\t\t\t</enum>\r\n");
if (pSetting->type==CSetting::TYPE_BOOL)
{
fprintf_s(fAdmx,"\t\t\t\t<boolean id=\"Value\" valueName=\"%S\">\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<trueValue><decimal value=\"1\" /></trueValue>\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<falseValue><decimal value=\"0\" /></falseValue>\r\n",pSetting->name);
fprintf_s(fAdmx,"\t\t\t\t\t<trueValue><decimal value=\"1\" /></trueValue>\r\n");
fprintf_s(fAdmx,"\t\t\t\t\t<falseValue><decimal value=\"0\" /></falseValue>\r\n");
fprintf_s(fAdmx,"\t\t\t\t</boolean>\r\n");
}
else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
@@ -2699,7 +2699,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
}
int radioIdx=stringIdx++;
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s</string>\r\n",prefix,radioIdx,pRadioDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting[i].nameID):pRadioDoc->nameOverride);
fprintf_s(fAdml,"\t\t\t<string id=\"%sstr_%d\">%s</string>\r\n",prefix,radioIdx,(const char*)(pRadioDoc->nameOverride.IsEmpty()?LoadStringUTF8(pSetting[i].nameID):pRadioDoc->nameOverride));
fprintf_s(fAdmx,"\t\t\t\t\t<item displayName=\"$(string.%sstr_%d)\"><value><string>%S</string></value></item>\r\n",prefix,radioIdx,pSetting[i].name);
}
fprintf_s(fAdmx,"\t\t\t\t</enum>\r\n");
@@ -2758,23 +2758,23 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
if (pSetting->type==CSetting::TYPE_BOOL)
{
fprintf_s(fAdml,"\t\t\t\t<checkBox refId=\"Value\">%s</checkBox>\r\n",name);
fprintf_s(fAdml,"\t\t\t\t<checkBox refId=\"Value\">%s</checkBox>\r\n",(const char*)name);
}
else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
{
fprintf_s(fAdml,"\t\t\t\t<dropdownList refId=\"Value\" defaultItem=\"0\" noSort=\"true\">%s</dropdownList>\r\n",name);
fprintf_s(fAdml,"\t\t\t\t<dropdownList refId=\"Value\" defaultItem=\"0\" noSort=\"true\">%s</dropdownList>\r\n",(const char*)name);
}
else if (pSetting->type==CSetting::TYPE_INT || pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY || pSetting->type==CSetting::TYPE_COLOR)
{
fprintf_s(fAdml,"\t\t\t\t<decimalTextBox refId=\"Value\" spin=\"false\">%s</decimalTextBox>\r\n",name);
fprintf_s(fAdml,"\t\t\t\t<decimalTextBox refId=\"Value\" spin=\"false\">%s</decimalTextBox>\r\n",(const char*)name);
}
else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT)
{
fprintf_s(fAdml,"\t\t\t\t<textBox refId=\"Value\"><label>%s</label></textBox>\r\n",name);
fprintf_s(fAdml,"\t\t\t\t<textBox refId=\"Value\"><label>%s</label></textBox>\r\n",(const char*)name);
}
else if (pSetting->type==CSetting::TYPE_MULTISTRING)
{
fprintf_s(fAdml,"\t\t\t\t<multiTextBox refId=\"Value\">%s</multiTextBox>\r\n",name);
fprintf_s(fAdml,"\t\t\t\t<multiTextBox refId=\"Value\">%s</multiTextBox>\r\n",(const char*)name);
}
fprintf_s(fAdml,"\t\t\t</presentation>\r\n");
}
ClassicShellSrc/ClassicShellLib/SettingsUIHelper.cpp
+3 -3
View File
@@ -177,7 +177,7 @@ CString CTreeItem::GetDisplayName( bool bTitle ) const
if (SUCCEEDED(pItem->GetDisplayName(SIGDN_NORMALDISPLAY,&pName)))
{
CString name;
name.Format(L"%s (%s)",LoadStringEx(pStdCommand->displayNameId),pName);
name.Format(L"%s (%s)",(const wchar_t*)LoadStringEx(pStdCommand->displayNameId),(const wchar_t*)pName);
return name;
}
}
@@ -970,7 +970,7 @@ void CEditCustomItemDlg::InitDialog( CWindow commandCombo, const CStdCommand *pS
if (SUCCEEDED(SHGetNameFromIDList(path,SIGDN_DESKTOPABSOLUTEPARSING,&pPath)))
{
wchar_t text[_MAX_PATH*2];
int len=Sprintf(text,_countof(text),L"%s | ",pName);
int len=Sprintf(text,_countof(text),L"%s | ",(const wchar_t*)pName);
if (!PathUnExpandEnvStrings(pPath,text+len,_countof(text)-len))
Strcpy(text+len,_countof(text)-len,pPath);
linkCombo.SendMessage(CB_ADDSTRING,0,(LPARAM)text);
@@ -2644,7 +2644,7 @@ LRESULT CTreeSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
m_EditBox.GetWindowText(str);
str.TrimLeft(); str.TrimRight();
wchar_t *end;
int val=wcstol(str,&end,16)&0xFFFFFF;
COLORREF val=wcstol(str,&end,16)&0xFFFFFF;
static COLORREF customColors[16];
CHOOSECOLOR choose={sizeof(choose),m_hWnd,NULL,val,customColors};
choose.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;
ClassicShellSrc/ClassicShellLib/StringSet.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ BOOL CALLBACK CStringSet::EnumResNameProc( HMODULE hModule, LPCTSTR lpszType, LP
{
for (int i=0;i<16;i++)
{
UINT id=(((int)lpszName)<<4)+i-16;
int id=(((int)(intptr_t)lpszName)<<4)+i-16;
CString str=CreateString(res);
if (!str.IsEmpty())
ClassicShellSrc/ClassicShellLib/TrackResources.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ void DumpResourceLeaks( void )
{
if (cells[i].pKernel && cells[i].nProcess==pid)
{
HGDIOBJ handle=(HGDIOBJ)((cells[i].nUpper<<16)|i);
HGDIOBJ handle=(HGDIOBJ)(intptr_t)((cells[i].nUpper<<16)|i);
const TrackedResource *res=NULL;
TrackedResourceMap::const_iterator it=g_TrackedGdiResources.find(handle);
if (it!=g_TrackedGdiResources.end())