From 155062896f9b84ce1d0ce4136e387836dc3a4daa Mon Sep 17 00:00:00 2001 From: qmuntal Date: Tue, 5 Mar 2024 17:17:24 +0100 Subject: [PATCH] mobve SILOOBJECT_BASIC_INFORMATION to winapi Signed-off-by: qmuntal (cherry picked from commit 6428d3dfe30097fcd1e03d969847be34e27f4b86) Signed-off-by: Kirtana Ashok --- internal/jobobject/jobobject.go | 9 +-------- internal/winapi/jobobject.go | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/internal/jobobject/jobobject.go b/internal/jobobject/jobobject.go index 980ea8c4ba..3abd96742d 100644 --- a/internal/jobobject/jobobject.go +++ b/internal/jobobject/jobobject.go @@ -525,14 +525,7 @@ func isJobSilo(h windows.Handle) bool { // the call will fail if the job hasn't been upgraded to a silo so we can use this to tell when we open a job // if it's a silo or not. We still need to define the struct layout as expected by Win32, else the struct // alignment might be different and the call will fail. - type SILOOBJECT_BASIC_INFORMATION struct { - SiloID uint32 - SiloParentID uint32 - NumberOfProcesses uint32 - IsInServerSilo bool - Reserved [3]uint8 - } - var siloInfo SILOOBJECT_BASIC_INFORMATION + var siloInfo winapi.SILOOBJECT_BASIC_INFORMATION err := winapi.QueryInformationJobObject( h, winapi.JobObjectSiloBasicInformation, diff --git a/internal/winapi/jobobject.go b/internal/winapi/jobobject.go index b0deb5c72d..1b8f68a678 100644 --- a/internal/winapi/jobobject.go +++ b/internal/winapi/jobobject.go @@ -160,6 +160,21 @@ type JOBOBJECT_ASSOCIATE_COMPLETION_PORT struct { CompletionPort windows.Handle } +// typedef struct _SILOOBJECT_BASIC_INFORMATION { +// DWORD SiloId; +// DWORD SiloParentId; +// DWORD NumberOfProcesses; +// BOOLEAN IsInServerSilo; +// BYTE Reserved[3]; +// } SILOOBJECT_BASIC_INFORMATION, *PSILOOBJECT_BASIC_INFORMATION; +type SILOOBJECT_BASIC_INFORMATION struct { + SiloID uint32 + SiloParentID uint32 + NumberOfProcesses uint32 + IsInServerSilo bool + Reserved [3]uint8 +} + // BOOL IsProcessInJob( // HANDLE ProcessHandle, // HANDLE JobHandle,