1 files changed, 12 insertions, 37 deletions
diff --git a/uitask_windows.go b/uitask_windows.go
index 1075b5b..772403f 100644
--- a/uitask_windows.go
+++ b/uitask_windows.go
@@ -22,17 +22,15 @@ the only recourse, and the one both Microsoft (http://support.microsoft.com/kb/1
 yay.
 */
 
-var uitask chan interface{}
+var uimsgwin _HWND
 
-type uimsg struct {
-	call *syscall.LazyProc
-	p    []uintptr
-	ret  chan uiret
-}
-
-type uiret struct {
-	ret uintptr
-	err error
+// works from any thread; waits for the function to finish before returning
+func uitask(f func()) {
+	_sendMessage.Call(
+		uintptr(uimsgwin),
+		msgRequested,
+		uintptr(0),
+		uintptr(unsafe.Pointer(&f)))
 }
 
 const (
@@ -49,34 +47,20 @@ var (
 func ui(main func()) error {
 	runtime.LockOSThread()
 
-	uitask = make(chan interface{})
 	err := doWindowsInit()
 	if err != nil {
 		return fmt.Errorf("error doing general Windows initialization: %v", err)
 	}
 
-	hwnd, err := makeMessageHandler()
+	uimsgwin, err = makeMessageHandler()
 	if err != nil {
 		return fmt.Errorf("error making invisible window for handling events: %v", err)
 	}
 
 	go func() {
-		for m := range uitask {
-			r1, _, err := _postMessage.Call(
-				uintptr(hwnd),
-				msgRequested,
-				uintptr(0),
-				uintptr(unsafe.Pointer(&m)))
-			if r1 == 0 { // failure
-				panic("error sending message to message loop to call function: " + err.Error())
-			}
-		}
-	}()
-
-	go func() {
 		main()
 		r1, _, err := _postMessage.Call(
-			uintptr(hwnd),
+			uintptr(uimsgwin),
 			msgQuit,
 			uintptr(0),
 			uintptr(0))
@@ -178,17 +162,8 @@ func makeMessageHandler() (hwnd _HWND, err error) {
 func messageHandlerWndProc(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
 	switch uMsg {
 	case msgRequested:
-		mt := (*interface{})(unsafe.Pointer(lParam))
-		switch m := (*mt).(type) {
-		case *uimsg:
-			r1, _, err := m.call.Call(m.p...)
-			m.ret <- uiret{
-				ret: r1,
-				err: err,
-			}
-		case func():
-			m()
-		}
+		f := (*func())(unsafe.Pointer(lParam))
+		(*f)()
 		return 0
 	case msgQuit:
 		// does not return a value according to MSDN