delete Ptr, PtrToString, StringToPtr

Author: mycaosf

AUTHORS

@@ -14,5 +14,6 @@ Anton Lahti <[email protected]>
 Benny Siegert <[email protected]>
 Cary Cherng <[email protected]>
 Hill <[email protected]>
+mycaosf <[email protected]>
 wsf01 <[email protected]>
 

user32.go

@@ -1186,9 +1186,6 @@ type (
 	HRAWINPUT HANDLE
 	HWND      HANDLE
 	LRESULT   int
-	WPARAM    uintptr
-	LPARAM    uintptr
-	UINT      uint32
 )
 
 type MSG struct {
@@ -1714,11 +1711,11 @@ func CloseClipboard() bool {
 }
 
 func CreateDialogParam(instRes HINSTANCE, name *uint16, parent HWND,
-	proc uintptr, param uintptr) HWND {
+	proc, param uintptr) HWND {
 	ret, _, _ := syscall.Syscall6(createDialogParam, 5,
-		Ptr(instRes),
-		Ptr(name),
-		Ptr(parent),
+		uintptr(instRes),
+		uintptr(unsafe.Pointer(name)),
+		uintptr(parent),
 		proc,
 		param,
 		0)
@@ -1825,11 +1822,11 @@ func DestroyWindow(hWnd HWND) bool {
 	return ret != 0
 }
 
-func DialogBoxParam(instRes HINSTANCE, name *uint16, parent HWND, proc uintptr, param uintptr) int {
+func DialogBoxParam(instRes HINSTANCE, name *uint16, parent HWND, proc, param uintptr) int {
 	ret, _, _ := syscall.Syscall6(dialogBoxParam, 5,
-		Ptr(instRes),
-		Ptr(name),
-		Ptr(parent),
+		uintptr(instRes),
+		uintptr(unsafe.Pointer(name)),
+		uintptr(parent),
 		proc,
 		param,
 		0)
@@ -1905,8 +1902,8 @@ func EndDeferWindowPos(hWinPosInfo HDWP) bool {
 
 func EndDialog(hwnd HWND, result int) bool {
 	ret, _, _ := syscall.Syscall(endDialog, 2,
-		Ptr(hwnd),
-		Ptr(result),
+		uintptr(hwnd),
+		uintptr(result),
 		0)
 
 	return ret != 0
@@ -2241,23 +2238,23 @@ func LoadImage(hinst HINSTANCE, lpszName *uint16, uType uint32, cxDesired, cyDes
 
 func LoadMenu(hinst HINSTANCE, name *uint16) HMENU {
 	ret, _, _ := syscall.Syscall(loadMenu, 2,
-		Ptr(hinst),
-		Ptr(name),
+		uintptr(hinst),
+		uintptr(unsafe.Pointer(name)),
 		0)
 
 	return HMENU(ret)
 }
 
-func LoadString(instRes HINSTANCE, id uint, buf *uint16, length int) int {
+func LoadString(instRes HINSTANCE, id uint32, buf *uint16, length int32) int32 {
 	ret, _, _ := syscall.Syscall6(loadString, 4,
-		Ptr(instRes),
-		Ptr(id),
-		Ptr(buf),
-		Ptr(length),
+		uintptr(instRes),
+		uintptr(id),
+		uintptr(unsafe.Pointer(buf)),
+		uintptr(length),
 		0,
 		0)
 
-	return int(ret)
+	return int32(ret)
 }
 
 func MessageBox(hWnd HWND, lpText, lpCaption *uint16, uType uint32) int32 {
@@ -2295,7 +2292,7 @@ func MoveWindow(hWnd HWND, x, y, width, height int32, repaint bool) bool {
 
 func UnregisterClass(name *uint16) bool {
 	ret, _, _ := syscall.Syscall(unregisterClass, 1,
-		Ptr(name),
+		uintptr(unsafe.Pointer(name)),
 		0,
 		0)
 
@@ -2405,16 +2402,16 @@ func ScreenToClient(hWnd HWND, point *POINT) bool {
 	return ret != 0
 }
 
-func SendDlgItemMessage(hWnd HWND, id int, msg UINT, wParam WPARAM, lParam LPARAM) LRESULT {
+func SendDlgItemMessage(hWnd HWND, id int32, msg uint32, wParam, lParam uintptr) uintptr {
 	ret, _, _ := syscall.Syscall6(sendDlgItemMessage, 5,
 		uintptr(hWnd),
 		uintptr(id),
 		uintptr(msg),
-		uintptr(wParam),
-		uintptr(lParam),
+		wParam,
+		lParam,
 		0)
 
-	return LRESULT(ret)
+	return ret
 }
 
 func SendInput(nInputs uint32, pInputs unsafe.Pointer, cbSize int32) uint32 {
@@ -2650,7 +2647,7 @@ func TranslateMessage(msg *MSG) bool {
 
 func UpdateWindow(hwnd HWND) bool {
 	ret, _, _ := syscall.Syscall(updateWindow, 1,
-		Ptr(hwnd),
+		uintptr(hwnd),
 		0,
 		0)
 

winapi.go

@@ -5,11 +5,8 @@
 package winapi
 
 import (
-	"reflect"
 	"runtime"
-	"strconv"
 	"syscall"
-	"unicode/utf16"
 	"unsafe"
 )
 
@@ -118,84 +115,3 @@ func BoolToBOOL(value bool) BOOL {
 
 	return 0
 }
-
-func GoStringToPtr(v string) uintptr {
-	if v == "" {
-		return 0
-	}
-
-	u := utf16.Encode([]rune(v))
-	u = append(u, 0)
-
-	return uintptr(unsafe.Pointer(&u[0]))
-}
-
-func PtrToGoString(v uintptr) string {
-	if v == 0 {
-		return ""
-	}
-
-	vp := (*[1 << 29]uint16)(unsafe.Pointer(v))
-	size := 0
-	for ; vp[size] != 0; size++ {
-	}
-
-	return string(utf16.Decode(vp[:size]))
-}
-
-func Ptr(i interface{}) (ret uintptr) {
-	v := reflect.ValueOf(i)
-	switch v.Kind() {
-	case reflect.Slice, reflect.Func, reflect.Ptr, reflect.UnsafePointer:
-		ret = v.Pointer()
-		break
-
-	case reflect.Uintptr, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
-		ret = uintptr(v.Uint())
-		break
-
-	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
-		ret = uintptr(v.Int())
-		break
-
-	case reflect.String:
-		ret = GoStringToPtr(v.String())
-		break
-
-	case reflect.Bool:
-		if v.Bool() {
-			ret = 1
-		} else {
-			ret = 0
-		}
-		break
-	}
-
-	return
-}
-
-func allNumber(s string) bool {
-	for _, v := range s {
-		if !(v >= '0' && v <= '9') {
-			return false
-		}
-	}
-
-	return true
-}
-
-func ResourceNameToUTF16Ptr(name string) (id *uint16) {
-	number := allNumber(name)
-	if number {
-		idNumber, err := strconv.Atoi(name)
-		if err != nil {
-			id = syscall.StringToUTF16Ptr(name)
-		} else {
-			id = MAKEINTRESOURCE(uintptr(idNumber))
-		}
-	} else {
-		id = syscall.StringToUTF16Ptr(name)
-	}
-
-	return
-}