Converted the standard Windows window class (for Window) to be a single class, rather than having a new one for each Window. Now for Area.

init_windows.go

@@ -65,6 +65,10 @@ func doWindowsInit() (err error) {
 	if err != nil {
 		return fmt.Errorf("error initializing standard window class auxiliary info: %v", err)
 	}
+	err = registerStdWndClass()
+	if err != nil {
+		return fmt.Errorf("error registering standard window class (for Window): %v", err)
+	}
 	err = getStandardWindowFonts()
 	if err != nil {
 		return fmt.Errorf("error getting standard window fonts: %v", err)

stdwndclass_windows.go

@@ -6,16 +6,10 @@ import (
 	"fmt"
 	"syscall"
 	"unsafe"
-	"sync"
 )
 
 const (
-	stdWndClassFormat = "gouiwnd%X"
-)
-
-var (
-	curWndClassNum uintptr
-	curWndClassNumLock sync.Mutex
+	stdWndClass = "gouiwnd"
 )
 
 var (
@@ -72,8 +66,7 @@ func storeSysData(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRES
 	return defWindowProc(hwnd, uMsg, wParam, lParam)
 }
 
-func stdWndProc(unused *sysData) func(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
-	return func(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
+func stdWndProc(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
 	s := getSysData(hwnd)
 	if s == nil {		// not yet saved
 		return storeSysData(hwnd, uMsg, wParam, lParam)
@@ -120,7 +113,6 @@ func stdWndProc(unused *sysData) func(hwnd _HWND, uMsg uint32, wParam _WPARAM, l
 	}
 	panic(fmt.Sprintf("stdWndProc message %d did not return: internal bug in ui library", uMsg))
 }
-}
 
 type _WNDCLASS struct {
 	style				uint32
@@ -143,33 +135,20 @@ var (
 	_registerClass = user32.NewProc("RegisterClassW")
 )
 
-func registerStdWndClass(s *sysData) (newClassName string, err error) {
-	curWndClassNumLock.Lock()
-	newClassName = fmt.Sprintf(stdWndClassFormat, curWndClassNum)
-	curWndClassNum++
-	curWndClassNumLock.Unlock()
-
+func registerStdWndClass() (err error) {
 	wc := &_WNDCLASS{
-		lpszClassName:	uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(newClassName))),
-		lpfnWndProc:		syscall.NewCallback(stdWndProc(s)),
+		lpszClassName:	uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(stdWndClass))),
+		lpfnWndProc:		syscall.NewCallback(stdWndProc),
 		hInstance:		hInstance,
 		hIcon:			icon,
 		hCursor:			cursor,
 		hbrBackground:	_HBRUSH(_COLOR_BTNFACE + 1),
 	}
-
-	ret := make(chan uiret)
-	defer close(ret)
-	uitask <- &uimsg{
-		call:		_registerClass,
-		p:		[]uintptr{uintptr(unsafe.Pointer(wc))},
-		ret:		ret,
+	r1, _, err := _registerClass.Call(uintptr(unsafe.Pointer(wc)))
+	if r1 == 0 {		// failure
+		return err
 	}
-	r := <-ret
-	if r.ret == 0 {		// failure
-		return "", r.err
-	}
-	return newClassName, nil
+	return nil
 }
 
 // no need to use/recreate MAKEINTRESOURCE() here as the Windows constant generator already took care of that because Microsoft's headers do already

sysdata_windows.go

@@ -46,7 +46,7 @@ const controlxstyle = 0
 
 var classTypes = [nctypes]*classData{
 	c_window:		&classData{
-		register:			registerStdWndClass,
+		name:			stdWndClass,
 		style:			_WS_OVERLAPPEDWINDOW,
 		xstyle:			0,
 		storeSysData:		true,