diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-25 21:40:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 21:40:38 +0200 |
| commit | 5b7086abda91f4301af3bfb642d416a22349c276 (patch) | |
| tree | bf139f29b261e55c161394637f1c7073da5103f0 /vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go | |
| parent | a488e197a6e3947dd420b40ed834b50db9c829c3 (diff) | |
| parent | 2388222e98462fdbbe44f3e091b2b79d80956a9a (diff) | |
| download | podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.gz podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.bz2 podman-5b7086abda91f4301af3bfb642d416a22349c276.zip | |
Merge pull request #3418 from vrothberg/go-modules
update dependencies
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go')
| -rw-r--r-- | vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go b/vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go index d2dff9cb0..8bed84857 100644 --- a/vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go +++ b/vendor/github.com/Microsoft/hcsshim/zsyscall_windows.go @@ -6,7 +6,6 @@ import ( "syscall" "unsafe" - "github.com/Microsoft/hcsshim/internal/interop" "golang.org/x/sys/windows" ) @@ -46,7 +45,10 @@ var ( func SetCurrentThreadCompartmentId(compartmentId uint32) (hr error) { r0, _, _ := syscall.Syscall(procSetCurrentThreadCompartmentId.Addr(), 1, uintptr(compartmentId), 0, 0) if int32(r0) < 0 { - hr = interop.Win32FromHresult(r0) + if r0&0x1fff0000 == 0x00070000 { + r0 &= 0xffff + } + hr = syscall.Errno(r0) } return } |