try another fix

leafo · leafo · commit 1bd5f3fc1c90 · 2026-02-12T12:14:06.000-08:00
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/itchio/headway v0.0.0-20251229214354-da882c8b5dd4
-	github.com/itchio/ox v0.0.0-20260204011704-8e7bc5639671
+	github.com/itchio/ox v0.0.0-20260212201121-1e6be0bfd382
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/sys v0.40.0
 )
diff --git a/go.sum b/go.sum
@@ -6,6 +6,8 @@ github.com/itchio/headway v0.0.0-20251229214354-da882c8b5dd4 h1:vOYjkMs+aVNeHU0d
 github.com/itchio/headway v0.0.0-20251229214354-da882c8b5dd4/go.mod h1:1/4tbTrV3G/Su53pnKBpa5mv3cVkLweRAq/xRnulSQI=
 github.com/itchio/ox v0.0.0-20260204011704-8e7bc5639671 h1:e78FK2tPyEA7uJlPhB36sqezp262LKuFsj8q/nPrdjM=
 github.com/itchio/ox v0.0.0-20260204011704-8e7bc5639671/go.mod h1:433sW0ck7/e5u7yycn9pmuK84/askPuhm3MqtwFl9zk=
+github.com/itchio/ox v0.0.0-20260212201121-1e6be0bfd382 h1:FKGDIamOblBuLCYDxJkGEGCKZ5YG5gJvhCEXb6IcZA8=
+github.com/itchio/ox v0.0.0-20260212201121-1e6be0bfd382/go.mod h1:433sW0ck7/e5u7yycn9pmuK84/askPuhm3MqtwFl9zk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
diff --git a/runner/processgroup_windows.go b/runner/processgroup_windows.go
@@ -122,15 +122,11 @@ func (pg *processGroup) Wait() error {
 			for {
 				err := syscall.GetQueuedCompletionStatus(pg.ioPort, &completionCode, &completionKey, &overlapped, syscall.INFINITE)
 				if err != nil {
-					pg.cmd.Wait()
 					waitDone <- err
 					return
 				}
 
 				if completionKey == magicCompletionKey && completionCode == syscallex.JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO {
-					// Call cmd.Wait() to properly release the process handle.
-					// Go 1.24+ panics if the process is GC'd without Wait().
-					pg.cmd.Wait()
 					waitDone <- nil
 					return
 				}
@@ -143,7 +139,9 @@ func (pg *processGroup) Wait() error {
 		if pg.jobObject == syscall.InvalidHandle {
 			pid := uint32(pg.cmd.Process.Pid)
 			pg.consumer.Infof("Killing single process %d", pid)
-			pg.cmd.Process.Kill()
+			// Use terminateProcess instead of cmd.Process.Kill() because
+			// the os.Process handle from os.FindProcess lacks PROCESS_TERMINATE.
+			terminateProcess(pid, 1)
 		} else {
 			pg.consumer.Infof("Attempting to kill entire job object...")
 			var processIdList syscallex.JobObjectBasicProcessIdList
@@ -184,16 +182,17 @@ func (pg *processGroup) Wait() error {
 				}
 			}
 		}
-		// Wait for the goroutine to finish, which calls cmd.Wait()
-		// to properly release the process handle (required by Go 1.24+).
-		<-waitDone
 	case err := <-waitDone:
 		pg.consumer.Infof("Wait done")
 		if err != nil {
 			return fmt.Errorf("%w", err)
 		}
 	}
 
+	// Close the raw process handle stored in SysProcAttr. This is a separate
+	// handle from the one managed by os.Process and must be closed explicitly.
+	syscall.CloseHandle(pg.cmd.SysProcAttr.ProcessHandle)
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.24.0`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/itchio/headway v0.0.0-20251229214354-da882c8b5dd4`
`7`		`- github.com/itchio/ox v0.0.0-20260204011704-8e7bc5639671`
	`7`	`+ github.com/itchio/ox v0.0.0-20260212201121-1e6be0bfd382`
`8`	`8`	`github.com/stretchr/testify v1.11.1`
`9`	`9`	`golang.org/x/sys v0.40.0`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,11 @@ func (pg *processGroup) Wait() error {`
`122`	`122`	`for {`
`123`	`123`	`err := syscall.GetQueuedCompletionStatus(pg.ioPort, &completionCode, &completionKey, &overlapped, syscall.INFINITE)`
`124`	`124`	`if err != nil {`
`125`		`- pg.cmd.Wait()`
`126`	`125`	`waitDone <- err`
`127`	`126`	`return`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`if completionKey == magicCompletionKey && completionCode == syscallex.JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO {`
`131`		`- // Call cmd.Wait() to properly release the process handle.`
`132`		`- // Go 1.24+ panics if the process is GC'd without Wait().`
`133`		`- pg.cmd.Wait()`
`134`	`130`	`waitDone <- nil`
`135`	`131`	`return`
`136`	`132`	`}`
`@@ -143,7 +139,9 @@ func (pg *processGroup) Wait() error {`
`143`	`139`	`if pg.jobObject == syscall.InvalidHandle {`
`144`	`140`	`pid := uint32(pg.cmd.Process.Pid)`
`145`	`141`	`pg.consumer.Infof("Killing single process %d", pid)`
`146`		`- pg.cmd.Process.Kill()`
	`142`	`+ // Use terminateProcess instead of cmd.Process.Kill() because`
	`143`	`+ // the os.Process handle from os.FindProcess lacks PROCESS_TERMINATE.`
	`144`	`+ terminateProcess(pid, 1)`
`147`	`145`	`} else {`
`148`	`146`	`pg.consumer.Infof("Attempting to kill entire job object...")`
`149`	`147`	`var processIdList syscallex.JobObjectBasicProcessIdList`
`@@ -184,16 +182,17 @@ func (pg *processGroup) Wait() error {`
`184`	`182`	`}`
`185`	`183`	`}`
`186`	`184`	`}`
`187`		`- // Wait for the goroutine to finish, which calls cmd.Wait()`
`188`		`- // to properly release the process handle (required by Go 1.24+).`
`189`		`- <-waitDone`
`190`	`185`	`case err := <-waitDone:`
`191`	`186`	`pg.consumer.Infof("Wait done")`
`192`	`187`	`if err != nil {`
`193`	`188`	`return fmt.Errorf("%w", err)`
`194`	`189`	`}`
`195`	`190`	`}`
`196`	`191`
	`192`	`+ // Close the raw process handle stored in SysProcAttr. This is a separate`
	`193`	`+ // handle from the one managed by os.Process and must be closed explicitly.`
	`194`	`+ syscall.CloseHandle(pg.cmd.SysProcAttr.ProcessHandle)`
	`195`	`+`
`197`	`196`	`return nil`
`198`	`197`	`}`
`199`	`198`