evan/zenity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unregister class, fixes #2

Browse Source
This commit is contained in:
Milan Nikolic 2018-03-10 22:29:31 +01:00 committed by Nuno Cruces
parent fa86003aa0
commit bd17e5e9ec
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlgs_windows.go
View File

@ -25,6 +25,7 @@ var (
sendMessageW = user32.NewProc("SendMessageW") sendMessageW = user32.NewProc("SendMessageW")
postQuitMessageW = user32.NewProc("PostQuitMessage") postQuitMessageW = user32.NewProc("PostQuitMessage")
registerClassExW = user32.NewProc("RegisterClassExW") registerClassExW = user32.NewProc("RegisterClassExW")
unregisterClassW = user32.NewProc("UnregisterClassW")
translateMessageW = user32.NewProc("TranslateMessage") translateMessageW = user32.NewProc("TranslateMessage")
setWindowTextW = user32.NewProc("SetWindowTextW") setWindowTextW = user32.NewProc("SetWindowTextW")
getWindowTextLengthW = user32.NewProc("GetWindowTextLengthW") getWindowTextLengthW = user32.NewProc("GetWindowTextLengthW")
@ -335,6 +336,12 @@ func registerClassEx(wcx *wndClassExW) (uint16, error) {
return uint16(ret), nil return uint16(ret), nil
} }
func unregisterClass(className string, instance syscall.Handle) bool {
ret, _, _ := unregisterClassW.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(className))), uintptr(instance))
return ret != 0
}
func getMessage(msg *msgW, hwnd syscall.Handle, msgFilterMin, msgFilterMax uint32) (bool, error) { func getMessage(msg *msgW, hwnd syscall.Handle, msgFilterMin, msgFilterMax uint32) (bool, error) {
ret, _, err := getMessageW.Call(uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(msgFilterMin), uintptr(msgFilterMax)) ret, _, err := getMessageW.Call(uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(msgFilterMin), uintptr(msgFilterMax))
@ -549,6 +556,7 @@ func editBox(title, text, defaultText, className string, password bool) (string,
if err != nil { if err != nil {
return out, false, err return out, false, err
} }
defer unregisterClass(className, instance)
hwnd, _ := createWindow(0, className, title, wsOverlappedWindow, swUseDefault, swUseDefault, 235, 140, 0, 0, instance) hwnd, _ := createWindow(0, className, title, wsOverlappedWindow, swUseDefault, swUseDefault, 235, 140, 0, 0, instance)
hwndText, _ := createWindow(0, "STATIC", text, wsChild|wsVisible, 10, 10, 200, 16, hwnd, 0, instance) hwndText, _ := createWindow(0, "STATIC", text, wsChild|wsVisible, 10, 10, 200, 16, hwnd, 0, instance)