timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-13 02:17:26 +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

4
ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.cpp
View File

@@ -612,7 +612,7 @@ int GenerateUpdateFile( wchar_t *const *params, int count )
CString str=it2->second;
str.Replace(L"\r\n",L"\\r\\n");
str.Replace(L"\"",L"\"\"");
fwprintf(f,L"%4d \"%s\"\r\n",it2->first,str);
fwprintf(f,L"%4d \"%s\"\r\n",it2->first,(const wchar_t*)str);
}
fwprintf(f,L"END\r\n\r\n");
@@ -650,7 +650,7 @@ int GenerateUpdateFile( wchar_t *const *params, int count )
for (std::map<int,LanguageData>::const_iterator it3=languages.begin();it3!=languages.end();++it3)
{
if (!it3->second.bitmap.IsEmpty())
fwprintf(f,L"%d BITMAP \"%s\"\r\n",it3->first,it3->second.bitmap);
fwprintf(f,L"%d BITMAP \"%s\"\r\n",it3->first,(const wchar_t*)it3->second.bitmap);
}
fwprintf(f,L"\r\n");
}

2
ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.rc
View File

@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

405
ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcproj
View File

@@ -1,405 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="ClassicShellUtility"
ProjectGUID="{DAE66C9B-05DC-4ACE-97DA-2547B490BBFF}"
RootNamespace="ClassicShellUtility"
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="1"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\ClassicShellLib"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib uxtheme.lib dwmapi.lib winmm.lib htmlhelp.lib psapi.lib version.lib Secur32.lib Netapi32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="ClassicShellUtility.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(ConfigurationName)64"
IntermediateDirectory="$(ConfigurationName)64"
ConfigurationType="1"
UseOfATL="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\ClassicShellLib"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_UNICODE;UNICODE;_WIN64"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib uxtheme.lib dwmapi.lib winmm.lib htmlhelp.lib psapi.lib version.lib Secur32.lib."
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="ClassicShellUtility.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfATL="1"
CharacterSet="1"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\ClassicShellLib"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib uxtheme.lib dwmapi.lib winmm.lib htmlhelp.lib psapi.lib version.lib Secur32.lib Netapi32.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="ClassicShellUtility.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(ConfigurationName)64"
IntermediateDirectory="$(ConfigurationName)64"
ConfigurationType="1"
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"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\ClassicShellLib"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_UNICODE;UNICODE;_WIN64"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib uxtheme.lib dwmapi.lib winmm.lib htmlhelp.lib psapi.lib version.lib Secur32.lib."
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="ClassicShellUtility.manifest"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\ClassicShellUtility.cpp"
>
</File>
<File
RelativePath=".\Release64\ClassicShellUtility.exe"
>
</File>
<File
RelativePath=".\ClassicShellUtility.manifest"
>
</File>
<File
RelativePath=".\ClassicShellUtility.rc"
>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\LocComments.txt"
>
</File>
<File
RelativePath=".\LoggingOptions.cpp"
>
</File>
<File
RelativePath=".\ManualUninstall.cpp"
>
</File>
<File
RelativePath=".\MetroColorViewer.cpp"
>
</File>
<File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\SaveLogFile.cpp"
>
</File>
<File
RelativePath=".\SaveLogFile.h"
>
</File>
<File
RelativePath=".\tool.ico"
>
</File>
</Files>
<Globals>
<Global
Name="RESOURCE_FILE"
Value="ClassicShellUtility.rc"
/>
</Globals>
</VisualStudioProject>

212
ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/ClassicShellUtility.vcxproj Normal file
View File

@@ -0,0 +1,212 @@
<?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>{DAE66C9B-05DC-4ACE-97DA-2547B490BBFF}</ProjectGuid>
<RootNamespace>ClassicShellUtility</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>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</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>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(Configuration)64\</OutDir>
<IntDir>$(Configuration)64\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(Configuration)64\</OutDir>
<IntDir>$(Configuration)64\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\ClassicShellLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\ClassicShellLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\ClassicShellLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\ClassicShellLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="ClassicShellUtility.cpp" />
<ClCompile Include="LoggingOptions.cpp" />
<ClCompile Include="ManualUninstall.cpp" />
<ClCompile Include="MetroColorViewer.cpp" />
<ClCompile Include="SaveLogFile.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="Release64\ClassicShellUtility.exe" />
</ItemGroup>
<ItemGroup>
<Manifest Include="ClassicShellUtility.manifest" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ClassicShellUtility.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\LocComments.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="SaveLogFile.h" />
</ItemGroup>
<ItemGroup>
<Image Include="tool.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\ClassicShellLib\ClassicShellLib.vcxproj">
<Project>{d42fe717-485b-492d-884a-1999f6d51154}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties RESOURCE_FILE="ClassicShellUtility.rc" />
</VisualStudio>
</ProjectExtensions>
</Project>

48
ClassicShellSrc/ClassicShellSetup/ClassicShellUtility/SaveLogFile.cpp
View File

@@ -137,7 +137,7 @@ static void WriteRegKey( FILE *f, CRegKey &key, int tabs, const wchar_t *annotat
CString val=(wchar_t*)&buf[0];
val.Replace(L"\r",L"\\r");
val.Replace(L"\n",L"\\n");
fwprintf(f,L"%s",val);
fwprintf(f,L"%s",(const wchar_t*)val);
}
break;
case REG_MULTI_SZ:
@@ -146,7 +146,7 @@ static void WriteRegKey( FILE *f, CRegKey &key, int tabs, const wchar_t *annotat
CString val=str;
val.Replace(L"\r",L"\\r");
val.Replace(L"\n",L"\\n");
fwprintf(f,L"%s\\0",val);
fwprintf(f,L"%s\\0",(const wchar_t*)val);
}
break;
}
@@ -210,7 +210,7 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive
else if (FAILED(pTarget->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&target)))
fwprintf(f,L" target='no name'");
else
fwprintf(f,L" target='%s'",target);
fwprintf(f,L" target='%s'",(const wchar_t*)target);
wchar_t args[256];
if (FAILED(pLink->GetArguments(args,_countof(args))))
args[0]=0;
@@ -230,7 +230,7 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive
if (args[0])
fwprintf(f,L" args='%s'",args);
if (!appid.IsEmpty())
fwprintf(f,L" appid='%s'",appid);
fwprintf(f,L" appid='%s'",(const wchar_t*)appid);
}
}
}
@@ -245,10 +245,10 @@ static void WriteFolder( FILE *f, const wchar_t *path, int tabs, bool bRecursive
CString policy;
ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers",fname,policy);
if (!policy.IsEmpty())
fwprintf(f,L" usercompat='%s'",policy);
fwprintf(f,L" usercompat='%s'",(const wchar_t*)policy);
ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers",fname,policy);
if (!policy.IsEmpty())
fwprintf(f,L" compat='%s'",policy);
fwprintf(f,L" compat='%s'",(const wchar_t*)policy);
}
}
fwprintf(f,L"\r\n");
@@ -315,7 +315,7 @@ static void WriteProcessInfo( FILE *f, HANDLE hProcess, int tabs )
for (std::set<CString,CompareStrings>::const_iterator it=names.begin();it!=names.end();++it)
{
DWORD ver=GetFileVersion(*it,NULL);
fwprintf(f,L"%s%s (%d.%d.%d)\r\n",GetTabs(tabs),*it,ver>>24,(ver>>16)&255,ver&65535);
fwprintf(f,L"%s%s (%d.%d.%d)\r\n",GetTabs(tabs),(const wchar_t*)(*it),ver>>24,(ver>>16)&255,ver&65535);
}
}
@@ -377,7 +377,7 @@ static void WriteLogFile( FILE *f )
CString strVer1, strVer2;
ReadRegistryValue(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",L"ProductName",strVer1);
ReadRegistryValue(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",L"CurrentVersion",strVer2);
fwprintf(f,L"\tWindows version (registry): %s %s\r\n",strVer1,strVer2);
fwprintf(f,L"\tWindows version (registry): %s %s\r\n",(const wchar_t*)strVer1,(const wchar_t*)strVer2);
wchar_t user1[256]={0}, user2[256]={0};
ULONG size=_countof(user1);
@@ -558,7 +558,7 @@ static void WriteLogFile( FILE *f )
CComString pPath;
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Startup,0,NULL,&pPath)))
{
fwprintf(f,L"\r\n\t%s:\r\n",pPath);
fwprintf(f,L"\r\n\t%s:\r\n",(const wchar_t*)pPath);
WriteFolder(f,pPath,2,false);
fwprintf(f,L"\r\n");
}
@@ -568,7 +568,7 @@ static void WriteLogFile( FILE *f )
CComString pPath;
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_CommonStartup,0,NULL,&pPath)))
{
fwprintf(f,L"\r\n\t%s:\r\n",pPath);
fwprintf(f,L"\r\n\t%s:\r\n",(const wchar_t*)pPath);
WriteFolder(f,pPath,2,false);
fwprintf(f,L"\r\n");
}
@@ -659,7 +659,7 @@ static void WriteLogFile( FILE *f )
}
for (std::set<CString,CompareStrings>::const_iterator it=programs.begin();it!=programs.end();++it)
fwprintf(f,L"\t\t%s\r\n",*it);
fwprintf(f,L"\t\t%s\r\n",(const wchar_t*)(*it));
fwprintf(f,L"\r\nClassic Shell\r\n");
wchar_t csPath[_MAX_PATH]=L"";
@@ -748,13 +748,13 @@ static void WriteLogFile( FILE *f )
fwprintf(f,L"Explorer addons:\r\n");
CString text;
if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Internet Explorer\\Main",L"Enable Browser Extensions",text)==ERROR_SUCCESS)
fwprintf(f,L"\tEnable Browser Extensions (user): %s\r\n",text);
fwprintf(f,L"\tEnable Browser Extensions (user): %s\r\n",(const wchar_t*)text);
if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Internet Explorer\\Main",L"Enable Browser Extensions",text)==ERROR_SUCCESS)
fwprintf(f,L"\tEnable Browser Extensions: %s\r\n",text);
fwprintf(f,L"\tEnable Browser Extensions: %s\r\n",(const wchar_t*)text);
if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Internet Explorer\\Main",L"Isolation",text)==ERROR_SUCCESS)
fwprintf(f,L"\tIsolation (user): %s\r\n",text);
fwprintf(f,L"\tIsolation (user): %s\r\n",(const wchar_t*)text);
if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Internet Explorer\\Main",L"Isolation",text)==ERROR_SUCCESS)
fwprintf(f,L"\tIsolation: %s\r\n",text);
fwprintf(f,L"\tIsolation: %s\r\n",(const wchar_t*)text);
}
if (bClassicExplorer)
{
@@ -763,11 +763,11 @@ static void WriteLogFile( FILE *f )
fwprintf(f,L"\tExplorerBand flags: 0x%08X\r\n",flags);
CString policy;
if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{553891B7-A0D5-4526-BE18-D3CE461D6310}",policy)==ERROR_SUCCESS)
fwprintf(f,L"\tExplorerBand policy: %s\r\n",policy);
fwprintf(f,L"\tExplorerBand policy: %s\r\n",(const wchar_t*)policy);
if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\CurrentVersion\\Ext\\Settings\\{449D0D6E-2412-4E61-B68F-1CB625CD9E52}",L"Flags",flags)==ERROR_SUCCESS)
fwprintf(f,L"\tExplorerBHO flags: 0x%08X\r\n",flags);
if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{449D0D6E-2412-4E61-B68F-1CB625CD9E52}",policy)==ERROR_SUCCESS)
fwprintf(f,L"\tExplorerBHO policy: %s\r\n",policy);
fwprintf(f,L"\tExplorerBHO policy: %s\r\n",(const wchar_t*)policy);
}
if (bClassicIE)
{
@@ -776,7 +776,7 @@ static void WriteLogFile( FILE *f )
if (ReadRegistryValue(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\CurrentVersion\\Ext\\Settings\\{EA801577-E6AD-4BD5-8F71-4BE0154331A4}",L"Flags",flags)==ERROR_SUCCESS)
fwprintf(f,L"\tClassicIE flags: 0x%08X\r\n",flags);
if (ReadRegistryValue(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{EA801577-E6AD-4BD5-8F71-4BE0154331A4}",policy)==ERROR_SUCCESS)
fwprintf(f,L"\tClassicIE policy: %s\r\n",policy);
fwprintf(f,L"\tClassicIE policy: %s\r\n",(const wchar_t*)policy);
}
if (bClassicExplorer || bClassicIE)
fwprintf(f,L"\r\n");
@@ -793,7 +793,7 @@ static void WriteLogFile( FILE *f )
{
if (guid.IsEmpty())
guid=L"(empty)";
fwprintf(f,L"TreatAs: %s%s\r\n",guid,_wcsicmp(guid,L"{D3214FBB-3CA1-406a-B3E8-3EB7C393A15E}")==0?L" (correct)":L" (wrong)");
fwprintf(f,L"TreatAs: %s%s\r\n",(const wchar_t*)guid,_wcsicmp(guid,L"{D3214FBB-3CA1-406a-B3E8-3EB7C393A15E}")==0?L" (correct)":L" (wrong)");
}
CString emulation;
@@ -804,7 +804,7 @@ static void WriteLogFile( FILE *f )
{
if (emulation.IsEmpty())
emulation=L"(empty)";
fwprintf(f,L"Emulation: %s%s\r\n",emulation,_wcsicmp(emulation,L"StartMenuEmulation")==0?L" (correct)":L" (wrong)");
fwprintf(f,L"Emulation: %s%s\r\n",(const wchar_t*)emulation,_wcsicmp(emulation,L"StartMenuEmulation")==0?L" (correct)":L" (wrong)");
}
CString server;
@@ -820,7 +820,7 @@ static void WriteLogFile( FILE *f )
state=L" (missing file)";
else
state=L" (correct)";
fwprintf(f,L"Server: %s%s\r\n",server,state);
fwprintf(f,L"Server: %s%s\r\n",(const wchar_t*)server,state);
}
}
}
@@ -868,9 +868,9 @@ static void WriteLogFileAdmin( FILE *f )
CloseServiceHandle(hManager);
for (std::map<CString,GroupInfo,CompareStrings>::const_iterator it=services.begin();it!=services.end();++it)
if (it->second.group.IsEmpty())
fwprintf(f,L"\t%s (%s): %s\r\n",it->first,it->second.desc,it->second.status);
fwprintf(f,L"\t%s (%s): %s\r\n",(const wchar_t*)it->first,(const wchar_t*)it->second.desc,it->second.status);
else
fwprintf(f,L"\t%s (%s): %s (%s)\r\n",it->first,it->second.desc,it->second.status,it->second.group);
fwprintf(f,L"\t%s (%s): %s (%s)\r\n",(const wchar_t*)it->first,(const wchar_t*)it->second.desc,it->second.status,(const wchar_t*)it->second.group);
}
}
@@ -1007,7 +1007,7 @@ int SaveLogFile( const wchar_t *fname, bool bAdmin )
GetModuleFileName(NULL,exe,_countof(exe));
wchar_t cmdLine[1024];
Sprintf(cmdLine,_countof(cmdLine),L"saveloga \"%s\"",fname);
if ((int)ShellExecute(NULL,L"runas",exe,cmdLine,NULL,SW_SHOWNORMAL)<=32)
if ((intptr_t)ShellExecute(NULL,L"runas",exe,cmdLine,NULL,SW_SHOWNORMAL)<=32)
{
f=NULL;
if (_wfopen_s(&f,fname,L"ab")==0 && f)