exp/wingui: changed to be compatible with windows/amd64

src/pkg/exp/wingui/zwinapi.go

 // mksyscall_windows.pl winapi.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package main
 
 import "unsafe"
 import "syscall"
 
 var (
         modkernel32 = syscall.NewLazyDLL("kernel32.dll")
@@ skipping 10 matching lines @@
         procGetMessageW      = moduser32.NewProc("GetMessageW")
         procTranslateMessage = moduser32.NewProc("TranslateMessage")
         procDispatchMessageW = moduser32.NewProc("DispatchMessageW")
         procLoadIconW        = moduser32.NewProc("LoadIconW")
         procLoadCursorW      = moduser32.NewProc("LoadCursorW")
         procSetCursor        = moduser32.NewProc("SetCursor")
         procSendMessageW     = moduser32.NewProc("SendMessageW")
         procPostMessageW     = moduser32.NewProc("PostMessageW")
 )
 
-func GetModuleHandle(modname *uint16) (handle uint32, errno int) {
+func GetModuleHandle(modname *uint16) (handle syscall.Handle, errno int) {

[brainman, 2011/08/31 00:49:56]

You should be able to recreate this file automatically:

# rm zwinapi.go; make clean all
rm -rf *.o *.a *.[568vq] [568vq].out wingui.exe _test _testmain.go test.out
build.out
/root/hg/go/src/pkg/syscall/mksyscall_windows.pl winapi.go \
                | sed 's/^package.*syscall$/package main/' \
                | sed '/^import/a \
                        import "syscall"' \
                | sed 's/Syscall/syscall.Syscall/' \
                | sed 's/NewLazyDLL/syscall.NewLazyDLL/' \
                | sed 's/EINVAL/syscall.EINVAL/' \
                | gofmt \
                > zwinapi.go
8g  -o _go_.8 gui.go winapi.go zwinapi.go
gui.go:41: cannot use hwnd (type syscall.Handle) as type uint32 in function
argument
gui.go:41: cannot use mh (type syscall.Handle) as type uint32 in function
argument
gui.go:44: cannot assign uint32 to bh (type syscall.Handle) in multiple
assignment
gui.go:49: cannot use hwnd (type syscall.Handle) as type uint32 in function
argument
gui.go:49: cannot use wparam (type uintptr) as type int32 in function argument
gui.go:49: cannot use lparam (type uintptr) as type int32 in function argument
gui.go:49: cannot use DefWindowProc(hwnd, msg, wparam, lparam) (type int32) as
type uintptr in assignment
gui.go:53: cannot use hwnd (type syscall.Handle) as type uint32 in function
argument
gui.go:58: cannot use hwnd (type syscall.Handle) as type uint32 in function
argument
gui.go:58: cannot use wparam (type uintptr) as type int32 in function argument
gui.go:58: too many errors
make: *** [_go_.8] Error 1

         r0, _, e1 := syscall.Syscall(procGetModuleHandleW.Addr(), 1, uintptr(unsafe.Pointer(modname)), 0, 0)
-        handle = uint32(r0)
+        handle = syscall.Handle(r0)
         if handle == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
 func RegisterClassEx(wndclass *Wndclassex) (atom uint16, errno int) {
         r0, _, e1 := syscall.Syscall(procRegisterClassExW.Addr(), 1, uintptr(unsafe.Pointer(wndclass)), 0, 0)
         atom = uint16(r0)
         if atom == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func CreateWindowEx(exstyle uint32, classname *uint16, windowname *uint16, style uint32, x int32, y int32, width int32, height int32, wndparent uint32, menu uint32, instance uint32, param uintptr) (hwnd uint32, errno int) {
-        r0, _, e1 := syscall.Syscall12(procCreateWindowExW.Addr(), 12, uintptr(exstyle), uintptr(unsafe.Pointer(classname)), uintptr(unsafe.Pointer(windowname)), uintptr(style), uintptr(x), uintptr(y), uintptr(width), uintptr(height), uintptr(wndparent), uintptr(menu), uintptr(instance), uintptr(param))
-        hwnd = uint32(r0)
+func CreateWindowEx(exstyle uint32, classname *uint16, windowname *uint16, style uint32, x int32, y int32, width int32, height int32, wndparent syscall.Handle, menu syscall.Handle, instance syscall.Handle, param uintptr) (hwnd syscall.Handle, errno int) {
+        r0, _, e1 := syscall.Syscall12(procCreateWindowExW.Addr(), 12, uintptr(exstyle), uintptr(unsafe.Pointer(classname)), uintptr(unsafe.Pointer(windowname)), uintptr(style), uintptr(x), uintptr(y), uintptr(width), uintptr(height), uintptr(wndparent), uintptr(menu), uintptr(instance), param)
+        hwnd = syscall.Handle(r0)
         if hwnd == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func DefWindowProc(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) {
-        r0, _, _ := syscall.Syscall6(procDefWindowProcW.Addr(), 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
-        lresult = int32(r0)
+func DefWindowProc(hwnd syscall.Handle, msg uint32, wparam uintptr, lparam uintptr) (lresult uintptr) {
+        lresult, _, _ = syscall.Syscall6(procDefWindowProcW.Addr(), 4, uintptr(hwnd), uintptr(msg), wparam, lparam, 0, 0)
         return
 }
 
-func DestroyWindow(hwnd uint32) (errno int) {
+func DestroyWindow(hwnd syscall.Handle) (errno int) {
         r1, _, e1 := syscall.Syscall(procDestroyWindow.Addr(), 1, uintptr(hwnd), 0, 0)
         if int(r1) == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
 func PostQuitMessage(exitcode int32) {
         syscall.Syscall(procPostQuitMessage.Addr(), 1, uintptr(exitcode), 0, 0)
         return
 }
 
-func ShowWindow(hwnd uint32, cmdshow int32) (wasvisible bool) {
+func ShowWindow(hwnd syscall.Handle, cmdshow int32) (wasvisible bool) {
         r0, _, _ := syscall.Syscall(procShowWindow.Addr(), 2, uintptr(hwnd), uintptr(cmdshow), 0)
         wasvisible = bool(r0 != 0)
         return
 }
 
-func UpdateWindow(hwnd uint32) (errno int) {
+func UpdateWindow(hwnd syscall.Handle) (errno int) {
         r1, _, e1 := syscall.Syscall(procUpdateWindow.Addr(), 1, uintptr(hwnd), 0, 0)
         if int(r1) == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, errno int) {
+func GetMessage(msg *Msg, hwnd syscall.Handle, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, errno int) {
         r0, _, e1 := syscall.Syscall6(procGetMessageW.Addr(), 4, uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(MsgFilterMin), uintptr(MsgFilterMax), 0, 0)
         ret = int32(r0)
         if ret == -1 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
 func TranslateMessage(msg *Msg) (done bool) {
         r0, _, _ := syscall.Syscall(procTranslateMessage.Addr(), 1, uintptr(unsafe.Pointer(msg)), 0, 0)
         done = bool(r0 != 0)
         return
 }
 
 func DispatchMessage(msg *Msg) (ret int32) {
         r0, _, _ := syscall.Syscall(procDispatchMessageW.Addr(), 1, uintptr(unsafe.Pointer(msg)), 0, 0)
         ret = int32(r0)
         return
 }
 
-func LoadIcon(instance uint32, iconname *uint16) (icon uint32, errno int) {
+func LoadIcon(instance syscall.Handle, iconname *uint16) (icon syscall.Handle, errno int) {
         r0, _, e1 := syscall.Syscall(procLoadIconW.Addr(), 2, uintptr(instance), uintptr(unsafe.Pointer(iconname)), 0)
-        icon = uint32(r0)
+        icon = syscall.Handle(r0)
         if icon == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func LoadCursor(instance uint32, cursorname *uint16) (cursor uint32, errno int) {
+func LoadCursor(instance syscall.Handle, cursorname *uint16) (cursor syscall.Handle, errno int) {
         r0, _, e1 := syscall.Syscall(procLoadCursorW.Addr(), 2, uintptr(instance), uintptr(unsafe.Pointer(cursorname)), 0)
-        cursor = uint32(r0)
+        cursor = syscall.Handle(r0)
         if cursor == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func SetCursor(cursor uint32) (precursor uint32, errno int) {
+func SetCursor(cursor syscall.Handle) (precursor syscall.Handle, errno int) {
         r0, _, e1 := syscall.Syscall(procSetCursor.Addr(), 1, uintptr(cursor), 0, 0)
-        precursor = uint32(r0)
+        precursor = syscall.Handle(r0)
         if precursor == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }
 
-func SendMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) {
-        r0, _, _ := syscall.Syscall6(procSendMessageW.Addr(), 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
-        lresult = int32(r0)
+func SendMessage(hwnd syscall.Handle, msg uint32, wparam uintptr, lparam uintptr) (lresult uintptr) {
+        lresult, _, _ = syscall.Syscall6(procSendMessageW.Addr(), 4, uintptr(hwnd), uintptr(msg), wparam, lparam, 0, 0)
         return
 }
 
-func PostMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (errno int) {
-        r1, _, e1 := syscall.Syscall6(procPostMessageW.Addr(), 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
+func PostMessage(hwnd syscall.Handle, msg uint32, wparam uintptr, lparam uintptr) (errno int) {
+        r1, _, e1 := syscall.Syscall6(procPostMessageW.Addr(), 4, uintptr(hwnd), uintptr(msg), wparam, lparam, 0, 0)
         if int(r1) == 0 {
                 if e1 != 0 {
                         errno = int(e1)
                 } else {
                         errno = syscall.EINVAL
                 }
         } else {
                 errno = 0
         }
         return
 }