From cffa748c6a02bba2535e326f9d6429ec5252cb00 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sun, 13 Feb 2022 18:03:14 +0000
Subject: [PATCH] app: [Windows] simplify GetWindowRect, delete old workaround

Go issue #34474 was fixed in 1.14 and backported to 1.13.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 app/internal/windows/windows.go | 22 ++++------------------
 app/os_windows.go               |  6 ++----
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/app/internal/windows/windows.go b/app/internal/windows/windows.go
index 012895cb..f9f39670 100644
--- a/app/internal/windows/windows.go
+++ b/app/internal/windows/windows.go
@@ -342,12 +342,10 @@ var (
 
 func AdjustWindowRectEx(r *Rect, dwStyle uint32, bMenu int, dwExStyle uint32) {
 	_AdjustWindowRectEx.Call(uintptr(unsafe.Pointer(r)), uintptr(dwStyle), uintptr(bMenu), uintptr(dwExStyle))
-	issue34474KeepAlive(r)
 }
 
 func CallMsgFilter(m *Msg, nCode uintptr) bool {
 	r, _, _ := _CallMsgFilter.Call(uintptr(unsafe.Pointer(m)), nCode)
-	issue34474KeepAlive(m)
 	return r != 0
 }
 
@@ -372,7 +370,6 @@ func CreateWindowEx(dwExStyle uint32, lpClassName uint16, lpWindowName string, d
 		uintptr(hMenu),
 		uintptr(hInstance),
 		uintptr(lpParam))
-	issue34474KeepAlive(wname)
 	if hwnd == 0 {
 		return 0, fmt.Errorf("CreateWindowEx failed: %v", err)
 	}
@@ -390,7 +387,6 @@ func DestroyWindow(hwnd syscall.Handle) {
 
 func DispatchMessage(m *Msg) {
 	_DispatchMessage.Call(uintptr(unsafe.Pointer(m)))
-	issue34474KeepAlive(m)
 }
 
 func EmptyClipboard() error {
@@ -401,9 +397,10 @@ func EmptyClipboard() error {
 	return nil
 }
 
-func GetWindowRect(hwnd syscall.Handle, r *Rect) {
-	_GetWindowRect.Call(uintptr(hwnd), uintptr(unsafe.Pointer(r)))
-	issue34474KeepAlive(r)
+func GetWindowRect(hwnd syscall.Handle) Rect {
+	var r Rect
+	_GetWindowRect.Call(uintptr(hwnd), uintptr(unsafe.Pointer(&r)))
+	return r
 }
 
 func GetClipboardData(format uint32) (syscall.Handle, error) {
@@ -468,7 +465,6 @@ func GetMessage(m *Msg, hwnd syscall.Handle, wMsgFilterMin, wMsgFilterMax uint32
 		uintptr(hwnd),
 		uintptr(wMsgFilterMin),
 		uintptr(wMsgFilterMax))
-	issue34474KeepAlive(m)
 	return int32(r)
 }
 
@@ -645,7 +641,6 @@ func OpenClipboard(hwnd syscall.Handle) error {
 
 func PeekMessage(m *Msg, hwnd syscall.Handle, wMsgFilterMin, wMsgFilterMax, wRemoveMsg uint32) bool {
 	r, _, _ := _PeekMessage.Call(uintptr(unsafe.Pointer(m)), uintptr(hwnd), uintptr(wMsgFilterMin), uintptr(wMsgFilterMax), uintptr(wRemoveMsg))
-	issue34474KeepAlive(m)
 	return r != 0
 }
 
@@ -668,7 +663,6 @@ func ReleaseCapture() bool {
 
 func RegisterClassEx(cls *WndClassEx) (uint16, error) {
 	a, _, err := _RegisterClassExW.Call(uintptr(unsafe.Pointer(cls)))
-	issue34474KeepAlive(cls)
 	if a == 0 {
 		return 0, fmt.Errorf("RegisterClassExW failed: %v", err)
 	}
@@ -718,7 +712,6 @@ func SetTimer(hwnd syscall.Handle, nIDEvent uintptr, uElapse uint32, timerProc u
 
 func ScreenToClient(hwnd syscall.Handle, p *Point) {
 	_ScreenToClient.Call(uintptr(hwnd), uintptr(unsafe.Pointer(p)))
-	issue34474KeepAlive(p)
 }
 
 func ShowWindow(hwnd syscall.Handle, nCmdShow int32) {
@@ -727,7 +720,6 @@ func ShowWindow(hwnd syscall.Handle, nCmdShow int32) {
 
 func TranslateMessage(m *Msg) {
 	_TranslateMessage.Call(uintptr(unsafe.Pointer(m)))
-	issue34474KeepAlive(m)
 }
 
 func UnregisterClass(cls uint16, hInst syscall.Handle) {
@@ -756,9 +748,3 @@ func (p *WindowPlacement) Set(Left, Top, Right, Bottom int) {
 	p.rcNormalPosition.Right = int32(Right)
 	p.rcNormalPosition.Bottom = int32(Bottom)
 }
-
-// issue34474KeepAlive calls runtime.KeepAlive as a
-// workaround for golang.org/issue/34474.
-func issue34474KeepAlive(v interface{}) {
-	runtime.KeepAlive(v)
-}
diff --git a/app/os_windows.go b/app/os_windows.go
index 7ed7f71e..9bc5fe8f 100644
--- a/app/os_windows.go
+++ b/app/os_windows.go
@@ -190,8 +190,7 @@ func createNativeWindow() (*window, error) {
 // If anything has changed it emits a ConfigEvent to notify the application.
 func (w *window) update() {
 	var triggerEvent bool
-	var r windows.Rect
-	windows.GetWindowRect(w.hwnd, &r)
+	r := windows.GetWindowRect(w.hwnd)
 	size := image.Point{
 		X: int(r.Right - r.Left - w.deltas.width),
 		Y: int(r.Bottom - r.Top - w.deltas.height),
@@ -607,8 +606,7 @@ func (w *window) Configure(options []Option) {
 		width := int32(w.config.Size.X)
 		height := int32(w.config.Size.Y)
 		// Get the current window size and position.
-		var wr windows.Rect
-		windows.GetWindowRect(w.hwnd, &wr)
+		wr := windows.GetWindowRect(w.hwnd)
 		// Set desired window size.
 		wr.Right = wr.Left + width
 		wr.Bottom = wr.Top + height