shiny/driver/internal/win32: send WM_CLOSE on Release

unknown · bradfitz · commit f5f346835693 · 2018-06-04T04:07:59.000Z
Calling DestroyWindow in Release is not allowed when running on a different thread than the message pump. This sends a WM_CLOSE message instead, that is handled by the message pump itself. Fixes golang/go#25671 Change-Id: Ie8610a8385faa2746dc7eabac11edc1106e8bb6e Reviewed-on: https://go-review.googlesource.com/115998 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/shiny/driver/internal/win32/win32.go b/shiny/driver/internal/win32/win32.go
@@ -116,10 +116,7 @@ func Show(hwnd syscall.Handle) {
 }
 
 func Release(hwnd syscall.Handle) {
-	// TODO(andlabs): check for errors from this?
-	// TODO(andlabs): remove unsafe
-	_DestroyWindow(hwnd)
-	// TODO(andlabs): what happens if we're still painting?
+	SendMessage(hwnd, _WM_CLOSE, 0, 0)
 }
 
 func sendFocus(hwnd syscall.Handle, uMsg uint32, wParam, lParam uintptr) (lResult uintptr) {

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,7 @@ func Show(hwnd syscall.Handle) {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`func Release(hwnd syscall.Handle) {`
`119`		`- // TODO(andlabs): check for errors from this?`
`120`		`- // TODO(andlabs): remove unsafe`
`121`		`- _DestroyWindow(hwnd)`
`122`		`- // TODO(andlabs): what happens if we're still painting?`
	`119`	`+ SendMessage(hwnd, _WM_CLOSE, 0, 0)`
`123`	`120`	`}`
`124`	`121`
`125`	`122`	`func sendFocus(hwnd syscall.Handle, uMsg uint32, wParam, lParam uintptr) (lResult uintptr) {`