diff --git a/Src/BUILDME.txt b/Src/BUILDME.txt index 4e93849..60c06e4 100644 --- a/Src/BUILDME.txt +++ b/Src/BUILDME.txt @@ -5,9 +5,9 @@ for other languages. The final files (installers, archives) are saved to the Setup\Final folder. You need the following tools: -Visual Studio 2019 (Community Edition is enough) +Visual Studio 2022 (Community Edition is enough) - Desktop development with C++ workload - - Windows 10 SDK (10.0.19041.0) for Desktop C++ + - Windows 11 SDK (10.0.22621.0) for Desktop C++ - Visual C++ ATL support HTML Help Workshop WiX 3.7 diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index d53ba9d..a72ebb5 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -35,41 +35,41 @@ DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode diff --git a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj index 4bbe795..29a6bcb 100644 --- a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj @@ -23,21 +23,21 @@ Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode diff --git a/Src/ClassicExplorer/ExplorerBHO.h b/Src/ClassicExplorer/ExplorerBHO.h index e76c184..2f10ca4 100644 --- a/Src/ClassicExplorer/ExplorerBHO.h +++ b/Src/ClassicExplorer/ExplorerBHO.h @@ -53,7 +53,7 @@ public: m_ZoneWidth=0; } - DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBHO) + DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_EXPLORERBHO, CExplorerBHO) BEGIN_SINK_MAP( CExplorerBHO ) SINK_ENTRY_EX(1, DIID_DWebBrowserEvents2, DISPID_DOCUMENTCOMPLETE, OnDocumentComplete) diff --git a/Src/ClassicExplorer/ExplorerBand.h b/Src/ClassicExplorer/ExplorerBand.h index 54f7998..f30ab7c 100644 --- a/Src/ClassicExplorer/ExplorerBand.h +++ b/Src/ClassicExplorer/ExplorerBand.h @@ -178,7 +178,7 @@ class ATL_NO_VTABLE CExplorerBand : public: CExplorerBand( void ); - DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND) + DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_EXPLORERBAND, CExplorerBand) BEGIN_SINK_MAP( CExplorerBand ) SINK_ENTRY_EX(1, DIID_DWebBrowserEvents2, DISPID_NAVIGATECOMPLETE2, OnNavigateComplete) diff --git a/Src/ClassicExplorer/ShareOverlay.h b/Src/ClassicExplorer/ShareOverlay.h index 3ed4d03..7451ccb 100644 --- a/Src/ClassicExplorer/ShareOverlay.h +++ b/Src/ClassicExplorer/ShareOverlay.h @@ -20,7 +20,7 @@ class ATL_NO_VTABLE CShareOverlay : public: CShareOverlay( void ); - DECLARE_REGISTRY_RESOURCEID(IDR_SHAREOVERLAY) + DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_SHAREOVERLAY, CShareOverlay) DECLARE_PROTECT_FINAL_CONSTRUCT() diff --git a/Src/ClassicExplorer/stdafx.h b/Src/ClassicExplorer/stdafx.h index 76735f2..b912334 100644 --- a/Src/ClassicExplorer/stdafx.h +++ b/Src/ClassicExplorer/stdafx.h @@ -10,7 +10,7 @@ #define _ATL_APARTMENT_THREADED #define _ATL_NO_AUTOMATIC_NAMESPACE - +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include "resource.h" diff --git a/Src/ClassicIE/ClassicIE.vcxproj b/Src/ClassicIE/ClassicIE.vcxproj index 42b34e6..cd70f7e 100644 --- a/Src/ClassicIE/ClassicIE.vcxproj +++ b/Src/ClassicIE/ClassicIE.vcxproj @@ -35,41 +35,41 @@ Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj index 593f173..8c11a8b 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -35,41 +35,41 @@ DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode diff --git a/Src/ClassicIE/ClassicIEDLL/stdafx.h b/Src/ClassicIE/ClassicIEDLL/stdafx.h index 57d4d82..25c5416 100644 --- a/Src/ClassicIE/ClassicIEDLL/stdafx.h +++ b/Src/ClassicIE/ClassicIEDLL/stdafx.h @@ -13,7 +13,7 @@ #define ISOLATION_AWARE_ENABLED 1 #define _ATL_APARTMENT_THREADED #define _ATL_NO_AUTOMATIC_NAMESPACE - +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include "resource.h" diff --git a/Src/Lib/Lib.vcxproj b/Src/Lib/Lib.vcxproj index ac8a4d8..ce02cb7 100644 --- a/Src/Lib/Lib.vcxproj +++ b/Src/Lib/Lib.vcxproj @@ -27,27 +27,27 @@ StaticLibrary - v142 + v143 Static Unicode true StaticLibrary - v142 + v143 Static Unicode StaticLibrary - v142 + v143 Static Unicode true StaticLibrary - v142 + v143 Static Unicode diff --git a/Src/Lib/stdafx.h b/Src/Lib/stdafx.h index 122f466..9f7676b 100644 --- a/Src/Lib/stdafx.h +++ b/Src/Lib/stdafx.h @@ -14,6 +14,7 @@ #include #include +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include diff --git a/Src/OpenShell.sln b/Src/OpenShell.sln index 3209039..9cd4940 100644 --- a/Src/OpenShell.sln +++ b/Src/OpenShell.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29324.140 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8-C0DB-4991-AF03-124128EDEF98}" EndProject diff --git a/Src/Setup/Setup.vcxproj b/Src/Setup/Setup.vcxproj index 62ccbfe..4fde964 100644 --- a/Src/Setup/Setup.vcxproj +++ b/Src/Setup/Setup.vcxproj @@ -19,13 +19,13 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode diff --git a/Src/Setup/SetupHelper/SetupHelper.vcxproj b/Src/Setup/SetupHelper/SetupHelper.vcxproj index 26e8e93..47e51ab 100644 --- a/Src/Setup/SetupHelper/SetupHelper.vcxproj +++ b/Src/Setup/SetupHelper/SetupHelper.vcxproj @@ -19,13 +19,13 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode diff --git a/Src/Setup/UpdateBin/UpdateBin.vcxproj b/Src/Setup/UpdateBin/UpdateBin.vcxproj index 3cedb1b..a31400c 100644 --- a/Src/Setup/UpdateBin/UpdateBin.vcxproj +++ b/Src/Setup/UpdateBin/UpdateBin.vcxproj @@ -55,57 +55,57 @@ DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Setup/Utility/Utility.vcxproj b/Src/Setup/Utility/Utility.vcxproj index c06b734..f54cf3b 100644 --- a/Src/Setup/Utility/Utility.vcxproj +++ b/Src/Setup/Utility/Utility.vcxproj @@ -27,27 +27,27 @@ Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode diff --git a/Src/Setup/en-US/en-US.vcxproj b/Src/Setup/en-US/en-US.vcxproj index df1d9c6..37622bd 100644 --- a/Src/Setup/en-US/en-US.vcxproj +++ b/Src/Setup/en-US/en-US.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/ClassicSkin/ClassicSkin.vcxproj b/Src/Skins/ClassicSkin/ClassicSkin.vcxproj index 15fd50e..8ae2503 100644 --- a/Src/Skins/ClassicSkin/ClassicSkin.vcxproj +++ b/Src/Skins/ClassicSkin/ClassicSkin.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj b/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj index ffde5f5..19bd4d6 100644 --- a/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj +++ b/Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/FullGlass/FullGlass.vcxproj b/Src/Skins/FullGlass/FullGlass.vcxproj index 4299cf8..da86597 100644 --- a/Src/Skins/FullGlass/FullGlass.vcxproj +++ b/Src/Skins/FullGlass/FullGlass.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Metallic7/Metallic7.vcxproj b/Src/Skins/Metallic7/Metallic7.vcxproj index 67a7615..3191867 100644 --- a/Src/Skins/Metallic7/Metallic7.vcxproj +++ b/Src/Skins/Metallic7/Metallic7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Metro/Metro.vcxproj b/Src/Skins/Metro/Metro.vcxproj index c806d30..9bfe85f 100644 --- a/Src/Skins/Metro/Metro.vcxproj +++ b/Src/Skins/Metro/Metro.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Metro7/Metro7.vcxproj b/Src/Skins/Metro7/Metro7.vcxproj index 8710c77..9403b99 100644 --- a/Src/Skins/Metro7/Metro7.vcxproj +++ b/Src/Skins/Metro7/Metro7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Midnight7/Midnight7.vcxproj b/Src/Skins/Midnight7/Midnight7.vcxproj index 7582b10..9a0e284 100644 --- a/Src/Skins/Midnight7/Midnight7.vcxproj +++ b/Src/Skins/Midnight7/Midnight7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/SmokedGlass/SmokedGlass.vcxproj b/Src/Skins/SmokedGlass/SmokedGlass.vcxproj index 51626e5..cc1e25b 100644 --- a/Src/Skins/SmokedGlass/SmokedGlass.vcxproj +++ b/Src/Skins/SmokedGlass/SmokedGlass.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Win7Aero/Win7Aero.vcxproj b/Src/Skins/Win7Aero/Win7Aero.vcxproj index ba959e5..c0ed32e 100644 --- a/Src/Skins/Win7Aero/Win7Aero.vcxproj +++ b/Src/Skins/Win7Aero/Win7Aero.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Win7Aero7/Win7Aero7.vcxproj b/Src/Skins/Win7Aero7/Win7Aero7.vcxproj index 8a532df..d67e874 100644 --- a/Src/Skins/Win7Aero7/Win7Aero7.vcxproj +++ b/Src/Skins/Win7Aero7/Win7Aero7.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Win7Basic/Win7Basic.vcxproj b/Src/Skins/Win7Basic/Win7Basic.vcxproj index d87982c..92c9665 100644 --- a/Src/Skins/Win7Basic/Win7Basic.vcxproj +++ b/Src/Skins/Win7Basic/Win7Basic.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Win8/Win8.vcxproj b/Src/Skins/Win8/Win8.vcxproj index a5c88b1..84fb807 100644 --- a/Src/Skins/Win8/Win8.vcxproj +++ b/Src/Skins/Win8/Win8.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/Win87/Win87.vcxproj b/Src/Skins/Win87/Win87.vcxproj index d9d4783..5cf6fd5 100644 --- a/Src/Skins/Win87/Win87.vcxproj +++ b/Src/Skins/Win87/Win87.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/Skins/WinXP/WinXP.vcxproj b/Src/Skins/WinXP/WinXP.vcxproj index f531293..7e8df34 100644 --- a/Src/Skins/WinXP/WinXP.vcxproj +++ b/Src/Skins/WinXP/WinXP.vcxproj @@ -15,7 +15,7 @@ DynamicLibrary - v142 + v143 Unicode diff --git a/Src/StartMenu/StartMenu.vcxproj b/Src/StartMenu/StartMenu.vcxproj index fa4f31e..8db8df2 100644 --- a/Src/StartMenu/StartMenu.vcxproj +++ b/Src/StartMenu/StartMenu.vcxproj @@ -35,41 +35,41 @@ Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj index 5777b91..1c004a4 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj @@ -35,41 +35,41 @@ DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode diff --git a/Src/StartMenu/StartMenuDLL/stdafx.h b/Src/StartMenu/StartMenuDLL/stdafx.h index 47dbfcc..88e10be 100644 --- a/Src/StartMenu/StartMenuDLL/stdafx.h +++ b/Src/StartMenu/StartMenuDLL/stdafx.h @@ -14,6 +14,7 @@ #include #include +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.h b/Src/StartMenu/StartMenuHelper/ModernSettings.h index e1c4a18..08f8732 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettings.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.h @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h index 78fe1f1..e7abe40 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h @@ -19,7 +19,7 @@ public: { } -DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSCONTEXTMENU) +DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_MODERNSETTINGSCONTEXTMENU, CModernSettingsContextMenu) DECLARE_NOT_AGGREGATABLE(CModernSettingsContextMenu) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h index e5d0a31..805ad0d 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h @@ -21,7 +21,7 @@ public: { } -DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSSHELLFOLDER) +DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_MODERNSETTINGSSHELLFOLDER, CModernSettingsShellFolder) DECLARE_NOT_AGGREGATABLE(CModernSettingsShellFolder) diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index 5e9cd31..dd637a6 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -35,41 +35,41 @@ DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode true DynamicLibrary - v142 + v143 Static Unicode diff --git a/Src/StartMenu/StartMenuHelper/stdafx.h b/Src/StartMenu/StartMenuHelper/stdafx.h index b1237cc..48ff5c7 100644 --- a/Src/StartMenu/StartMenuHelper/stdafx.h +++ b/Src/StartMenu/StartMenuHelper/stdafx.h @@ -12,7 +12,7 @@ #define _ATL_APARTMENT_THREADED #define _ATL_NO_AUTOMATIC_NAMESPACE - +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include "resource.h" diff --git a/Src/StartMenu/stdafx.h b/Src/StartMenu/stdafx.h index 122f466..9f7676b 100644 --- a/Src/StartMenu/stdafx.h +++ b/Src/StartMenu/stdafx.h @@ -14,6 +14,7 @@ #include #include +#define _ATL_MODULES // compatibility with /permissive- #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit #include diff --git a/Src/Update/DesktopToasts/DesktopToasts.vcxproj b/Src/Update/DesktopToasts/DesktopToasts.vcxproj index 5d5a775..b912f1d 100644 --- a/Src/Update/DesktopToasts/DesktopToasts.vcxproj +++ b/Src/Update/DesktopToasts/DesktopToasts.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/Src/Update/Update.vcxproj b/Src/Update/Update.vcxproj index 013ace8..f5b6b7a 100644 --- a/Src/Update/Update.vcxproj +++ b/Src/Update/Update.vcxproj @@ -19,14 +19,14 @@ Application - v142 + v143 Static Unicode true Application - v142 + v143 Static Unicode diff --git a/appveyor.yml b/appveyor.yml index 96c945a..3d85009 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ branches: pull_requests: do_not_increment_build_number: true skip_tags: true -image: Visual Studio 2019 +image: Visual Studio 2022 clone_depth: 1 build_script: - cmd: Src\Setup\__MakeFinal.bat