Update JOB_OBJECT_ALL_ACCESS and OpenJobObject (#2095)

anmaxvl · web-flow · commit 42671b424b99 · 2024-04-02T10:38:35.000-07:00
Update `JOB_OBJECT_ALL_ACCESS` value to the most recent one.
Update `winapi.OpenJobObject` to accept `inheritHandle` as
`bool`. The underlying syscall stays the same, but this allows
cleaner calls from go's perspective as it avoids `bool` to `uint32`
casting.

Signed-off-by: Maksim An &lt;maksiman@microsoft.com&gt;
diff --git a/internal/jobobject/jobobject.go b/internal/jobobject/jobobject.go
@@ -188,7 +188,7 @@ func Open(ctx context.Context, options *Options) (_ *JobObject, err error) {
 			return nil, winapi.RtlNtStatusToDosError(status)
 		}
 	} else {
-		jobHandle, err = winapi.OpenJobObject(winapi.JOB_OBJECT_ALL_ACCESS, 0, unicodeJobName.Buffer)
+		jobHandle, err = winapi.OpenJobObject(winapi.JOB_OBJECT_ALL_ACCESS, false, unicodeJobName.Buffer)
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/winapi/jobobject.go b/internal/winapi/jobobject.go
@@ -28,7 +28,7 @@ const (
 // https://docs.microsoft.com/en-us/windows/win32/procthread/job-object-security-and-access-rights
 const (
 	JOB_OBJECT_QUERY      = 0x0004
-	JOB_OBJECT_ALL_ACCESS = 0x1F001F
+	JOB_OBJECT_ALL_ACCESS = 0x1F003F
 )
 
 // IO limit flags
@@ -199,7 +199,7 @@ type SILOOBJECT_BASIC_INFORMATION struct {
 //		LPCWSTR lpName
 // );
 //
-//sys OpenJobObject(desiredAccess uint32, inheritHandle int32, lpName *uint16) (handle windows.Handle, err error) = kernel32.OpenJobObjectW
+//sys OpenJobObject(desiredAccess uint32, inheritHandle bool, lpName *uint16) (handle windows.Handle, err error) = kernel32.OpenJobObjectW
 
 // DWORD SetIoRateControlInformationJobObject(
 //		HANDLE                                hJob,
diff --git a/internal/winapi/zsyscall_windows.go b/internal/winapi/zsyscall_windows.go

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func Open(ctx context.Context, options Options) (_ JobObject, err error) {`
`188`	`188`	`return nil, winapi.RtlNtStatusToDosError(status)`
`189`	`189`	`}`
`190`	`190`	`} else {`
`191`		`- jobHandle, err = winapi.OpenJobObject(winapi.JOB_OBJECT_ALL_ACCESS, 0, unicodeJobName.Buffer)`
	`191`	`+ jobHandle, err = winapi.OpenJobObject(winapi.JOB_OBJECT_ALL_ACCESS, false, unicodeJobName.Buffer)`
`192`	`192`	`if err != nil {`
`193`	`193`	`return nil, err`
`194`	`194`	`}`