diff --git a/.gitignore b/.gitignore index 363b434..ac90037 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ StyleCopReport.xml *_i.c *_p.c *_i.h +*_h.h *.ilk *.meta *.obj diff --git a/Src/ClassicExplorer/ClassicCopyExt.h b/Src/ClassicExplorer/ClassicCopyExt.h index 9b02cbd..dcf65d4 100644 --- a/Src/ClassicExplorer/ClassicCopyExt.h +++ b/Src/ClassicExplorer/ClassicCopyExt.h @@ -7,7 +7,7 @@ #pragma once #include "resource.h" // main symbols -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" #include // CClassicCopyExt diff --git a/Src/ClassicExplorer/ClassicExplorer.cpp b/Src/ClassicExplorer/ClassicExplorer.cpp index 0288912..82f6382 100644 --- a/Src/ClassicExplorer/ClassicExplorer.cpp +++ b/Src/ClassicExplorer/ClassicExplorer.cpp @@ -6,7 +6,7 @@ #include "stdafx.h" #include "resource.h" -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" #include "dllmain.h" // Used to determine whether the DLL can be unloaded by OLE diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index a72ebb5..55f59d9 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -33,337 +33,47 @@ 10.0 - + DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - true + $(ProjectName)32 - - $(Configuration)64\ - $(Configuration)64\ - true - true + $(ProjectName)64 - - $(Configuration)\ - $(Configuration)\ + true - false - $(ProjectName)32 - - $(Configuration)64\ - $(Configuration)64\ - true - false - $(ProjectName)64 - - - $(Configuration)\ - $(Configuration)\ - true - false - $(ProjectName)32 - - - $(Configuration)64\ - $(Configuration)64\ - true - false - $(ProjectName)64 - - - - _DEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - true - + - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - true - stdcpp17 + _USRDLL;%(PreprocessorDefinitions) - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) + $(IntDir);%(AdditionalIncludeDirectories) + + oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) + $(TargetName).def + + + true - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows true - - - _DEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - - - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - true - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - true - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - true - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - true - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - true - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicExplorer_i.h - - ClassicExplorer_i.c - ClassicExplorer_p.c - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - oleacc.lib;comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;Netapi32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - @@ -398,7 +108,7 @@ - + diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj.filters b/Src/ClassicExplorer/ClassicExplorer.vcxproj.filters index b6c1ead..3b72d12 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj.filters +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj.filters @@ -114,7 +114,7 @@ Resource Files - + Generated Files diff --git a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj index 29a6bcb..a001d90 100644 --- a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj @@ -21,128 +21,29 @@ 10.0 - + Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - + + - + ..\$(Configuration)\ - $(Configuration)\ - true - - ..\$(Configuration)\ - $(Configuration)\ - false - - - ..\$(Configuration)\ - $(Configuration)\ - false - - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - true - EditAndContinue - true - true - stdcpp17 + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/ClassicExplorer/ExplorerBHO.h b/Src/ClassicExplorer/ExplorerBHO.h index 2f10ca4..83189bb 100644 --- a/Src/ClassicExplorer/ExplorerBHO.h +++ b/Src/ClassicExplorer/ExplorerBHO.h @@ -9,7 +9,7 @@ #include #include -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" #include "ComHelper.h" #include diff --git a/Src/ClassicExplorer/ExplorerBand.h b/Src/ClassicExplorer/ExplorerBand.h index f30ab7c..ee8af4d 100644 --- a/Src/ClassicExplorer/ExplorerBand.h +++ b/Src/ClassicExplorer/ExplorerBand.h @@ -6,7 +6,7 @@ #pragma once #include "resource.h" -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" #include "SettingsParser.h" #include diff --git a/Src/ClassicExplorer/ShareOverlay.h b/Src/ClassicExplorer/ShareOverlay.h index 7451ccb..8bb266f 100644 --- a/Src/ClassicExplorer/ShareOverlay.h +++ b/Src/ClassicExplorer/ShareOverlay.h @@ -8,7 +8,7 @@ #include "resource.h" // main symbols #include -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" // CShareOverlay diff --git a/Src/ClassicExplorer/dllmain.h b/Src/ClassicExplorer/dllmain.h index 23f8888..b4920c4 100644 --- a/Src/ClassicExplorer/dllmain.h +++ b/Src/ClassicExplorer/dllmain.h @@ -5,7 +5,7 @@ // dllmain.h : Declaration of module class. #pragma once -#include "ClassicExplorer_i.h" +#include "ClassicExplorer_h.h" #include class CClassicExplorerModule : public CAtlDllModuleT< CClassicExplorerModule > diff --git a/Src/ClassicIE/ClassicIE.vcxproj b/Src/ClassicIE/ClassicIE.vcxproj index cd70f7e..4a5b9a4 100644 --- a/Src/ClassicIE/ClassicIE.vcxproj +++ b/Src/ClassicIE/ClassicIE.vcxproj @@ -33,236 +33,32 @@ 10.0 - + Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - - - Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true + $(ProjectName)_32 - - $(Configuration)64\ - $(Configuration)64\ - true + $(ProjectName)_64 - - $(Configuration)\ - $(Configuration)\ - false - $(ProjectName)_32 - - - $(Configuration)64\ - $(Configuration)64\ - false - $(ProjectName)_64 - - - $(Configuration)\ - $(Configuration)\ - false - $(ProjectName)_32 - - - $(Configuration)64\ - $(Configuration)64\ - false - $(ProjectName)_64 - - + - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug NotUsing - Level3 - EditAndContinue - true - true - stdcpp17 shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - - - - - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - shlwapi.lib;comctl32.lib;psapi.lib;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp b/Src/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp index 2393f56..5322fcf 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEBHO.cpp @@ -3,7 +3,7 @@ // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author #include "stdafx.h" -#include "ClassicIEDLL_i.h" +#include "ClassicIEDLL_h.h" #include "ClassicIEBHO.h" #include "ClassicIEDLL.h" #include "Settings.h" diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.cpp b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.cpp index b35fd84..733d115 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.cpp +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "resource.h" -#include "ClassicIEDLL_i.h" +#include "ClassicIEDLL_h.h" #include "ClassicIEDLL.h" #include "Settings.h" #include "dllmain.h" diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj index 8c11a8b..d6f006d 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -33,323 +33,46 @@ 10.0 - + DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - + ..\$(Configuration)\ - $(Configuration)\ - true $(ProjectName)_32 - + ..\$(Configuration)64\ - $(Configuration)64\ - true $(ProjectName)_64 - - ..\$(Configuration)\ - $(Configuration)\ - false - $(ProjectName)_32 - - - ..\$(Configuration)64\ - $(Configuration)64\ - false - $(ProjectName)_64 - - - ..\$(Configuration)\ - $(Configuration)\ - false - $(ProjectName)_32 - - - ..\$(Configuration)64\ - $(Configuration)64\ - false - $(ProjectName)_64 - - - - _DEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - true - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - stdcpp17 + _USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) + $(IntDir);%(AdditionalIncludeDirectories) + + uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) + $(TargetName).def + + + true - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows true - - - _DEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - - - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - true - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - true - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - true - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - true - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - true - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - ClassicIEDLL_i.h - - ClassicIEDLL_i.c - ClassicIEDLL_p.c - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - uxtheme.lib;dwmapi.lib;comctl32.lib;msimg32.lib;winmm.lib;htmlhelp.lib;wininet.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - @@ -375,7 +98,7 @@ - + diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters index ccca6f6..8af2047 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj.filters @@ -81,7 +81,7 @@ Header Files - + Generated Files diff --git a/Src/ClassicIE/ClassicIEDLL/dllmain.h b/Src/ClassicIE/ClassicIEDLL/dllmain.h index 26a8c33..fe6990f 100644 --- a/Src/ClassicIE/ClassicIEDLL/dllmain.h +++ b/Src/ClassicIE/ClassicIEDLL/dllmain.h @@ -4,7 +4,7 @@ #pragma once -#include "ClassicIEDLL_i.h" +#include "ClassicIEDLL_h.h" class CClassicIEDLLModule : public CAtlDllModuleT< CClassicIEDLLModule > { diff --git a/Src/Common.props b/Src/Common.props new file mode 100644 index 0000000..fb5e22e --- /dev/null +++ b/Src/Common.props @@ -0,0 +1,91 @@ + + + + + + + 4.4.1000 + + + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)64\ + $(Configuration)64\ + + + + + + $(MSBuildThisFileDirectory)Lib;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;%(PreprocessorDefinitions) + Use + Level3 + true + true + stdcpp17 + + + false + true + true + + + true + Windows + + + $(MSBuildThisFileDirectory)Lib;%(AdditionalIncludeDirectories) + _PRODUCT_VERSION=$(CS_VERSION.Replace('.', ',')),0;_PRODUCT_VERSION_STR=\"$(CS_VERSION_ORIG)\";%(PreprocessorDefinitions) + + + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + + + + + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + true + + + + + + BUILD_SETUP;%(PreprocessorDefinitions) + + + + + diff --git a/Src/Lib/Lib.vcxproj b/Src/Lib/Lib.vcxproj index ce02cb7..ee0b091 100644 --- a/Src/Lib/Lib.vcxproj +++ b/Src/Lib/Lib.vcxproj @@ -25,130 +25,28 @@ 10.0 - + StaticLibrary - v143 - Static - Unicode - true - - - StaticLibrary - v143 - Static - Unicode - - - StaticLibrary - v143 - Static - Unicode - true - - - StaticLibrary - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - - - $(Configuration)64\ - $(Configuration)64\ - - - $(Configuration)\ - $(Configuration)\ - - - $(Configuration)64\ - $(Configuration)64\ - - APPVEYOR_REPO_COMMIT="$(APPVEYOR_REPO_COMMIT)";%(PreprocessorDefinitions) - - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - true - stdcpp17 - - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 + _LIB;%(PreprocessorDefinitions) - MachineX86 + MachineX86 - - - MaxSpeed - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - diff --git a/Src/OpenShell.sln b/Src/OpenShell.sln index ae4db85..f29cef0 100644 --- a/Src/OpenShell.sln +++ b/Src/OpenShell.sln @@ -7,12 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{B695E1F6-785D-45CB-BCE0-0E9635DFC1DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorer", "ClassicExplorer\ClassicExplorer.vcxproj", "{9AF324B7-F786-4D85-B2E1-6E51720F874E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartMenu", "StartMenu\StartMenu.vcxproj", "{87D5FE20-AF86-458A-9AA3-3131EB06179B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartMenuDLL", "StartMenu\StartMenuDLL\StartMenuDLL.vcxproj", "{85DEECBB-1F9B-4983-9D54-3BF42182B7E7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicExplorer", "ClassicExplorer\ClassicExplorer.vcxproj", "{9AF324B7-F786-4D85-B2E1-6E51720F874E}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "Setup\Setup.vcxproj", "{A4A4D3B1-24E7-401E-A37C-72141D7603DC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero", "Skins\Win7Aero\Win7Aero.vcxproj", "{EA65FDDD-CB77-417F-8BB4-2F3ECB5B3E75}" @@ -82,18 +82,6 @@ Global Setup|x64 = Setup|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|Win32.ActiveCfg = Debug|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|Win32.Build.0 = Debug|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|x64.ActiveCfg = Debug|x64 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|x64.Build.0 = Debug|x64 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|Win32.ActiveCfg = Release|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|Win32.Build.0 = Release|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|x64.ActiveCfg = Release|x64 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|x64.Build.0 = Release|x64 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|Win32.ActiveCfg = Setup|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|Win32.Build.0 = Setup|Win32 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|x64.ActiveCfg = Setup|x64 - {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|x64.Build.0 = Setup|x64 {87D5FE20-AF86-458A-9AA3-3131EB06179B}.Debug|Win32.ActiveCfg = Debug|Win32 {87D5FE20-AF86-458A-9AA3-3131EB06179B}.Debug|Win32.Build.0 = Debug|Win32 {87D5FE20-AF86-458A-9AA3-3131EB06179B}.Debug|x64.ActiveCfg = Debug|x64 @@ -118,6 +106,18 @@ Global {85DEECBB-1F9B-4983-9D54-3BF42182B7E7}.Setup|Win32.Build.0 = Setup|Win32 {85DEECBB-1F9B-4983-9D54-3BF42182B7E7}.Setup|x64.ActiveCfg = Setup|x64 {85DEECBB-1F9B-4983-9D54-3BF42182B7E7}.Setup|x64.Build.0 = Setup|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|Win32.ActiveCfg = Debug|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|Win32.Build.0 = Debug|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|x64.ActiveCfg = Debug|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Debug|x64.Build.0 = Debug|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|Win32.ActiveCfg = Release|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|Win32.Build.0 = Release|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|x64.ActiveCfg = Release|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Release|x64.Build.0 = Release|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|Win32.ActiveCfg = Setup|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|Win32.Build.0 = Setup|Win32 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|x64.ActiveCfg = Setup|x64 + {9AF324B7-F786-4D85-B2E1-6E51720F874E}.Setup|x64.Build.0 = Setup|x64 {A4A4D3B1-24E7-401E-A37C-72141D7603DC}.Debug|Win32.ActiveCfg = Debug|Win32 {A4A4D3B1-24E7-401E-A37C-72141D7603DC}.Debug|Win32.Build.0 = Debug|Win32 {A4A4D3B1-24E7-401E-A37C-72141D7603DC}.Debug|x64.ActiveCfg = Debug|Win32 diff --git a/Src/Setup/Setup.vcxproj b/Src/Setup/Setup.vcxproj index 4fde964..827fc92 100644 --- a/Src/Setup/Setup.vcxproj +++ b/Src/Setup/Setup.vcxproj @@ -17,85 +17,25 @@ 10.0 - + Application - v143 - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Unicode + true - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - - - $(Configuration)\ - $(Configuration)\ - false - - + - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug NotUsing - Level3 - EditAndContinue - true - true - stdcpp17 - - _DEBUG;%(PreprocessorDefinitions) - comctl32.lib;Psapi.lib;version.lib;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - comctl32.lib;Psapi.lib;version.lib;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/Setup/SetupHelper/SetupHelper.vcxproj b/Src/Setup/SetupHelper/SetupHelper.vcxproj index 47e51ab..4a99fa4 100644 --- a/Src/Setup/SetupHelper/SetupHelper.vcxproj +++ b/Src/Setup/SetupHelper/SetupHelper.vcxproj @@ -17,77 +17,23 @@ 10.0 - + Application - v143 - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Unicode + true - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - - - $(Configuration)\ - $(Configuration)\ - false - - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug NotUsing - Level3 - true - EditAndContinue - true - stdcpp17 - - true - Windows - - - - - MaxSpeed - true - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - true - ProgramDatabase - true - stdcpp17 - - - true - Windows - true - true - diff --git a/Src/Setup/Utility/Utility.vcxproj b/Src/Setup/Utility/Utility.vcxproj index f54cf3b..b98da85 100644 --- a/Src/Setup/Utility/Utility.vcxproj +++ b/Src/Setup/Utility/Utility.vcxproj @@ -25,154 +25,26 @@ 10.0 - + Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - - - Application - v143 - Static - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - - - $(Configuration)64\ - $(Configuration)64\ - true - - - $(Configuration)\ - $(Configuration)\ - false - - - $(Configuration)64\ - $(Configuration)64\ - false - - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug NotUsing - Level3 - EditAndContinue - true - stdcpp17 comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies) - true - Windows - - - - - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - NotUsing - Level3 - ProgramDatabase - true - stdcpp17 - - - _UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions) - - - comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - true - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - stdcpp17 - - - comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib;Netapi32.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - true - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - true - stdcpp17 - - - _UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions) - - - comctl32.lib;uxtheme.lib;dwmapi.lib;winmm.lib;htmlhelp.lib;psapi.lib;version.lib;Secur32.lib.;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/Setup/en-US/en-US.vcxproj b/Src/Setup/en-US/en-US.vcxproj index 37622bd..9801e17 100644 --- a/Src/Setup/en-US/en-US.vcxproj +++ b/Src/Setup/en-US/en-US.vcxproj @@ -13,25 +13,23 @@ 10.0 - + DynamicLibrary - v143 + $(DefaultPlatformToolset) Unicode - - + - + ..\..\ - $(Configuration)\ true false - + false Windows diff --git a/Src/StartMenu/StartMenu.vcxproj b/Src/StartMenu/StartMenu.vcxproj index 8db8df2..dac1867 100644 --- a/Src/StartMenu/StartMenu.vcxproj +++ b/Src/StartMenu/StartMenu.vcxproj @@ -33,246 +33,20 @@ 10.0 - + Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - - - Application - v143 - Static - Unicode - true - - - Application - v143 - Static - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - - - $(Configuration)64\ - $(Configuration)64\ - true - - - $(Configuration)\ - $(Configuration)\ - false - - - $(Configuration)64\ - $(Configuration)64\ - false - - - $(Configuration)\ - $(Configuration)\ - false - - - $(Configuration)64\ - $(Configuration)64\ - false - - - - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - - - - - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - true - Windows - true - true - - - - - MaxSpeed - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - - - true - Windows - true - true - - @@ -319,6 +93,14 @@ {066c9721-26d5-4c4d-868e-50c2ba0a8196} false + + {75809d15-8403-420a-bbe6-05f478d88d8e} + false + + + {bd28b058-230e-42df-9fb1-ffbb0153f498} + false + {ca5bfc96-428d-42f5-9f7d-cdde048a357c} false diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj index 1c004a4..b81c5c6 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj @@ -33,256 +33,32 @@ 10.0 - + DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - + ..\$(Configuration)\ - $(Configuration)\ - true - + ..\$(Configuration)64\ - $(Configuration)64\ - true - - ..\$(Configuration)\ - $(Configuration)\ - false - - - ..\$(Configuration)64\ - $(Configuration)64\ - false - - - ..\$(Configuration)\ - $(Configuration)\ - false - - - ..\$(Configuration)64\ - $(Configuration)64\ - false - - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - true - stdcpp17 + _USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - - - - - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true - - - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - true - Use - Level3 - true - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);..\..\Lib;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;WtsApi32.lib;Secur32.lib;Msimg32.lib;Netapi32.lib;dwmapi.lib;PowrProf.lib;Oleacc.lib;winmm.lib;htmlhelp.lib;wininet.lib;structuredquery.lib;Propsys.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h index e7abe40..4e7f37e 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h @@ -2,7 +2,7 @@ #pragma once #include "resource.h" -#include "StartMenuHelper_i.h" +#include "StartMenuHelper_h.h" #include // CModernSettingsContextMenu diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h index 805ad0d..dba4f2e 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h @@ -4,7 +4,7 @@ #pragma once #include "resource.h" #include "ComHelper.h" -#include "StartMenuHelper_i.h" +#include "StartMenuHelper_h.h" #include #include diff --git a/Src/StartMenu/StartMenuHelper/StartMenuExt.h b/Src/StartMenu/StartMenuHelper/StartMenuExt.h index 025041a..f7f11aa 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuExt.h +++ b/Src/StartMenu/StartMenuHelper/StartMenuExt.h @@ -3,7 +3,7 @@ #pragma once #include "resource.h" // main symbols -#include "StartMenuHelper_i.h" +#include "StartMenuHelper_h.h" #include diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp index d54ce36..5004cb8 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "resource.h" -#include "StartMenuHelper_i.h" +#include "StartMenuHelper_h.h" #include "dllmain.h" #include "ResourceHelper.h" #include "Settings.h" diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index dd637a6..876edc0 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -33,329 +33,44 @@ 10.0 - + DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 - Static - Unicode - true - - - DynamicLibrary - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - - - - - - - - - - - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - true + $(ProjectName)32 - - $(Configuration)64\ - $(Configuration)64\ - true - true + $(ProjectName)64 - - $(Configuration)\ - $(Configuration)\ - true - false - $(ProjectName)32 - - - $(Configuration)64\ - $(Configuration)64\ - true - false - $(ProjectName)64 - - - $(Configuration)\ - $(Configuration)\ - true - false - $(ProjectName)32 - - - $(Configuration)64\ - $(Configuration)64\ - true - false - $(ProjectName)64 - - - - _DEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - true - + - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - true - true - stdcpp17 + _USRDLL;%(PreprocessorDefinitions) - _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) + + comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) + $(TargetName).def + + + true - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows true - - - _DEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - - - Disabled - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - true - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - true - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - true - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - true - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - true - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - false - true - StartMenuHelper_i.h - StartMenuHelper_i.c - StartMenuHelper_p.c - - - MaxSpeed - ..\..\Lib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_USRDLL;BUILD_SETUP;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - true - true - stdcpp17 - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;winmm.lib;htmlhelp.lib;wininet.lib;version.lib;%(AdditionalDependencies) - .\$(TargetName).def - true - Windows - true - true - - @@ -389,7 +104,7 @@ - + diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters index 942b4e4..119fd0d 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters @@ -88,7 +88,7 @@ Header Files - + Generated Files diff --git a/Src/StartMenu/StartMenuHelper/dllmain.cpp b/Src/StartMenu/StartMenuHelper/dllmain.cpp index 795032a..21c35ce 100644 --- a/Src/StartMenu/StartMenuHelper/dllmain.cpp +++ b/Src/StartMenu/StartMenuHelper/dllmain.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #include "resource.h" -#include "StartMenuHelper_i.h" +#include "StartMenuHelper_h.h" #include "dllmain.h" #include "Settings.h" #include "Translations.h" diff --git a/Src/Update/DesktopToasts/DesktopToasts.vcxproj b/Src/Update/DesktopToasts/DesktopToasts.vcxproj index b912f1d..a68cbab 100644 --- a/Src/Update/DesktopToasts/DesktopToasts.vcxproj +++ b/Src/Update/DesktopToasts/DesktopToasts.vcxproj @@ -18,73 +18,28 @@ 10.0 - + DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true + $(DefaultPlatformToolset) Unicode + true - - - - - - - + + - - true - ..\$(Configuration)\ - - - false - $(Configuration)\ - - + - Level3 true - WIN32;_DEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDebug + DESKTOPTOASTS_EXPORTS;_USRDLL;%(PreprocessorDefinitions) + NotUsing - Windows - true - false - runtimeobject.lib;%(AdditionalDependencies) - DesktopToasts.def - - - - - Level3 - true - true - true - WIN32;NDEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - - - Windows - true - true - true false runtimeobject.lib;%(AdditionalDependencies) DesktopToasts.def diff --git a/Src/Update/Update.vcxproj b/Src/Update/Update.vcxproj index f5b6b7a..89e3d45 100644 --- a/Src/Update/Update.vcxproj +++ b/Src/Update/Update.vcxproj @@ -17,87 +17,26 @@ 10.0 - + Application - v143 - Static - Unicode - true - - - Application - v143 + $(DefaultPlatformToolset) Static Unicode + true - - - - - - - + + - - $(Configuration)\ - $(Configuration)\ - true - - - $(Configuration)\ - $(Configuration)\ - false - - + - Disabled - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug NotUsing - Level3 - EditAndContinue - true - stdcpp17 - - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - shlwapi.lib;comctl32.lib;uxtheme.lib;winmm.lib;wininet.lib;htmlhelp.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - - - - - MaxSpeed - false - ..\Lib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - NotUsing - Level3 - true - ProgramDatabase - true - stdcpp17 - - - $(IntDir);..\Lib;%(AdditionalIncludeDirectories) - - - shlwapi.lib;comctl32.lib;uxtheme.lib;winmm.lib;wininet.lib;htmlhelp.lib;wintrust.lib;crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true diff --git a/Src/Version.props b/Src/Version.props deleted file mode 100644 index 4345cbd..0000000 --- a/Src/Version.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - 4.4.1000 - - - - _PRODUCT_VERSION=$(CS_VERSION.Replace('.', ',')),0;_PRODUCT_VERSION_STR=\"$(CS_VERSION_ORIG)\";%(PreprocessorDefinitions) - - - - \ No newline at end of file