more fixes: sema looks successful, but still fails

Author: Jan Philipp Hafer

lib/std/child_process.zig

@@ -847,7 +847,7 @@ pub const ChildProcess = struct {
     fn spawnWindows(self: *ChildProcess) SpawnError!void {
         var stdstream_buffer: [3]os.fd_t = undefined;
         if (self.handles == null) {
-            self.handles = stdstream_buffer;
+            self.handles = &stdstream_buffer;
             self.handles.?[0] = self.stdin.?.handle;
             self.handles.?[1] = self.stdout.?.handle;
             self.handles.?[2] = self.stderr.?.handle;
@@ -978,28 +978,23 @@ pub const ChildProcess = struct {
         }
         var suc = windows.kernel32.InitializeProcThreadAttributeList(null, 1, 0, &size_attr_list);
         std.debug.assert(suc == 0); // DEBUG
-        attrib_list = try self.allocator.alloc(windows.LPPROC_THREAD_ATTRIBUTE_LIST, self.handles.?.len);
-        defer attrib_list.free(attrib_list);
+        var attrib_list_block = try self.allocator.alloc(u8, self.handles.?.len);
+        defer self.allocator.free(attrib_list_block);
+        attrib_list = attrib_list_block.ptr;
         suc = windows.kernel32.InitializeProcThreadAttributeList(null, 1, 0, &size_attr_list);
         std.debug.assert(suc != 0); // DEBUG
 
-        const proc_thread_attr = windows.PROC_THREAD_ATTRIBUTE{
-            .NUMBER = .ProcThreadAttributeHandleList,
-            .ADDITIVE = false,
-            .THREAD = true,
-            .INPUT = false,
-        };
         suc = windows.kernel32.UpdateProcThreadAttribute(
             attrib_list,
             0,
-            proc_thread_attr,
-            self.handles.?.ptr,
+            windows.PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
+            @ptrCast(*anyopaque, self.handles.?.ptr),
             self.handles.?.len * @sizeOf(windows.HANDLE),
             null,
             null,
         );
 
-        var siStartInfo = windows.STARTUPINFOW{
+        var lpStartInfo = windows.STARTUPINFOW{
             .cb = @sizeOf(windows.STARTUPINFOW),
             .hStdError = g_hChildStd_ERR_Wr,
             .hStdOutput = g_hChildStd_OUT_Wr,
@@ -1021,7 +1016,7 @@ pub const ChildProcess = struct {
             .lpReserved2 = null,
         };
         var ext_info = windows.STARTUPINFOEXW{
-            .StartupInfo = siStartInfo,
+            .lpStartupInfo = lpStartInfo,
             .lpAttributeList = attrib_list,
         };
 
@@ -1462,7 +1457,7 @@ fn windowsCreateProcess(
         @enumToInt(CREATE_UNICODE_ENVIRONMENT) | @enumToInt(EXTENDED_STARTUPINFO_PRESENT),
         @ptrCast(?*anyopaque, envp_ptr),
         cwd_ptr,
-        ext_info.lpStartupInfo,
+        &ext_info.lpStartupInfo,
         lpProcessInformation,
     );
 }

lib/std/os/windows.zig

@@ -1577,7 +1577,7 @@ pub fn GetEnvironmentVariableW(lpName: LPWSTR, lpBuffer: [*]u16, nSize: DWORD) G
 }
 
 // see macro ProcThreadAttributeValue
-pub const PROC_THREAD_ATTRIBUTE = packed struct {
+const PROC_THREAD_ATTRIBUTE = packed struct {
     NUMBER: enum(u16) {
         ProcThreadAttributeParentProcess = 0,
         // <- gap ->
@@ -1609,6 +1609,14 @@ pub const PROC_THREAD_ATTRIBUTE = packed struct {
     INPUT: bool, // 0x00020000
 };
 
+pub const PROC_THREAD_ATTRIBUTE_HANDLE_LIST =
+    @intCast(DWORD_PTR, @bitCast(u19, PROC_THREAD_ATTRIBUTE{
+    .NUMBER = .ProcThreadAttributeHandleList,
+    .ADDITIVE = false,
+    .THREAD = true,
+    .INPUT = false,
+}));
+
 pub const LPPROC_THREAD_ATTRIBUTE_LIST = *anyopaque;
 
 pub const STARTUPINFOEXW = extern struct {

lib/std/os/windows/kernel32.zig

@@ -8,6 +8,7 @@ const CONSOLE_SCREEN_BUFFER_INFO = windows.CONSOLE_SCREEN_BUFFER_INFO;
 const CONTEXT = windows.CONTEXT;
 const COORD = windows.COORD;
 const DWORD = windows.DWORD;
+const DWORD_PTR = windows.DWORD_PTR;
 const DWORD64 = windows.DWORD64;
 const FILE_INFO_BY_HANDLE_CLASS = windows.FILE_INFO_BY_HANDLE_CLASS;
 const HANDLE = windows.HANDLE;
@@ -118,17 +119,17 @@ pub extern "kernel32" fn InitializeProcThreadAttributeList(
     lpAttributeList: ?LPPROC_THREAD_ATTRIBUTE_LIST,
     dwAttributeCount: DWORD,
     dwFlags: DWORD,
-    lpSize: ?*usize,
+    lpSize: ?*SIZE_T,
 ) callconv(WINAPI) BOOL;
 
 pub extern "kernel32" fn UpdateProcThreadAttribute(
     lpAttributeList: ?LPPROC_THREAD_ATTRIBUTE_LIST,
     dwFlags: DWORD,
-    Attribute: usize,
-    lpValue: ?*anyopaque,
-    cbSize: usize,
+    Attribute: DWORD_PTR,
+    lpValue: *anyopaque,
+    cbSize: SIZE_T,
     lpPreviousValue: ?*anyopaque,
-    lpReturnSize: ?*usize,
+    lpReturnSize: ?*SIZE_T,
 ) callconv(WINAPI) BOOL;
 
 pub extern "kernel32" fn CreateProcessW(

test/standalone/childprocess_extrapipe/child.zig

@@ -11,8 +11,7 @@ pub fn main() !void {
     _ = it.next() orelse unreachable; // skip binary name
     const s_handle = it.next() orelse unreachable;
     var file_handle = try std.os.stringToHandle(s_handle);
-    // TODO: Is there a way on Windows to let the Kernel disable inheritance
-    // after it is inherited in CreateProcess???
+
     if (builtin.target.os.tag == .windows) {
         // windows.HANDLE_FLAG_INHERIT is enabled
         var handle_flags: windows.DWORD = undefined;
@@ -23,6 +22,7 @@ pub fn main() !void {
         var fcntl_flags = try std.os.fcntl(file_handle, std.os.F.GETFD, 0);
         try std.testing.expect((fcntl_flags & std.os.FD_CLOEXEC) == 0);
     }
+
     try std.os.disableInheritance(file_handle);
     var file_in = std.fs.File{ .handle = file_handle }; // read side of pipe
     defer file_in.close();