Update JOB_OBJECT_ALL_ACCESS and OpenJobObject (microsoft#2095)

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 <[email protected]> (cherry picked from commit 42671b4) Signed-off-by: Kirtana Ashok <[email protected]>
kiashok · Oct 29, 2024 · ab4d9be · ab4d9be
1 parent 334be81
commit ab4d9be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
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