From 5cc9906eb824fe16317bdb2192f4e71d88aaa286 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 27 May 2019 11:35:40 +0200 Subject: [PATCH] ui/app: (windows) use the new golang.org/x/sys/windows.MessageBox function Signed-off-by: Elias Naur --- apps/go.sum | 4 ++-- ui/app/egl_windows.go | 9 +-------- ui/go.mod | 2 +- ui/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/go.sum b/apps/go.sum index 10eb2054..6a9149a9 100644 --- a/apps/go.sum +++ b/apps/go.sum @@ -29,8 +29,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180824143301-4910a1d54f87/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65 h1:hOY+O8MxdkPV10pNf7/XEHaySCiPKxixMKUshfHsGn0= -golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190527092632-ea4c425e90c7 h1:mR9rCowgyyXhit8Dyl4ECXOwxRFfm198CDqlkV893ZA= +golang.org/x/sys v0.0.0-20190527092632-ea4c425e90c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/ui/app/egl_windows.go b/ui/app/egl_windows.go index 58cb20f8..65af3c27 100644 --- a/ui/app/egl_windows.go +++ b/ui/app/egl_windows.go @@ -53,16 +53,9 @@ func mustLoadDLL(dll *syscall.LazyDLL, name string) { if loadErr == nil { return } - user32 := syscall.NewLazySystemDLL("user32.dll") - messageBox := user32.NewProc("MessageBoxW") - if err := messageBox.Find(); err != nil { - panic(loadErr) - } pmsg := syscall.StringToUTF16Ptr("Failed to load " + name) ptitle := syscall.StringToUTF16Ptr("Error") - const MB_ICONERROR = 0x00000010 - const MB_SYSTEMMODAL = 0x00001000 - messageBox.Call(0 /* HWND */, uintptr(unsafe.Pointer(pmsg)), uintptr(unsafe.Pointer(ptitle)), MB_ICONERROR|MB_SYSTEMMODAL) + syscall.MessageBox(0 /* HWND */, pmsg, ptitle, syscall.MB_ICONERROR|syscall.MB_SYSTEMMODAL) os.Exit(1) } diff --git a/ui/go.mod b/ui/go.mod index bcb1aebb..37569d43 100644 --- a/ui/go.mod +++ b/ui/go.mod @@ -4,5 +4,5 @@ go 1.12 require ( golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f - golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65 + golang.org/x/sys v0.0.0-20190527092632-ea4c425e90c7 ) diff --git a/ui/go.sum b/ui/go.sum index aff1db7a..b5103a18 100644 --- a/ui/go.sum +++ b/ui/go.sum @@ -1,6 +1,6 @@ golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f h1:FO4MZ3N56GnxbqxGKqh+YTzUWQ2sDwtFQEZgLOxh9Jc= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65 h1:hOY+O8MxdkPV10pNf7/XEHaySCiPKxixMKUshfHsGn0= -golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190527092632-ea4c425e90c7 h1:mR9rCowgyyXhit8Dyl4ECXOwxRFfm198CDqlkV893ZA= +golang.org/x/sys v0.0.0-20190527092632-ea4c425e90c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=