Skip to content

Commit a58a8e4

Browse files
committed
Update 3rd party PJSysInfo unit to v5.20.0
1 parent 976b6e5 commit a58a8e4

File tree

1 file changed

+53
-13
lines changed

1 file changed

+53
-13
lines changed

Src/3rdParty/PJSysInfo.pas

Lines changed: 53 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@ TBuildNameMap = record
14511451

14521452
// Windows 11 Dev channel releases (with version string "Dev").
14531453
// For details see https://en.wikipedia.org/wiki/Windows_11_version_history
1454-
Win11DevChannelDevBuilds: array[0..14] of Integer = (
1454+
Win11DevChannelDevBuilds: array[0..25] of Integer = (
14551455
// pre Win 11 release (expired 2021/10/31):
14561456
// 22449, 22454, 22458, 22463,
14571457
// pre Win 11 release (expired 2022/09/15):
@@ -1465,7 +1465,15 @@ TBuildNameMap = record
14651465
// post Win 11 22H2 beta release (expiring 2023/09/15):
14661466
25182, 25188, 25193, 25197, 25201, 25206, 25211,
14671467
// post Win 11 22H2 release (expiring 2023/09/15):
1468-
25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267
1468+
25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276, 25281,
1469+
25284, 25290, 25295, 25300, 25309, 23403, 23419, 23424
1470+
);
1471+
1472+
// Preview builds of Windows 11 in the Canary Channel
1473+
// For details see https://en.wikipedia.org/wiki/Windows_11_version_history
1474+
Win11CanaryPreviewBuilds: array[0..2] of Integer = (
1475+
// expiring 2023/09/15:
1476+
25314, 25324, 25330
14691477
);
14701478

14711479
// Windows 11 Dev channel builds with version string "22H2"
@@ -1478,7 +1486,8 @@ TBuildNameMap = record
14781486
22610, 22616
14791487
);
14801488

1481-
Win11FutureComponentBetaChannelBuild = 22623;
1489+
Win11Feb23ComponentBetaChannelBuild = 22623;
1490+
Win11FutureComponentBetaChannelBuild = 22624;
14821491

14831492
Win11FirstBuild = Win11DevBuild; // First build number of Windows 11
14841493

@@ -2141,11 +2150,11 @@ procedure InitPlatformIdEx;
21412150
1288, 1348, 1387, 1415, 1466, 1469, 1503, 1526, 1566, 1586,
21422151
1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
21432152
1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
2144-
2311, 2364..MaxInt:
2153+
2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788 .. MaxInt:
21452154
InternalExtraUpdateInfo := 'Version 21H2';
21462155
1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
21472156
1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862, 1947,
2148-
2192:
2157+
2192, 2545:
21492158
InternalExtraUpdateInfo := Format(
21502159
'Version 21H2 [Release Preview Channel v10.0.%d.%d]',
21512160
[InternalBuildNumber, InternalRevisionNumber]
@@ -2162,9 +2171,10 @@ procedure InitPlatformIdEx;
21622171
// **REF5**
21632172
InternalBuildNumber := Win1022H2Build;
21642173
case InternalBuildNumber of
2165-
2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364..MaxInt:
2174+
2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364, 2486, 2546,
2175+
2604, 2673, 2728, 2788 .. MaxInt:
21662176
InternalExtraUpdateInfo := 'Version 22H2';
2167-
1865, 1889, 1949, 2075, 2301:
2177+
1865, 1889, 1949, 2075, 2301, 2670, 2787:
21682178
InternalExtraUpdateInfo := Format(
21692179
'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
21702180
[InternalBuildNumber, InternalRevisionNumber]
@@ -2198,7 +2208,8 @@ procedure InitPlatformIdEx;
21982208
case InternalRevisionNumber of
21992209
194, 258, 282, 348, 376, 434, 438, 469, 493, 527, 556, 593, 613,
22002210
652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
2201-
1098, 1100, 1165, 1219, 1281, 1335..MaxInt:
2211+
1098, 1100, 1165, 1219, 1281, 1335, 1455, 1516, 1574, 1641,
2212+
1696, 1761 .. MaxInt:
22022213
// Public releases of Windows 11
22032214
InternalExtraUpdateInfo := 'Version 21H2';
22042215
51, 65, 71:
@@ -2217,7 +2228,7 @@ procedure InitPlatformIdEx;
22172228
+ '[Beta & Release Preview Channels v10.0.%d.%d]',
22182229
[InternalBuildNumber, InternalRevisionNumber]
22192230
);
2220-
651, 706, 776, 829, 917, 1041, 1163, 1279:
2231+
651, 706, 776, 829, 917, 1041, 1163, 1279, 1515, 1639, 1757:
22212232
InternalExtraUpdateInfo := Format(
22222233
'Version 21H1 Release Preview Channel v10.0.%d.%d]',
22232234
[InternalBuildNumber, InternalRevisionNumber]
@@ -2234,20 +2245,22 @@ procedure InitPlatformIdEx;
22342245
// **REF1**
22352246
InternalBuildNumber := Win11v22H2Build;
22362247
case InternalRevisionNumber of
2237-
382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1038..MaxInt:
2248+
382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1105, 1194,
2249+
1265, 1344, 1413, 1485, {placeholder->}1538 .. MaxInt:
22382250
InternalExtraUpdateInfo := 'Version 22H2';
22392251
1:
22402252
InternalExtraUpdateInfo := Format(
22412253
'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
22422254
[InternalBuildNumber, InternalRevisionNumber]
22432255
);
2244-
105, 169, 232, 317, 457, 607, 754, 898:
2256+
105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483:
22452257
InternalExtraUpdateInfo := Format(
22462258
'Version 22H2 [Release Preview v10.0.%d.%d]',
22472259
[InternalBuildNumber, InternalRevisionNumber]
22482260
);
22492261
160, 290, 436, 440, 450, 575, 586, 590, 598, 601, 730, 741, 746,
2250-
870, 875, 885, 891, 1020, 1028, 1037:
2262+
870, 875, 885, 891, 1020, 1028, 1037, 1095, 1180, 1245, 1250,
2263+
1255, 1325, 1391, 1465, 1470, 1537:
22512264
InternalExtraUpdateInfo := Format(
22522265
'Version 22H2 [Beta v10.0.%d.%d]',
22532266
[InternalBuildNumber, InternalRevisionNumber]
@@ -2287,6 +2300,16 @@ procedure InitPlatformIdEx;
22872300
[InternalBuildNumber, InternalRevisionNumber]
22882301
);
22892302
end
2303+
else if FindBuildNumberFrom(
2304+
Win11CanaryPreviewBuilds, InternalBuildNumber
2305+
) then
2306+
begin
2307+
// Win11 Canary Channel builds
2308+
InternalExtraUpdateInfo := Format(
2309+
'Canary Channel v10.0.%d.%d (Dev)',
2310+
[InternalBuildNumber, InternalRevisionNumber]
2311+
);
2312+
end
22902313
else if FindBuildNumberFrom(
22912314
Win11DevBetaChannels22H2Builds, InternalBuildNumber
22922315
) then
@@ -2297,11 +2320,28 @@ procedure InitPlatformIdEx;
22972320
[InternalBuildNumber, InternalRevisionNumber]
22982321
);
22992322
end
2323+
else if IsBuildNumber(Win11Feb23ComponentBetaChannelBuild) then
2324+
begin
2325+
InternalBuildNumber := Win11Feb23ComponentBetaChannelBuild;
2326+
case InternalRevisionNumber of
2327+
730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037, 1095,
2328+
1180, 1245, 1250, 1255, 1325 .. MaxInt:
2329+
InternalExtraUpdateInfo := Format(
2330+
'February 2023 Component Update Beta v10.0.%d.%d',
2331+
[InternalBuildNumber, InternalRevisionNumber]
2332+
);
2333+
else
2334+
InternalExtraUpdateInfo := Format(
2335+
'February 2023 Component Update [Unknown Beta v10.0.%d.%d]',
2336+
[InternalBuildNumber, InternalRevisionNumber]
2337+
);
2338+
end;
2339+
end
23002340
else if IsBuildNumber(Win11FutureComponentBetaChannelBuild) then
23012341
begin
23022342
InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
23032343
case InternalRevisionNumber of
2304-
730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037..MaxInt:
2344+
1391, 1465, 1470, 1537 .. MaxInt:
23052345
InternalExtraUpdateInfo := Format(
23062346
'Future Component Update Beta v10.0.%d.%d',
23072347
[InternalBuildNumber, InternalRevisionNumber]

0 commit comments

Comments
 (0)