Skip to content

Commit e25b656

Browse files
ge0rdige0rdi
committed
Use VS2022
Note that `_ATL_MODULES` define is now needed for compatibility with C++ conformance mode (`/permissive-`). More details here: https://developercommunity.visualstudio.com/t/Crash-in-ATL-CEnumerator::MoveNext-after/10116823
1 parent a784b6f commit e25b656

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+98
-94
lines changed

‎Src/BUILDME.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ for other languages.
55
The final files (installers, archives) are saved to the Setup\Final folder.
66

77
You need the following tools:
8-
Visual Studio 2019 (Community Edition is enough)
8+
Visual Studio 2022 (Community Edition is enough)
99
- Desktop development with C++ workload
10-
- Windows 10 SDK (10.0.19041.0) for Desktop C++
10+
- Windows 11 SDK (10.0.22621.0) for Desktop C++
1111
- Visual C++ ATL support
1212
HTML Help Workshop
1313
WiX 3.7

‎Src/ClassicExplorer/ClassicExplorer.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,41 @@
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
52-
<PlatformToolset>v142</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>DynamicLibrary</ConfigurationType>
58-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>DynamicLibrary</ConfigurationType>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
2525
<ConfigurationType>Application</ConfigurationType>
26-
<PlatformToolset>v142</PlatformToolset>
26+
<PlatformToolset>v143</PlatformToolset>
2727
<UseOfAtl>Static</UseOfAtl>
2828
<CharacterSet>Unicode</CharacterSet>
2929
<WholeProgramOptimization>true</WholeProgramOptimization>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3232
<ConfigurationType>Application</ConfigurationType>
33-
<PlatformToolset>v142</PlatformToolset>
33+
<PlatformToolset>v143</PlatformToolset>
3434
<UseOfAtl>Static</UseOfAtl>
3535
<CharacterSet>Unicode</CharacterSet>
3636
<WholeProgramOptimization>true</WholeProgramOptimization>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
<UseOfAtl>Static</UseOfAtl>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>

‎Src/ClassicExplorer/ExplorerBHO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ATL_NO_VTABLE CExplorerBHO :
5353
m_ZoneWidth=0;
5454
}
5555

56-
DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBHO)
56+
DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_EXPLORERBHO, CExplorerBHO)
5757

5858
BEGIN_SINK_MAP( CExplorerBHO )
5959
SINK_ENTRY_EX(1, DIID_DWebBrowserEvents2, DISPID_DOCUMENTCOMPLETE, OnDocumentComplete)

‎Src/ClassicExplorer/ExplorerBand.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class ATL_NO_VTABLE CExplorerBand :
178178
public:
179179
CExplorerBand( void );
180180

181-
DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND)
181+
DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_EXPLORERBAND, CExplorerBand)
182182

183183
BEGIN_SINK_MAP( CExplorerBand )
184184
SINK_ENTRY_EX(1, DIID_DWebBrowserEvents2, DISPID_NAVIGATECOMPLETE2, OnNavigateComplete)

‎Src/ClassicExplorer/ShareOverlay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ATL_NO_VTABLE CShareOverlay :
2020
public:
2121
CShareOverlay( void );
2222

23-
DECLARE_REGISTRY_RESOURCEID(IDR_SHAREOVERLAY)
23+
DECLARE_REGISTRY_RESOURCEID_V2_WITHOUT_MODULE(IDR_SHAREOVERLAY, CShareOverlay)
2424

2525
DECLARE_PROTECT_FINAL_CONSTRUCT()
2626

‎Src/ClassicExplorer/stdafx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define _ATL_APARTMENT_THREADED
1212
#define _ATL_NO_AUTOMATIC_NAMESPACE
13-
13+
#define _ATL_MODULES // compatibility with /permissive-
1414
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
1515

1616
#include "resource.h"

‎Src/ClassicIE/ClassicIE.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,41 @@
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>Application</ConfigurationType>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
52-
<PlatformToolset>v142</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
58-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>Application</ConfigurationType>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,41 @@
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
52-
<PlatformToolset>v142</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>DynamicLibrary</ConfigurationType>
58-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>DynamicLibrary</ConfigurationType>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/ClassicIE/ClassicIEDLL/stdafx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define ISOLATION_AWARE_ENABLED 1
1414
#define _ATL_APARTMENT_THREADED
1515
#define _ATL_NO_AUTOMATIC_NAMESPACE
16-
16+
#define _ATL_MODULES // compatibility with /permissive-
1717
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
1818

1919
#include "resource.h"

0 commit comments

Comments
 (0)