Moved some functions around.

This commit is contained in:
Pietro Gagliardi 2014-08-25 16:20:10 -04:00
parent b7fd5f035e
commit 6fcfbd9bdb
2 changed files with 11 additions and 12 deletions

View File

@ -44,3 +44,14 @@ func getWindowText(hwnd C.HWND) string {
C.LPWSTR(unsafe.Pointer(&buf[0])))
return syscall.UTF16ToString(buf)
}
func wstrToString(wstr *C.WCHAR) string {
n := C.wcslen((*C.wchar_t)(unsafe.Pointer(wstr)))
xbuf := &reflect.SliceHeader{
Data: uintptr(unsafe.Pointer(wstr)),
Len: int(n + 1),
Cap: int(n + 1),
}
buf := (*[]uint16)(unsafe.Pointer(xbuf))
return syscall.UTF16ToString(*buf)
}

View File

@ -11,18 +11,6 @@ import (
// #include "winapi_windows.h"
import "C"
// TODO move to common_windows.go
func wstrToString(wstr *C.WCHAR) string {
n := C.wcslen((*C.wchar_t)(unsafe.Pointer(wstr)))
xbuf := &reflect.SliceHeader{
Data: uintptr(unsafe.Pointer(wstr)),
Len: int(n + 1),
Cap: int(n + 1),
}
buf := (*[]uint16)(unsafe.Pointer(xbuf))
return syscall.UTF16ToString(*buf)
}
func openFile() string {
name := C.openFile()
if name == nil {