Skip to content

Commit 174497e

Browse files
rainersrainers
committed
* build against WinSDK 10.0.26100.0
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.14 * mago: fixed showing intellisense information in tool tip while debugging in VS2022 * full installer now bundled with DMD 2.110.0 and LDC 1.40.0
1 parent 67ae7e8 commit 174497e

File tree

12 files changed

+115
-19
lines changed

12 files changed

+115
-19
lines changed

‎CHANGES‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,3 +1400,9 @@ Version history
14001400
2025-03-02 version 1.4.0-rc6
14011401
* now works with Visual Studio for Windows on ARM64
14021402
* installer now supports 4 parallel installations of VS 2022
1403+
1404+
2025-03-02 version 1.4.0
1405+
* added separate version of dbuild.dll linked against Microsoft.Build.CPPTasks.Common for VS 17.14
1406+
* mago: fixed showing intellisense information in tool tip while debugging in VS2022
1407+
* mago: expression evaluator now resolves identifiers of named enumerator types
1408+
* full installer now bundled with DMD 2.110.0 and LDC 1.40.0

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ dbuild17_12:
183183
dbuild17_13:
184184
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_13;Platform=AnyCPU /t:Rebuild
185185

186-
dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 dbuild17_8 dbuild17_9 dbuild17_10 dbuild17_11 dbuild17_12 dbuild17_13
186+
dbuild17_14:
187+
cd msbuild\dbuild && $(MSBUILD) dbuild.csproj /p:Configuration=Release-v17_14;Platform=AnyCPU /t:Rebuild
188+
189+
dbuild17_all: dbuild17_0 dbuild17_1 dbuild17_2 dbuild17_3 dbuild17_4 dbuild17_5 dbuild17_6 dbuild17_7 \
190+
dbuild17_8 dbuild17_9 dbuild17_10 dbuild17_11 dbuild17_12 dbuild17_13 dbuild17_14
187191

188192
mago:
189193
cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln

‎VERSION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 1
22
#define VERSION_MINOR 4
33
#define VERSION_REVISION 0
4-
#define VERSION_BETA -rc
5-
#define VERSION_BUILD 6
4+
#define VERSION_BETA
5+
#define VERSION_BUILD 0

‎c2d/cpp2d.d‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,14 @@ string fixNumber(string num)
673673
return num[0..$-1];
674674
if(endsWith(num, "L"))
675675
return num[0..$-1];
676+
if(endsWith(num, "ui8"))
677+
return num[0..$-3];
678+
if(endsWith(num, "ui16") || endsWith(num, "ui32"))
679+
return num[0..$-4];
680+
if(endsWith(num, "i8"))
681+
return num[0..$-2];
682+
if(endsWith(num, "i16") || endsWith(num, "i32"))
683+
return num[0..$-3];
676684
return num;
677685
}
678686

‎c2d/idl2d.d‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ class idl2d
147147
"dpa_dsa.h",
148148
// Win SDK 10.0.18362.0
149149
"fileapifromapp.h",
150+
// Win SDK 10.0.26100.0
151+
// "intsafe.h",
150152
])
151153
win_idl_files ~= f ~ "*"; // make it optional
152154

@@ -580,6 +582,9 @@ class idl2d
580582
case "GetLastError":
581583
case "MF_END": // defined twice in winuser.h, but said to be obsolete
582584
case "__int3264":
585+
case "INT128_MIN":
586+
case "INT128_MAX":
587+
case "UINT128_MAX":
583588
return 1;
584589

585590
case "_NO_SCRIPT_GUIDS": // used in activdbg.h, disable to avoid duplicate GUID definitions
@@ -1282,6 +1287,11 @@ version(all)
12821287
replaceTokenSequence(tokens, "__VARIANT_NAME_4", "", true);
12831288
}
12841289

1290+
if(currentModule == "winbase")
1291+
{
1292+
replaceTokenSequence(tokens, "#define CopyVolatileMemory$defs\n$defines\n#define ZeroDeviceMemory RtlZeroDeviceMemory\n", "", false);
1293+
}
1294+
12851295
if(currentModule == "windef")
12861296
{
12871297
// avoid removal of #define TRUE 1
@@ -1329,6 +1339,8 @@ version(all)
13291339
"/+ $* +/", true);
13301340
replaceTokenSequence(tokens, "FORCEINLINE PVOID ReadPointerAcquire $code WritePointerRaw($args) { $code2 }",
13311341
"/+ $* +/", true);
1342+
// win 10.0.26100.0: unused definitions before declaration
1343+
replaceTokenSequence(tokens, "#define __NtCurrentTebAddr$def_more\n$defines\n#endif", "#endif", true);
13321344
}
13331345

13341346
if(currentModule == "commctrl")
@@ -1432,6 +1444,11 @@ version(all)
14321444
{
14331445
replaceTokenSequence(tokens, "#ifndef INTEROPLIB\n[in] $ifcode\n#else\n$elsecode\n#endif", "[in] $ifcode", false);
14341446
}
1447+
if(currentModule == "textmgr120")
1448+
{
1449+
// duplicate #define
1450+
replaceTokenSequence(tokens, "#define MAX_FILE_TYPE 24", "", false);
1451+
}
14351452

14361453
for(TokenIterator tokIt = tokens.begin(); tokIt != tokens.end; )
14371454
{
@@ -1983,6 +2000,7 @@ version(all) {
19832000
replaceTokenSequence(tokens, "__deref_out_xcount_opt($args)", "/+$*+/", true);
19842001
replaceTokenSequence(tokens, "__deref_opt_out_bcount_full($args)", "/+$*+/", true);
19852002
replaceTokenSequence(tokens, "__deref_inout_ecount_z($args)", "/+$*+/", true);
2003+
replaceTokenSequence(tokens, "_Deref_out_range_($args)", "/+$*+/", true);
19862004
replaceTokenSequence(tokens, "__field_bcount($args)", "/+$*+/", true);
19872005
replaceTokenSequence(tokens, "__field_bcount_opt($args)", "/+$*+/", true);
19882006
replaceTokenSequence(tokens, "__field_ecount($args)", "/+$*+/", true);
@@ -2045,6 +2063,8 @@ version(all) {
20452063
replaceTokenSequence(tokens, "_Outptr_opt_result_bytebuffer_all_($args)", "/+$*+/", true);
20462064
replaceTokenSequence(tokens, "_Outptr_opt_result_buffer_($args)", "/+$*+/", true);
20472065
replaceTokenSequence(tokens, "_Releases_exclusive_lock_($args)", "/+$*+/", true);
2066+
replaceTokenSequence(tokens, "_Releases_nonreentrant_lock_($args)", "/+$*+/", true);
2067+
replaceTokenSequence(tokens, "_Acquires_nonreentrant_lock_($args)", "/+$*+/", true);
20482068
replaceTokenSequence(tokens, "_Releases_shared_lock_($args)", "/+$*+/", true);
20492069
replaceTokenSequence(tokens, "_Acquires_exclusive_lock_($args)", "/+$*+/", true);
20502070
replaceTokenSequence(tokens, "_Acquires_shared_lock_($args)", "/+$*+/", true);

‎msbuild/dbuild/dbuild.csproj‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,28 @@
423423
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
424424
<TargetVer>17.13</TargetVer>
425425
</PropertyGroup>
426+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-v17_14|AnyCPU'">
427+
<OutputPath>bin\Release-v17_14\</OutputPath>
428+
<DefineConstants>TRACE;TOOLS_V17</DefineConstants>
429+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
430+
<Optimize>true</Optimize>
431+
<DebugType>pdbonly</DebugType>
432+
<PlatformTarget>AnyCPU</PlatformTarget>
433+
<ErrorReport>prompt</ErrorReport>
434+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
435+
<TargetVer>17.14</TargetVer>
436+
</PropertyGroup>
437+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-v17_14|AnyCPU'">
438+
<OutputPath>bin\Debug-v17_14\</OutputPath>
439+
<DefineConstants>TRACE;DEBUG;TOOLS_V17</DefineConstants>
440+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
441+
<Optimize>false</Optimize>
442+
<DebugType>pdbonly</DebugType>
443+
<PlatformTarget>AnyCPU</PlatformTarget>
444+
<ErrorReport>prompt</ErrorReport>
445+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
446+
<TargetVer>17.14</TargetVer>
447+
</PropertyGroup>
426448
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
427449
<DebugSymbols>true</DebugSymbols>
428450
<DebugType>full</DebugType>
@@ -466,9 +488,12 @@
466488
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
467489
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '12.0' or '$(TargetVer)' == '14.0' ">v4.5.2</TargetFrameworkVersion>
468490
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '16.0' or '$(TargetVer)' == '16.1' ">v4.7.2</TargetFrameworkVersion>
469-
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
470-
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9'
471-
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13'">v4.7.2</TargetFrameworkVersion>
491+
<TargetFrameworkVersion Condition=" '$(TargetVer)' == '17' or '$(TargetVer)' == '17.0'
492+
or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
493+
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6'
494+
or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8' or '$(TargetVer)' == '17.9'
495+
or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12'
496+
or '$(TargetVer)' == '17.13' or '$(TargetVer)' == '17.14'">v4.7.2</TargetFrameworkVersion>
472497
<GeneratePkgDefFile>false</GeneratePkgDefFile>
473498
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
474499
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -699,9 +724,12 @@
699724
</Reference>
700725
</ItemGroup>
701726
<!-- VS2022 -->
702-
<ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1' or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
703-
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6' or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8'
704-
or '$(TargetVer)' == '17.9' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11' or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13'">
727+
<ItemGroup Condition="'$(TargetVer)' == '17' or '$(TargetVer)' == '17.0' or '$(TargetVer)' == '17.1'
728+
or '$(TargetVer)' == '17.2' or '$(TargetVer)' == '17.3'
729+
or '$(TargetVer)' == '17.4' or '$(TargetVer)' == '17.5' or '$(TargetVer)' == '17.6'
730+
or '$(TargetVer)' == '17.7' or '$(TargetVer)' == '17.8'
731+
or '$(TargetVer)' == '17.9' or '$(TargetVer)' == '17.10' or '$(TargetVer)' == '17.11'
732+
or '$(TargetVer)' == '17.12' or '$(TargetVer)' == '17.13' or '$(TargetVer)' == '17.14'">
705733
<Reference Include="Microsoft.Build">
706734
<HintPath>assemblies\v17\Microsoft.Build.dll</HintPath>
707735
</Reference>
@@ -799,6 +827,11 @@
799827
<HintPath>assemblies\v17_13\Microsoft.Build.CPPTasks.Common.dll</HintPath>
800828
</Reference>
801829
</ItemGroup>
830+
<ItemGroup Condition="'$(TargetVer)' == '17.14'">
831+
<Reference Include="Microsoft.Build.CPPTasks.Common">
832+
<HintPath>assemblies\v17_14\Microsoft.Build.CPPTasks.Common.dll</HintPath>
833+
</Reference>
834+
</ItemGroup>
802835
<ItemGroup>
803836
<EmbeddedResource Include="Strings.resx">
804837
<SubType>Designer</SubType>

‎msbuild/dcompile_defaults.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<DBuildVersion Condition="$(MSBuildVersion_Major) != 16 and $(MSBuildVersion_Major) != 17">$(MSBuildVersion_Major).0</DBuildVersion>
4848
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) == 0">16.0</DBuildVersion>
4949
<DBuildVersion Condition="$(MSBuildVersion_Major) == 16 and $(MSBuildVersion_Minor) != 0">16.1</DBuildVersion>
50-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 13">17.$(MSBuildVersion_Minor)</DBuildVersion>
51-
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 13">17.13</DBuildVersion>
50+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &lt; 14">17.$(MSBuildVersion_Minor)</DBuildVersion>
51+
<DBuildVersion Condition="$(MSBuildVersion_Major) == 17 and $(MSBuildVersion_Minor) &gt;= 14">17.14</DBuildVersion>
5252
</PropertyGroup>
5353

5454
<PropertyGroup Condition="'$(DBuildVersion)' == ''">

‎nsis/visuald.nsi‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
; define DMD source path to include dmd installation
3131
; !define DMD
32-
!define DMD_VERSION "2.109.1"
32+
!define DMD_VERSION "2.110.0"
3333
!define DMD_SRC c:\d\dmd-${DMD_VERSION}
3434

3535
; define LDC to include ldc installation
3636
; !define LDC
37-
!define LDC_VERSION "1.39.0"
37+
!define LDC_VERSION "1.40.0"
3838
!define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
3939

4040
; define VS2019 to include VS2019 support
@@ -354,6 +354,7 @@ Section "Visual Studio package" SecPackage
354354
${File} ..\msbuild\dbuild\obj\release-v17_11\ dbuild.17.11.dll
355355
${File} ..\msbuild\dbuild\obj\release-v17_12\ dbuild.17.12.dll
356356
${File} ..\msbuild\dbuild\obj\release-v17_13\ dbuild.17.13.dll
357+
${File} ..\msbuild\dbuild\obj\release-v17_14\ dbuild.17.14.dll
357358
!endif
358359
WriteRegStr HKLM "Software\${APPNAME}" "msbuild" $INSTDIR\msbuild
359360
!endif
@@ -2099,10 +2100,10 @@ Function InstallForVS2022
20992100
!ifdef MAGO
21002101
${SetOutPath} "$1..\Packages\Debugger\x64"
21012102
${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoNatCC.dll
2102-
${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoNatCC.vsdconfig
21032103
${SetOutPath} "$1..\Packages\Debugger\arm64"
21042104
${File} ${MAGO_SOURCE}\bin\ARM64\Release\ MagoNatCC.dll
2105-
${File} ${MAGO_SOURCE}\bin\ARM64\Release\ MagoNatCC.vsdconfig
2105+
${SetOutPath} "$1..\Packages\Debugger"
2106+
${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoNatCC.vsdconfig
21062107
!endif
21072108

21082109
${SetOutPath} "$1\PublicAssemblies"

‎sdk/port/base.d‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ alias DWORD OLE_COLOR;
8787
alias bool boolean;
8888
alias ulong uint64;
8989

90+
enum DWORD_MAX = 0xffffffffU; // instead of intsafe.d
91+
9092
version(sdk) {}
9193
else {
9294
alias double DOUBLE;

‎sdk/vsi.visualdproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,6 +2748,7 @@
27482748
<File path="vsi\msdbg1710.d" />
27492749
<File path="vsi\msdbg1711.d" />
27502750
<File path="vsi\msdbg1712.d" />
2751+
<File path="vsi\msdbg1713.d" />
27512752
<File path="vsi\msdbg172.d" />
27522753
<File path="vsi\msdbg173.d" />
27532754
<File path="vsi\msdbg174.d" />
@@ -2773,6 +2774,11 @@
27732774
<File path="vsi\textmgr110.d" />
27742775
<File path="vsi\textmgr120.d" />
27752776
<File path="vsi\textmgr121.d" />
2777+
<File path="vsi\textmgr142.d" />
2778+
<File path="vsi\textmgr150.d" />
2779+
<File path="vsi\textmgr151.d" />
2780+
<File path="vsi\textmgr160.d" />
2781+
<File path="vsi\textmgr1713.d" />
27762782
<File path="vsi\textmgr2.d" />
27772783
<File path="vsi\textmgr90.d" />
27782784
<File path="vsi\textmgr91.d" />

0 commit comments

Comments
 (0)