From bf165ae9d450af35e0850d284419d7221a130311 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Wed, 3 Apr 2019 23:20:45 +0900 Subject: [PATCH] devicescale: Refactoring --- internal/devicescale/impl_windows.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/devicescale/impl_windows.go b/internal/devicescale/impl_windows.go index 7da696f6b..c0a79ff91 100644 --- a/internal/devicescale/impl_windows.go +++ b/internal/devicescale/impl_windows.go @@ -174,8 +174,6 @@ func getMonitorInfo(hMonitor uintptr, lpMonitorInfo uintptr) error { func getDpiForMonitor(hMonitor uintptr, dpiType uintptr, dpiX, dpiY *uint32) error { r, _, e := procGetDpiForMonitor.Call(hMonitor, dpiType, uintptr(unsafe.Pointer(dpiX)), uintptr(unsafe.Pointer(dpiY))) - runtime.KeepAlive(dpiX) - runtime.KeepAlive(dpiY) if e != nil && e.(windows.Errno) != 0 { return &winErr{ FuncName: "GetDpiForMonitor", @@ -248,9 +246,11 @@ func impl(x, y int) float64 { } dpiX := uint32(0) - dpiY := uint32(0) // Passing dpiY is needed even though this is not used. + dpiY := uint32(0) // Passing dpiY is needed even though this is not used, or GetDpiForMonitor returns an error. if err := getDpiForMonitor(m, mdtEffectiveDpi, &dpiX, &dpiY); err != nil { panic(err) } + runtime.KeepAlive(dpiY) + return float64(dpiX) / 96 }