Fix windows bugs

spikecurtis · spikecurtis · commit aa9454695f2d · 2023-04-21T06:14:43.000Z
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -126,7 +126,7 @@ func (p *ptyWindows) Resize(height uint16, width uint16) error {
 	p.closeMutex.Lock()
 	defer p.closeMutex.Unlock()
 	if p.closed || p.console == windows.InvalidHandle {
-		return pty.ErrClosed
+		return ErrClosed
 	}
 	// Taken from: https://github.com/microsoft/hcsshim/blob/54a5ad86808d761e3e396aff3e2022840f39f9a8/internal/winapi/zsyscall_windows.go#L144
 	ret, _, err := procResizePseudoConsole.Call(uintptr(p.console), uintptr(*((*uint32)(unsafe.Pointer(&windows.Coord{
diff --git a/pty/start_windows.go b/pty/start_windows.go
@@ -54,7 +54,7 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error
 		if retErr != nil {
 			// we hit some error finishing setup; close pty, so
 			// we don't leak the kernel resources associated with it
-			_ := pty.Close()
+			_ = pty.Close()
 		}
 	}()
 	winPty := pty.(*ptyWindows)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (p *ptyWindows) Resize(height uint16, width uint16) error {`
`126`	`126`	`p.closeMutex.Lock()`
`127`	`127`	`defer p.closeMutex.Unlock()`
`128`	`128`	`if p.closed \|\| p.console == windows.InvalidHandle {`
`129`		`- return pty.ErrClosed`
	`129`	`+ return ErrClosed`
`130`	`130`	`}`
`131`	`131`	`// Taken from: https://github.com/microsoft/hcsshim/blob/54a5ad86808d761e3e396aff3e2022840f39f9a8/internal/winapi/zsyscall_windows.go#L144`
`132`	`132`	`ret, _, err := procResizePseudoConsole.Call(uintptr(p.console), uintptr(((uint32)(unsafe.Pointer(&windows.Coord{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error`
`54`	`54`	`if retErr != nil {`
`55`	`55`	`// we hit some error finishing setup; close pty, so`
`56`	`56`	`// we don't leak the kernel resources associated with it`
`57`		`- _ := pty.Close()`
	`57`	`+ _ = pty.Close()`
`58`	`58`	`}`
`59`	`59`	`}()`
`60`	`60`	`winPty := pty.(*ptyWindows)`