authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-04-13 22:16:27-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-04-14 21:26:08-04:00
log425e38b6e0601e12329f93b2e94c76c1da300b8e
tree2aef938ebad6036c08482e566b3cc3c6404390f6
parente45bdc6bd6e47ec3f7a06dbb48f24e842bf43a0d

WindowsSdk: fix for new x86_64-windows CI


4 files changed, 284 insertions(+), 253 deletions(-)

lib/std/math.zig+25
......@@ -1588,6 +1588,31 @@ pub const Order = enum {
15881588 try testing.expect(Order.invert(order(-1, 0)) == .gt);
15891589 }
15901590
1591 pub fn differ(self: Order) ?Order {
1592 return if (self != .eq) self else null;
1593 }
1594
1595 test differ {
1596 const neg: i32 = -1;
1597 const zero: i32 = 0;
1598 const pos: i32 = 1;
1599 try testing.expect(order(zero, neg).differ() orelse
1600 order(pos, zero) == .gt);
1601 try testing.expect(order(zero, zero).differ() orelse
1602 order(zero, zero) == .eq);
1603 try testing.expect(order(pos, pos).differ() orelse
1604 order(neg, zero) == .lt);
1605 try testing.expect(order(zero, zero).differ() orelse
1606 order(pos, neg).differ() orelse
1607 order(neg, zero) == .gt);
1608 try testing.expect(order(pos, pos).differ() orelse
1609 order(pos, pos).differ() orelse
1610 order(neg, neg) == .eq);
1611 try testing.expect(order(zero, pos).differ() orelse
1612 order(neg, pos).differ() orelse
1613 order(pos, neg) == .lt);
1614 }
1615
15911616 pub fn compare(self: Order, op: CompareOperator) bool {
15921617 return switch (self) {
15931618 .lt => switch (op) {
lib/std/os/windows.zig+8
......@@ -3672,7 +3672,15 @@ pub const SEC_LARGE_PAGES = 0x80000000;
36723672pub const HKEY = *opaque {};
36733673
36743674pub const HKEY_CLASSES_ROOT: HKEY = @ptrFromInt(0x80000000);
3675pub const HKEY_CURRENT_USER: HKEY = @ptrFromInt(0x80000001);
36753676pub const HKEY_LOCAL_MACHINE: HKEY = @ptrFromInt(0x80000002);
3677pub const HKEY_USERS: HKEY = @ptrFromInt(0x80000003);
3678pub const HKEY_PERFORMANCE_DATA: HKEY = @ptrFromInt(0x80000004);
3679pub const HKEY_PERFORMANCE_TEXT: HKEY = @ptrFromInt(0x80000050);
3680pub const HKEY_PERFORMANCE_NLSTEXT: HKEY = @ptrFromInt(0x80000060);
3681pub const HKEY_CURRENT_CONFIG: HKEY = @ptrFromInt(0x80000005);
3682pub const HKEY_DYN_DATA: HKEY = @ptrFromInt(0x80000006);
3683pub const HKEY_CURRENT_USER_LOCAL_SETTINGS: HKEY = @ptrFromInt(0x80000007);
36763684
36773685/// Combines the STANDARD_RIGHTS_REQUIRED, KEY_QUERY_VALUE, KEY_SET_VALUE, KEY_CREATE_SUB_KEY,
36783686/// KEY_ENUMERATE_SUB_KEYS, KEY_NOTIFY, and KEY_CREATE_LINK access rights.
lib/std/zig/LibCInstallation.zig+33-41
......@@ -182,18 +182,18 @@ pub fn findNative(args: FindNativeOptions) FindError!LibCInstallation {
182182 });
183183 return self;
184184 } else if (is_windows) {
185 var sdk = std.zig.WindowsSdk.find(args.allocator) catch |err| switch (err) {
185 const sdk = std.zig.WindowsSdk.find(args.allocator) catch |err| switch (err) {
186186 error.NotFound => return error.WindowsSdkNotFound,
187187 error.PathTooLong => return error.WindowsSdkNotFound,
188188 error.OutOfMemory => return error.OutOfMemory,
189189 };
190190 defer sdk.free(args.allocator);
191191
192 try self.findNativeMsvcIncludeDir(args, &sdk);
193 try self.findNativeMsvcLibDir(args, &sdk);
194 try self.findNativeKernel32LibDir(args, &sdk);
195 try self.findNativeIncludeDirWindows(args, &sdk);
196 try self.findNativeCrtDirWindows(args, &sdk);
192 try self.findNativeMsvcIncludeDir(args, sdk);
193 try self.findNativeMsvcLibDir(args, sdk);
194 try self.findNativeKernel32LibDir(args, sdk);
195 try self.findNativeIncludeDirWindows(args, sdk);
196 try self.findNativeCrtDirWindows(args, sdk);
197197 } else if (is_haiku) {
198198 try self.findNativeIncludeDirPosix(args);
199199 try self.findNativeGccDirHaiku(args);
......@@ -358,19 +358,19 @@ fn findNativeIncludeDirPosix(self: *LibCInstallation, args: FindNativeOptions) F
358358fn findNativeIncludeDirWindows(
359359 self: *LibCInstallation,
360360 args: FindNativeOptions,
361 sdk: *std.zig.WindowsSdk,
361 sdk: std.zig.WindowsSdk,
362362) FindError!void {
363363 const allocator = args.allocator;
364364
365 var search_buf: [2]Search = undefined;
366 const searches = fillSearch(&search_buf, sdk);
365 var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
366 const installs = fillInstallations(&install_buf, sdk);
367367
368368 var result_buf = std.ArrayList(u8).init(allocator);
369369 defer result_buf.deinit();
370370
371 for (searches) |search| {
371 for (installs) |install| {
372372 result_buf.shrinkAndFree(0);
373 try result_buf.writer().print("{s}\\Include\\{s}\\ucrt", .{ search.path, search.version });
373 try result_buf.writer().print("{s}\\Include\\{s}\\ucrt", .{ install.path, install.version });
374374
375375 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
376376 error.FileNotFound,
......@@ -397,12 +397,12 @@ fn findNativeIncludeDirWindows(
397397fn findNativeCrtDirWindows(
398398 self: *LibCInstallation,
399399 args: FindNativeOptions,
400 sdk: *std.zig.WindowsSdk,
400 sdk: std.zig.WindowsSdk,
401401) FindError!void {
402402 const allocator = args.allocator;
403403
404 var search_buf: [2]Search = undefined;
405 const searches = fillSearch(&search_buf, sdk);
404 var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
405 const installs = fillInstallations(&install_buf, sdk);
406406
407407 var result_buf = std.ArrayList(u8).init(allocator);
408408 defer result_buf.deinit();
......@@ -415,9 +415,9 @@ fn findNativeCrtDirWindows(
415415 else => return error.UnsupportedArchitecture,
416416 };
417417
418 for (searches) |search| {
418 for (installs) |install| {
419419 result_buf.shrinkAndFree(0);
420 try result_buf.writer().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ search.path, search.version, arch_sub_dir });
420 try result_buf.writer().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ install.path, install.version, arch_sub_dir });
421421
422422 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
423423 error.FileNotFound,
......@@ -464,12 +464,12 @@ fn findNativeGccDirHaiku(self: *LibCInstallation, args: FindNativeOptions) FindE
464464fn findNativeKernel32LibDir(
465465 self: *LibCInstallation,
466466 args: FindNativeOptions,
467 sdk: *std.zig.WindowsSdk,
467 sdk: std.zig.WindowsSdk,
468468) FindError!void {
469469 const allocator = args.allocator;
470470
471 var search_buf: [2]Search = undefined;
472 const searches = fillSearch(&search_buf, sdk);
471 var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
472 const installs = fillInstallations(&install_buf, sdk);
473473
474474 var result_buf = std.ArrayList(u8).init(allocator);
475475 defer result_buf.deinit();
......@@ -482,10 +482,10 @@ fn findNativeKernel32LibDir(
482482 else => return error.UnsupportedArchitecture,
483483 };
484484
485 for (searches) |search| {
485 for (installs) |install| {
486486 result_buf.shrinkAndFree(0);
487487 const stream = result_buf.writer();
488 try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ search.path, search.version, arch_sub_dir });
488 try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ install.path, install.version, arch_sub_dir });
489489
490490 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
491491 error.FileNotFound,
......@@ -511,7 +511,7 @@ fn findNativeKernel32LibDir(
511511fn findNativeMsvcIncludeDir(
512512 self: *LibCInstallation,
513513 args: FindNativeOptions,
514 sdk: *std.zig.WindowsSdk,
514 sdk: std.zig.WindowsSdk,
515515) FindError!void {
516516 const allocator = args.allocator;
517517
......@@ -543,7 +543,7 @@ fn findNativeMsvcIncludeDir(
543543fn findNativeMsvcLibDir(
544544 self: *LibCInstallation,
545545 args: FindNativeOptions,
546 sdk: *std.zig.WindowsSdk,
546 sdk: std.zig.WindowsSdk,
547547) FindError!void {
548548 const allocator = args.allocator;
549549 const msvc_lib_dir = sdk.msvc_lib_dir orelse return error.LibCRuntimeNotFound;
......@@ -654,28 +654,20 @@ fn printVerboseInvocation(
654654 }
655655}
656656
657const Search = struct {
658 path: []const u8,
659 version: []const u8,
660};
661
662fn fillSearch(search_buf: *[2]Search, sdk: *std.zig.WindowsSdk) []Search {
663 var search_end: usize = 0;
657fn fillInstallations(
658 installs: *[2]std.zig.WindowsSdk.Installation,
659 sdk: std.zig.WindowsSdk,
660) []std.zig.WindowsSdk.Installation {
661 var installs_len: usize = 0;
664662 if (sdk.windows10sdk) |windows10sdk| {
665 search_buf[search_end] = .{
666 .path = windows10sdk.path,
667 .version = windows10sdk.version,
668 };
669 search_end += 1;
663 installs[installs_len] = windows10sdk;
664 installs_len += 1;
670665 }
671666 if (sdk.windows81sdk) |windows81sdk| {
672 search_buf[search_end] = .{
673 .path = windows81sdk.path,
674 .version = windows81sdk.version,
675 };
676 search_end += 1;
667 installs[installs_len] = windows81sdk;
668 installs_len += 1;
677669 }
678 return search_buf[0..search_end];
670 return installs[0..installs_len];
679671}
680672
681673const inf_loop_env_key = "ZIG_IS_DETECTING_LIBC_PATHS";
lib/std/zig/WindowsSdk.zig+218-212
......@@ -1,5 +1,5 @@
1windows10sdk: ?Windows10Sdk,
2windows81sdk: ?Windows81Sdk,
1windows10sdk: ?Installation,
2windows81sdk: ?Installation,
33msvc_lib_dir: ?[]const u8,
44
55const WindowsSdk = @This();
......@@ -9,7 +9,7 @@ const builtin = @import("builtin");
99const windows = std.os.windows;
1010const RRF = windows.advapi32.RRF;
1111
12const WINDOWS_KIT_REG_KEY = "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots";
12const windows_kits_reg_key = "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots";
1313
1414// https://learn.microsoft.com/en-us/windows/win32/msi/productversion
1515const version_major_minor_max_length = "255.255".len;
......@@ -23,34 +23,24 @@ pub fn find(allocator: std.mem.Allocator) error{ OutOfMemory, NotFound, PathTooL
2323 if (builtin.os.tag != .windows) return error.NotFound;
2424
2525 //note(dimenus): If this key doesn't exist, neither the Win 8 SDK nor the Win 10 SDK is installed
26 const roots_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, WINDOWS_KIT_REG_KEY) catch |err| switch (err) {
26 const roots_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, windows_kits_reg_key) catch |err| switch (err) {
2727 error.KeyNotFound => return error.NotFound,
2828 };
2929 defer roots_key.closeKey();
3030
31 const windows10sdk: ?Windows10Sdk = blk: {
32 const windows10sdk = Windows10Sdk.find(allocator) catch |err| switch (err) {
33 error.Windows10SdkNotFound,
34 error.PathTooLong,
35 error.VersionTooLong,
36 => break :blk null,
37 error.OutOfMemory => return error.OutOfMemory,
38 };
39 const is_valid_version = windows10sdk.isValidVersion();
40 if (!is_valid_version) break :blk null;
41 break :blk windows10sdk;
31 const windows10sdk = Installation.find(allocator, roots_key, "KitsRoot10", "", "v10.0") catch |err| switch (err) {
32 error.InstallationNotFound => null,
33 error.PathTooLong => null,
34 error.VersionTooLong => null,
35 error.OutOfMemory => return error.OutOfMemory,
4236 };
4337 errdefer if (windows10sdk) |*w| w.free(allocator);
4438
45 const windows81sdk: ?Windows81Sdk = blk: {
46 const windows81sdk = Windows81Sdk.find(allocator, &roots_key) catch |err| switch (err) {
47 error.Windows81SdkNotFound => break :blk null,
48 error.PathTooLong => break :blk null,
49 error.VersionTooLong => break :blk null,
50 error.OutOfMemory => return error.OutOfMemory,
51 };
52 // no check
53 break :blk windows81sdk;
39 const windows81sdk = Installation.find(allocator, roots_key, "KitsRoot81", "winver", "v8.1") catch |err| switch (err) {
40 error.InstallationNotFound => null,
41 error.PathTooLong => null,
42 error.VersionTooLong => null,
43 error.OutOfMemory => return error.OutOfMemory,
5444 };
5545 errdefer if (windows81sdk) |*w| w.free(allocator);
5646
......@@ -60,96 +50,91 @@ pub fn find(allocator: std.mem.Allocator) error{ OutOfMemory, NotFound, PathTooL
6050 };
6151 errdefer allocator.free(msvc_lib_dir);
6252
63 return WindowsSdk{
53 return .{
6454 .windows10sdk = windows10sdk,
6555 .windows81sdk = windows81sdk,
6656 .msvc_lib_dir = msvc_lib_dir,
6757 };
6858}
6959
70pub fn free(self: *const WindowsSdk, allocator: std.mem.Allocator) void {
71 if (self.windows10sdk) |*w10sdk| {
60pub fn free(sdk: WindowsSdk, allocator: std.mem.Allocator) void {
61 if (sdk.windows10sdk) |*w10sdk| {
7262 w10sdk.free(allocator);
7363 }
74 if (self.windows81sdk) |*w81sdk| {
64 if (sdk.windows81sdk) |*w81sdk| {
7565 w81sdk.free(allocator);
7666 }
77 if (self.msvc_lib_dir) |msvc_lib_dir| {
67 if (sdk.msvc_lib_dir) |msvc_lib_dir| {
7868 allocator.free(msvc_lib_dir);
7969 }
8070}
8171
82/// Iterates via `iterator` and collects all folders with names starting with `optional_prefix`
83/// and similar to SemVer. Returns slice of folder names sorted in descending order.
72/// Iterates via `iterator` and collects all folders with names starting with `strip_prefix`
73/// and a version. Returns slice of version strings sorted in descending order.
8474/// Caller owns result.
85fn iterateAndFilterBySemVer(
75fn iterateAndFilterByVersion(
8676 iterator: *std.fs.Dir.Iterator,
8777 allocator: std.mem.Allocator,
88 comptime optional_prefix: ?[]const u8,
89) error{ OutOfMemory, VersionNotFound }![][]const u8 {
90 var dirs_filtered_list = std.ArrayList([]const u8).init(allocator);
91 errdefer {
92 for (dirs_filtered_list.items) |filtered_dir| allocator.free(filtered_dir);
93 dirs_filtered_list.deinit();
94 }
95
96 var normalized_name_buf: [std.fs.MAX_NAME_BYTES + ".0+build.0".len]u8 = undefined;
97 var normalized_name_fbs = std.io.fixedBufferStream(&normalized_name_buf);
98 const normalized_name_w = normalized_name_fbs.writer();
99 iterate_folder: while (true) : (normalized_name_fbs.reset()) {
100 const maybe_entry = iterator.next() catch continue :iterate_folder;
101 const entry = maybe_entry orelse break :iterate_folder;
102
103 if (entry.kind != .directory)
104 continue :iterate_folder;
105
106 // invalidated on next iteration
107 const subfolder_name = blk: {
108 if (comptime optional_prefix) |prefix| {
109 if (!std.mem.startsWith(u8, entry.name, prefix)) continue :iterate_folder;
110 break :blk entry.name[prefix.len..];
111 } else break :blk entry.name;
112 };
113
114 { // check if subfolder name looks similar to SemVer
115 switch (std.mem.count(u8, subfolder_name, ".")) {
116 0 => normalized_name_w.print("{s}.0.0+build.0", .{subfolder_name}) catch unreachable, // 17 => 17.0.0+build.0
117 1 => if (std.mem.indexOfScalar(u8, subfolder_name, '_')) |underscore_pos| blk: { // 17.0_9e9cbb98 => 17.0.1+build.9e9cbb98
118 var subfolder_name_tmp_copy_buf: [std.fs.MAX_NAME_BYTES]u8 = undefined;
119 const subfolder_name_tmp_copy = subfolder_name_tmp_copy_buf[0..subfolder_name.len];
120 @memcpy(subfolder_name_tmp_copy, subfolder_name);
121
122 subfolder_name_tmp_copy[underscore_pos] = '.'; // 17.0_9e9cbb98 => 17.0.9e9cbb98
123 var subfolder_name_parts = std.mem.splitScalar(u8, subfolder_name_tmp_copy, '.'); // [ 17, 0, 9e9cbb98 ]
124
125 const first = subfolder_name_parts.first(); // 17
126 const second = subfolder_name_parts.next().?; // 0
127 const third = subfolder_name_parts.rest(); // 9e9cbb98
78 prefix: []const u8,
79) error{OutOfMemory}![][]const u8 {
80 const Version = struct {
81 nums: [4]u32,
82 build: []const u8,
83
84 fn parseNum(num: []const u8) ?u32 {
85 if (num[0] == '0' and num.len > 1) return null;
86 return std.fmt.parseInt(u32, num, 10) catch null;
87 }
12888
129 break :blk normalized_name_w.print("{s}.{s}.1+build.{s}", .{ first, second, third }) catch unreachable; // [ 17, 0, 9e9cbb98 ] => 17.0.1+build.9e9cbb98
130 } else normalized_name_w.print("{s}.0+build.0", .{subfolder_name}) catch unreachable, // 17.0 => 17.0.0+build.0
131 else => normalized_name_w.print("{s}+build.0", .{subfolder_name}) catch unreachable, // 17.0.0 => 17.0.0+build.0
132 }
133 const subfolder_name_normalized: []const u8 = normalized_name_fbs.getWritten();
134 const sem_ver = std.SemanticVersion.parse(subfolder_name_normalized);
135 _ = sem_ver catch continue :iterate_folder;
89 fn order(lhs: @This(), rhs: @This()) std.math.Order {
90 return std.mem.order(u32, &lhs.nums, &rhs.nums).differ() orelse
91 std.mem.order(u8, lhs.build, rhs.build);
13692 }
137 // entry.name passed check
93 };
94 var versions = std.ArrayList(Version).init(allocator);
95 var dirs = std.ArrayList([]const u8).init(allocator);
96 defer {
97 versions.deinit();
98 for (dirs.items) |filtered_dir| allocator.free(filtered_dir);
99 dirs.deinit();
100 }
101
102 iterate: while (iterator.next() catch null) |entry| {
103 if (entry.kind != .directory) continue;
104 if (!std.mem.startsWith(u8, entry.name, prefix)) continue;
138105
139 const subfolder_name_allocated = try allocator.dupe(u8, subfolder_name);
140 errdefer allocator.free(subfolder_name_allocated);
141 try dirs_filtered_list.append(subfolder_name_allocated);
106 var version: Version = .{
107 .nums = .{0} ** 4,
108 .build = "",
109 };
110 const suffix = entry.name[prefix.len..];
111 const underscore = std.mem.indexOfScalar(u8, entry.name, '_');
112 var num_it = std.mem.splitScalar(u8, suffix[0 .. underscore orelse suffix.len], '.');
113 version.nums[0] = Version.parseNum(num_it.first()) orelse continue;
114 for (version.nums[1..]) |*num|
115 num.* = Version.parseNum(num_it.next() orelse break) orelse continue :iterate
116 else if (num_it.next()) |_| continue;
117
118 const name = try allocator.dupe(u8, suffix);
119 errdefer allocator.free(name);
120 if (underscore) |pos| version.build = name[pos + 1 ..];
121
122 try versions.append(version);
123 try dirs.append(name);
142124 }
143125
144 const dirs_filtered_slice = try dirs_filtered_list.toOwnedSlice();
145 // Keep in mind that order of these names is not guaranteed by Windows,
146 // so we cannot just reverse or "while (popOrNull())" this ArrayList.
147 std.mem.sortUnstable([]const u8, dirs_filtered_slice, {}, struct {
148 fn desc(_: void, lhs: []const u8, rhs: []const u8) bool {
149 return std.mem.order(u8, lhs, rhs) == .gt;
126 std.mem.sortUnstableContext(0, dirs.items.len, struct {
127 versions: []Version,
128 dirs: [][]const u8,
129 pub fn lessThan(context: @This(), lhs: usize, rhs: usize) bool {
130 return context.versions[lhs].order(context.versions[rhs]).compare(.gt);
131 }
132 pub fn swap(context: @This(), lhs: usize, rhs: usize) void {
133 std.mem.swap(Version, &context.versions[lhs], &context.versions[rhs]);
134 std.mem.swap([]const u8, &context.dirs[lhs], &context.dirs[rhs]);
150135 }
151 }.desc);
152 return dirs_filtered_slice;
136 }{ .versions = versions.items, .dirs = dirs.items });
137 return dirs.toOwnedSlice();
153138}
154139
155140const RegistryWtf8 = struct {
......@@ -167,12 +152,12 @@ const RegistryWtf8 = struct {
167152 };
168153
169154 const registry_wtf16le = try RegistryWtf16Le.openKey(hkey, key_wtf16le);
170 return RegistryWtf8{ .key = registry_wtf16le.key };
155 return .{ .key = registry_wtf16le.key };
171156 }
172157
173158 /// Closes key, after that usage is invalid
174 pub fn closeKey(self: *const RegistryWtf8) void {
175 const return_code_int: windows.HRESULT = windows.advapi32.RegCloseKey(self.key);
159 pub fn closeKey(reg: RegistryWtf8) void {
160 const return_code_int: windows.HRESULT = windows.advapi32.RegCloseKey(reg.key);
176161 const return_code: windows.Win32Error = @enumFromInt(return_code_int);
177162 switch (return_code) {
178163 .SUCCESS => {},
......@@ -182,7 +167,7 @@ const RegistryWtf8 = struct {
182167
183168 /// Get string from registry.
184169 /// Caller owns result.
185 pub fn getString(self: *const RegistryWtf8, allocator: std.mem.Allocator, subkey: []const u8, value_name: []const u8) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]u8 {
170 pub fn getString(reg: RegistryWtf8, allocator: std.mem.Allocator, subkey: []const u8, value_name: []const u8) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]u8 {
186171 const subkey_wtf16le: [:0]const u16 = subkey_wtf16le: {
187172 var subkey_wtf16le_buf: [RegistryWtf16Le.key_name_max_len]u16 = undefined;
188173 const subkey_wtf16le_len: usize = std.unicode.wtf8ToWtf16Le(subkey_wtf16le_buf[0..], subkey) catch unreachable;
......@@ -197,7 +182,7 @@ const RegistryWtf8 = struct {
197182 break :value_name_wtf16le value_name_wtf16le_buf[0..value_name_wtf16le_len :0];
198183 };
199184
200 const registry_wtf16le = RegistryWtf16Le{ .key = self.key };
185 const registry_wtf16le: RegistryWtf16Le = .{ .key = reg.key };
201186 const value_wtf16le = try registry_wtf16le.getString(allocator, subkey_wtf16le, value_name_wtf16le);
202187 defer allocator.free(value_wtf16le);
203188
......@@ -208,7 +193,7 @@ const RegistryWtf8 = struct {
208193 }
209194
210195 /// Get DWORD (u32) from registry.
211 pub fn getDword(self: *const RegistryWtf8, subkey: []const u8, value_name: []const u8) error{ ValueNameNotFound, NotADword, DwordTooLong, DwordNotFound }!u32 {
196 pub fn getDword(reg: RegistryWtf8, subkey: []const u8, value_name: []const u8) error{ ValueNameNotFound, NotADword, DwordTooLong, DwordNotFound }!u32 {
212197 const subkey_wtf16le: [:0]const u16 = subkey_wtf16le: {
213198 var subkey_wtf16le_buf: [RegistryWtf16Le.key_name_max_len]u16 = undefined;
214199 const subkey_wtf16le_len: usize = std.unicode.wtf8ToWtf16Le(subkey_wtf16le_buf[0..], subkey) catch unreachable;
......@@ -223,8 +208,8 @@ const RegistryWtf8 = struct {
223208 break :value_name_wtf16le value_name_wtf16le_buf[0..value_name_wtf16le_len :0];
224209 };
225210
226 const registry_wtf16le = RegistryWtf16Le{ .key = self.key };
227 return try registry_wtf16le.getDword(subkey_wtf16le, value_name_wtf16le);
211 const registry_wtf16le: RegistryWtf16Le = .{ .key = reg.key };
212 return registry_wtf16le.getDword(subkey_wtf16le, value_name_wtf16le);
228213 }
229214
230215 /// Under private space with flags:
......@@ -239,7 +224,7 @@ const RegistryWtf8 = struct {
239224 };
240225
241226 const registry_wtf16le = try RegistryWtf16Le.loadFromPath(absolute_path_wtf16le);
242 return RegistryWtf8{ .key = registry_wtf16le.key };
227 return .{ .key = registry_wtf16le.key };
243228 }
244229};
245230
......@@ -272,12 +257,12 @@ const RegistryWtf16Le = struct {
272257
273258 else => return error.KeyNotFound,
274259 }
275 return RegistryWtf16Le{ .key = key };
260 return .{ .key = key };
276261 }
277262
278263 /// Closes key, after that usage is invalid
279 fn closeKey(self: *const RegistryWtf16Le) void {
280 const return_code_int: windows.HRESULT = windows.advapi32.RegCloseKey(self.key);
264 fn closeKey(reg: RegistryWtf16Le) void {
265 const return_code_int: windows.HRESULT = windows.advapi32.RegCloseKey(reg.key);
281266 const return_code: windows.Win32Error = @enumFromInt(return_code_int);
282267 switch (return_code) {
283268 .SUCCESS => {},
......@@ -286,13 +271,13 @@ const RegistryWtf16Le = struct {
286271 }
287272
288273 /// Get string ([:0]const u16) from registry.
289 fn getString(self: *const RegistryWtf16Le, allocator: std.mem.Allocator, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]const u16 {
274 fn getString(reg: RegistryWtf16Le, allocator: std.mem.Allocator, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]const u16 {
290275 var actual_type: windows.ULONG = undefined;
291276
292277 // Calculating length to allocate
293278 var value_wtf16le_buf_size: u32 = 0; // in bytes, including any terminating NUL character or characters.
294279 var return_code_int: windows.HRESULT = windows.advapi32.RegGetValueW(
295 self.key,
280 reg.key,
296281 subkey_wtf16le,
297282 value_name_wtf16le,
298283 RRF.RT_REG_SZ,
......@@ -319,7 +304,7 @@ const RegistryWtf16Le = struct {
319304 errdefer allocator.free(value_wtf16le_buf);
320305
321306 return_code_int = windows.advapi32.RegGetValueW(
322 self.key,
307 reg.key,
323308 subkey_wtf16le,
324309 value_name_wtf16le,
325310 RRF.RT_REG_SZ,
......@@ -355,13 +340,13 @@ const RegistryWtf16Le = struct {
355340 }
356341
357342 /// Get DWORD (u32) from registry.
358 fn getDword(self: *const RegistryWtf16Le, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ ValueNameNotFound, NotADword, DwordTooLong, DwordNotFound }!u32 {
343 fn getDword(reg: RegistryWtf16Le, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ ValueNameNotFound, NotADword, DwordTooLong, DwordNotFound }!u32 {
359344 var actual_type: windows.ULONG = undefined;
360345 var reg_size: u32 = @sizeOf(u32);
361346 var reg_value: u32 = 0;
362347
363348 const return_code_int: windows.HRESULT = windows.advapi32.RegGetValueW(
364 self.key,
349 reg.key,
365350 subkey_wtf16le,
366351 value_name_wtf16le,
367352 RRF.RT_REG_DWORD,
......@@ -405,28 +390,118 @@ const RegistryWtf16Le = struct {
405390 else => return error.KeyNotFound,
406391 }
407392
408 return RegistryWtf16Le{ .key = key };
393 return .{ .key = key };
409394 }
410395};
411396
412pub const Windows10Sdk = struct {
397pub const Installation = struct {
413398 path: []const u8,
414399 version: []const u8,
415400
416 /// Find path and version of Windows 10 SDK.
401 /// Find path and version of Windows SDK.
417402 /// Caller owns the result's fields.
418403 /// After finishing work, call `free(allocator)`.
419 fn find(allocator: std.mem.Allocator) error{ OutOfMemory, Windows10SdkNotFound, PathTooLong, VersionTooLong }!Windows10Sdk {
420 const v10_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0") catch |err| switch (err) {
421 error.KeyNotFound => return error.Windows10SdkNotFound,
404 fn find(
405 allocator: std.mem.Allocator,
406 roots_key: RegistryWtf8,
407 roots_subkey: []const u8,
408 prefix: []const u8,
409 version_key_name: []const u8,
410 ) error{ OutOfMemory, InstallationNotFound, PathTooLong, VersionTooLong }!Installation {
411 roots: {
412 const installation = findFromRoot(allocator, roots_key, roots_subkey, prefix) catch
413 break :roots;
414 if (installation.isValidVersion()) return installation;
415 installation.free(allocator);
416 }
417 {
418 const installation = try findFromInstallationFolder(allocator, version_key_name);
419 if (installation.isValidVersion()) return installation;
420 installation.free(allocator);
421 }
422 return error.InstallationNotFound;
423 }
424
425 fn findFromRoot(
426 allocator: std.mem.Allocator,
427 roots_key: RegistryWtf8,
428 roots_subkey: []const u8,
429 prefix: []const u8,
430 ) error{ OutOfMemory, InstallationNotFound, PathTooLong, VersionTooLong }!Installation {
431 const path = path: {
432 const path_maybe_with_trailing_slash = roots_key.getString(allocator, "", roots_subkey) catch |err| switch (err) {
433 error.NotAString => return error.InstallationNotFound,
434 error.ValueNameNotFound => return error.InstallationNotFound,
435 error.StringNotFound => return error.InstallationNotFound,
436
437 error.OutOfMemory => return error.OutOfMemory,
438 };
439 if (path_maybe_with_trailing_slash.len > std.fs.MAX_PATH_BYTES or !std.fs.path.isAbsolute(path_maybe_with_trailing_slash)) {
440 allocator.free(path_maybe_with_trailing_slash);
441 return error.PathTooLong;
442 }
443
444 var path = std.ArrayList(u8).fromOwnedSlice(allocator, path_maybe_with_trailing_slash);
445 errdefer path.deinit();
446
447 // String might contain trailing slash, so trim it here
448 if (path.items.len > "C:\\".len and path.getLast() == '\\') _ = path.pop();
449 break :path try path.toOwnedSlice();
450 };
451 errdefer allocator.free(path);
452
453 const version = version: {
454 var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
455 const sdk_lib_dir_path = std.fmt.bufPrint(buf[0..], "{s}\\Lib\\", .{path}) catch |err| switch (err) {
456 error.NoSpaceLeft => return error.PathTooLong,
457 };
458 if (!std.fs.path.isAbsolute(sdk_lib_dir_path)) return error.InstallationNotFound;
459
460 // enumerate files in sdk path looking for latest version
461 var sdk_lib_dir = std.fs.openDirAbsolute(sdk_lib_dir_path, .{
462 .iterate = true,
463 }) catch |err| switch (err) {
464 error.NameTooLong => return error.PathTooLong,
465 else => return error.InstallationNotFound,
466 };
467 defer sdk_lib_dir.close();
468
469 var iterator = sdk_lib_dir.iterate();
470 const versions = try iterateAndFilterByVersion(&iterator, allocator, prefix);
471 defer {
472 for (versions[1..]) |version| allocator.free(version);
473 allocator.free(versions);
474 }
475 break :version versions[0];
422476 };
423 defer v10_key.closeKey();
477 errdefer allocator.free(version);
424478
425 const path: []const u8 = path10: {
426 const path_maybe_with_trailing_slash = v10_key.getString(allocator, "", "InstallationFolder") catch |err| switch (err) {
427 error.NotAString => return error.Windows10SdkNotFound,
428 error.ValueNameNotFound => return error.Windows10SdkNotFound,
429 error.StringNotFound => return error.Windows10SdkNotFound,
479 return .{ .path = path, .version = version };
480 }
481
482 fn findFromInstallationFolder(
483 allocator: std.mem.Allocator,
484 version_key_name: []const u8,
485 ) error{ OutOfMemory, InstallationNotFound, PathTooLong, VersionTooLong }!Installation {
486 var key_name_buf: [RegistryWtf16Le.key_name_max_len]u8 = undefined;
487 const key = key: for ([_][]const u8{ "\\Wow6432Node", "" }) |wow6432node| {
488 for ([_]windows.HKEY{ windows.HKEY_LOCAL_MACHINE, windows.HKEY_CURRENT_USER }) |hkey| {
489 break :key RegistryWtf8.openKey(hkey, std.fmt.bufPrint(
490 &key_name_buf,
491 "SOFTWARE{s}\\Microsoft\\Microsoft SDKs\\Windows\\{s}",
492 .{ wow6432node, version_key_name },
493 ) catch unreachable) catch |err| switch (err) {
494 error.KeyNotFound => return error.InstallationNotFound,
495 };
496 }
497 } else return error.InstallationNotFound;
498 defer key.closeKey();
499
500 const path: []const u8 = path: {
501 const path_maybe_with_trailing_slash = key.getString(allocator, "", "InstallationFolder") catch |err| switch (err) {
502 error.NotAString => return error.InstallationNotFound,
503 error.ValueNameNotFound => return error.InstallationNotFound,
504 error.StringNotFound => return error.InstallationNotFound,
430505
431506 error.OutOfMemory => return error.OutOfMemory,
432507 };
......@@ -443,17 +518,17 @@ pub const Windows10Sdk = struct {
443518 if (path.items.len > "C:\\".len and path.getLast() == '\\') _ = path.pop();
444519
445520 const path_without_trailing_slash = try path.toOwnedSlice();
446 break :path10 path_without_trailing_slash;
521 break :path path_without_trailing_slash;
447522 };
448523 errdefer allocator.free(path);
449524
450 const version: []const u8 = version10: {
525 const version: []const u8 = version: {
451526
452527 // note(dimenus): Microsoft doesn't include the .0 in the ProductVersion key....
453 const version_without_0 = v10_key.getString(allocator, "", "ProductVersion") catch |err| switch (err) {
454 error.NotAString => return error.Windows10SdkNotFound,
455 error.ValueNameNotFound => return error.Windows10SdkNotFound,
456 error.StringNotFound => return error.Windows10SdkNotFound,
528 const version_without_0 = key.getString(allocator, "", "ProductVersion") catch |err| switch (err) {
529 error.NotAString => return error.InstallationNotFound,
530 error.ValueNameNotFound => return error.InstallationNotFound,
531 error.StringNotFound => return error.InstallationNotFound,
457532
458533 error.OutOfMemory => return error.OutOfMemory,
459534 };
......@@ -468,21 +543,27 @@ pub const Windows10Sdk = struct {
468543 try version.appendSlice(".0");
469544
470545 const version_with_0 = try version.toOwnedSlice();
471 break :version10 version_with_0;
546 break :version version_with_0;
472547 };
473548 errdefer allocator.free(version);
474549
475 return Windows10Sdk{ .path = path, .version = version };
550 return .{ .path = path, .version = version };
476551 }
477552
478553 /// Check whether this version is enumerated in registry.
479 fn isValidVersion(windows10sdk: *const Windows10Sdk) bool {
554 fn isValidVersion(installation: Installation) bool {
480555 var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
481 const reg_query_as_wtf8 = std.fmt.bufPrint(buf[0..], "{s}\\{s}\\Installed Options", .{ WINDOWS_KIT_REG_KEY, windows10sdk.version }) catch |err| switch (err) {
556 const reg_query_as_wtf8 = std.fmt.bufPrint(buf[0..], "{s}\\{s}\\Installed Options", .{
557 windows_kits_reg_key,
558 installation.version,
559 }) catch |err| switch (err) {
482560 error.NoSpaceLeft => return false,
483561 };
484562
485 const options_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, reg_query_as_wtf8) catch |err| switch (err) {
563 const options_key = RegistryWtf8.openKey(
564 windows.HKEY_LOCAL_MACHINE,
565 reg_query_as_wtf8,
566 ) catch |err| switch (err) {
486567 error.KeyNotFound => return false,
487568 };
488569 defer options_key.closeKey();
......@@ -492,87 +573,16 @@ pub const Windows10Sdk = struct {
492573 .aarch64 => "OptionId.DesktopCPParm64",
493574 .x86_64 => "OptionId.DesktopCPPx64",
494575 .x86 => "OptionId.DesktopCPPx86",
495 else => |tag| @compileError("Windows 10 SDK cannot be detected on architecture " ++ tag),
576 else => |tag| @compileError("Windows SDK cannot be detected on architecture " ++ tag),
496577 };
497578
498579 const reg_value = options_key.getDword("", option_name) catch return false;
499580 return (reg_value == 1);
500581 }
501582
502 fn free(self: *const Windows10Sdk, allocator: std.mem.Allocator) void {
503 allocator.free(self.path);
504 allocator.free(self.version);
505 }
506};
507
508pub const Windows81Sdk = struct {
509 path: []const u8,
510 version: []const u8,
511
512 /// Find path and version of Windows 8.1 SDK.
513 /// Caller owns the result's fields.
514 /// After finishing work, call `free(allocator)`.
515 fn find(allocator: std.mem.Allocator, roots_key: *const RegistryWtf8) error{ OutOfMemory, Windows81SdkNotFound, PathTooLong, VersionTooLong }!Windows81Sdk {
516 const path: []const u8 = path81: {
517 const path_maybe_with_trailing_slash = roots_key.getString(allocator, "", "KitsRoot81") catch |err| switch (err) {
518 error.NotAString => return error.Windows81SdkNotFound,
519 error.ValueNameNotFound => return error.Windows81SdkNotFound,
520 error.StringNotFound => return error.Windows81SdkNotFound,
521
522 error.OutOfMemory => return error.OutOfMemory,
523 };
524 if (path_maybe_with_trailing_slash.len > std.fs.MAX_PATH_BYTES or !std.fs.path.isAbsolute(path_maybe_with_trailing_slash)) {
525 allocator.free(path_maybe_with_trailing_slash);
526 return error.PathTooLong;
527 }
528
529 var path = std.ArrayList(u8).fromOwnedSlice(allocator, path_maybe_with_trailing_slash);
530 errdefer path.deinit();
531
532 // String might contain trailing slash, so trim it here
533 if (path.items.len > "C:\\".len and path.getLast() == '\\') _ = path.pop();
534
535 const path_without_trailing_slash = try path.toOwnedSlice();
536 break :path81 path_without_trailing_slash;
537 };
538 errdefer allocator.free(path);
539
540 const version: []const u8 = version81: {
541 var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
542 const sdk_lib_dir_path = std.fmt.bufPrint(buf[0..], "{s}\\Lib\\", .{path}) catch |err| switch (err) {
543 error.NoSpaceLeft => return error.PathTooLong,
544 };
545 if (!std.fs.path.isAbsolute(sdk_lib_dir_path)) return error.Windows81SdkNotFound;
546
547 // enumerate files in sdk path looking for latest version
548 var sdk_lib_dir = std.fs.openDirAbsolute(sdk_lib_dir_path, .{
549 .iterate = true,
550 }) catch |err| switch (err) {
551 error.NameTooLong => return error.PathTooLong,
552 else => return error.Windows81SdkNotFound,
553 };
554 defer sdk_lib_dir.close();
555
556 var iterator = sdk_lib_dir.iterate();
557 const versions = iterateAndFilterBySemVer(&iterator, allocator, "winv") catch |err| switch (err) {
558 error.OutOfMemory => return error.OutOfMemory,
559 error.VersionNotFound => return error.Windows81SdkNotFound,
560 };
561 defer {
562 for (versions) |version| allocator.free(version);
563 allocator.free(versions);
564 }
565 const latest_version = try allocator.dupe(u8, versions[0]);
566 break :version81 latest_version;
567 };
568 errdefer allocator.free(version);
569
570 return Windows81Sdk{ .path = path, .version = version };
571 }
572
573 fn free(self: *const Windows81Sdk, allocator: std.mem.Allocator) void {
574 allocator.free(self.path);
575 allocator.free(self.version);
583 fn free(install: Installation, allocator: std.mem.Allocator) void {
584 allocator.free(install.path);
585 allocator.free(install.version);
576586 }
577587};
578588
......@@ -634,7 +644,7 @@ const MsvcLibDir = struct {
634644 /// Example: 17.4.33205.214 -> 0x0011000481b500d6
635645 fn parseVersionQuad(version: []const u8) error{InvalidVersion}!u64 {
636646 var it = std.mem.splitScalar(u8, version, '.');
637 const a = it.next() orelse return error.InvalidVersion;
647 const a = it.first();
638648 const b = it.next() orelse return error.InvalidVersion;
639649 const c = it.next() orelse return error.InvalidVersion;
640650 const d = it.next() orelse return error.InvalidVersion;
......@@ -791,11 +801,7 @@ const MsvcLibDir = struct {
791801 defer visualstudio_folder.close();
792802
793803 var iterator = visualstudio_folder.iterate();
794 const versions = iterateAndFilterBySemVer(&iterator, allocator, null) catch |err| switch (err) {
795 error.OutOfMemory => return error.OutOfMemory,
796 error.VersionNotFound => return error.PathNotFound,
797 };
798 break :vs_versions versions;
804 break :vs_versions try iterateAndFilterByVersion(&iterator, allocator, "");
799805 };
800806 defer {
801807 for (vs_versions) |vs_version| allocator.free(vs_version);