fix: Fix warnings under OSX.

Author: pravic

callbacks.c

@@ -23,7 +23,7 @@ VOID SC_CALLBACK LPCWSTR_RECEIVER_cgo(LPCWSTR str, UINT str_length, LPVOID param
 // typedef VOID SC_CALLBACK LPCSTR_RECEIVER(LPCSTR str, UINT str_length, LPVOID param);
 VOID SC_CALLBACK LPCSTR_RECEIVER_cgo(LPCSTR str, UINT str_length, LPVOID param)
 {
-    goLPCSTR_RECEIVER((CHAR*)str, str_length, param);
+    goLPCSTR_RECEIVER(str, str_length, param);
 }
 
 // typedef BOOL SC_CALLBACK ElementEventProc(LPVOID tag, HELEMENT he, UINT evtg, LPVOID prms);
@@ -54,7 +54,7 @@ VOID NATIVE_FUNCTOR_RELEASE_cgo(VOID* tag)
 
 INT SC_CALLBACK ELEMENT_COMPARATOR_cgo(HELEMENT he1, HELEMENT he2, LPVOID param)
 {
-    goELEMENT_COMPARATOR(he1, he2, param);
+    return goELEMENT_COMPARATOR(he1, he2, param);
 }
 
 // typedef BOOL SC_CALLBACK KeyValueCallback(LPVOID param, const VALUE* pkey, const VALUE* pval);

sciter-x-api.c

@@ -57,6 +57,8 @@ const char * SCITER_DLL_PATH = SCITER_DLL_NAME;
 
 #elif defined(OSX)
 
+    #include <string.h>
+
     //typedef ISciterAPI* SCAPI (*SciterAPI_ptr)();
 
     ISciterAPI* SAPI( ISciterAPI* ext )

sciter.go

@@ -670,9 +670,9 @@ func goLPCWSTR_RECEIVER(bs *uint16, n uint, param unsafe.Pointer) int {
 // typedef VOID SC_CALLBACK LPCSTR_RECEIVER( LPCSTR str, UINT str_length, LPVOID param );
 
 //export goLPCSTR_RECEIVER
-func goLPCSTR_RECEIVER(bs *byte, n uint, param unsafe.Pointer) int {
+func goLPCSTR_RECEIVER(bs C.LPCSTR, n uint, param unsafe.Pointer) int {
 	s := (*string)(param)
-	*s = BytePtrToString(bs)
+	*s = C.GoString(bs)
 	return 0
 }
 

types.go

@@ -71,8 +71,8 @@ const (
 	HANDLE_DRAW           = 0x0040 /** drawing request (event) */
 	HANDLE_DATA_ARRIVED   = 0x080  /** requested data () has been delivered */
 	HANDLE_BEHAVIOR_EVENT = 0x0100 /** logical synthetic events:
-		BUTTON_CLICK HYPERLINK_CLICK etc.
-		a.k.a. notifications from intrinsic behaviors */
+		BUTTON_CLICK HYPERLINK_CLICK etc.
+		a.k.a. notifications from intrinsic behaviors */
 	HANDLE_METHOD_CALL           = 0x0200 /** behavior specific methods */
 	HANDLE_SCRIPTING_METHOD_CALL = 0x0400 /** behavior specific methods */
 	HANDLE_TISCRIPT_METHOD_CALL  = 0x0800 /** behavior specific methods using direct tiscript::value's */
@@ -384,7 +384,7 @@ const (
 	BY_MOUSE_CLICK EventReason = iota
 	BY_KEY_CLICK
 	SYNTHESIZED // synthesized programmatically generated.
-	BY_MOUSE_ON_ICON
+	BY_MOUSE_ON_ICON
 )
 
 type EditChangedReason uint
@@ -395,7 +395,7 @@ const (
 	BY_INS_CHARS                          // character range insertion clipboard
 	BY_DEL_CHAR                           // single char deletion
 	BY_DEL_CHARS                          // character range deletion (selection)
-	BY_UNDO_REDO                          // undo/redo
+	BY_UNDO_REDO                          // undo/redo
 )
 
 type BehaviorMethodIdentifier uint32
@@ -593,7 +593,7 @@ type MethodParams struct {
 type ScriptingMethodParams C.SCRIPTING_METHOD_PARAMS
 
 func (s *ScriptingMethodParams) Name() string {
-	return BytePtrToString((*byte)(unsafe.Pointer(s.name)))
+	return C.GoString(s.name)
 }
 
 func (s *ScriptingMethodParams) Argc() int {
@@ -780,7 +780,7 @@ const (
 	 * asynchronously.
 	 **/
 	/* obsolete #define SC_DOCUMENT_COMPLETE 0x03
-		 use DOCUMENT_COMPLETE DOM event.
+		 use DOCUMENT_COMPLETE DOM event.
 	*/
 
 	/**This notification is sent on parsing the document and while processing
@@ -976,7 +976,7 @@ type ScnAttachBehavior C.SCN_ATTACH_BEHAVIOR
 // }
 
 func (s *ScnAttachBehavior) BehaviorName() string {
-	return BytePtrToString((*byte)(unsafe.Pointer(s.behaviorName)))
+	return C.GoString(s.behaviorName)
 }
 
 func (s *ScnAttachBehavior) Element() C.HELEMENT {
@@ -1175,12 +1175,12 @@ const (
 // {
 const (
 	GFX_LAYER_GDI  = 1
-	GFX_LAYER_CG   = 1
-	GFX_LAYER_CAIRO= 1
+	GFX_LAYER_CG   = 1
+	GFX_LAYER_CAIRO= 1
 	GFX_LAYER_WARP = 2
 	GFX_LAYER_D2D  = 3
-	GFX_LAYER_SKIA = 4
-	GFX_LAYER_SKIA_OPENGL = 5
+	GFX_LAYER_SKIA = 4
+	GFX_LAYER_SKIA_OPENGL = 5
 	GFX_LAYER_AUTO = 0xFFFF
 )
 

utils.go

@@ -1,96 +1,81 @@
-package sciter
-
-/*
-#cgo CFLAGS: -Iinclude
-#include "sciter-x.h"
-*/
-import "C"
-import (
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-)
-
-// Returns the utf-8 encoding of the utf-16 sequence s,
-// with a terminating NUL removed.
-func Utf16ToString(s *uint16) string {
-	if s == nil {
-		panic("null cstring")
-	}
-	us := make([]uint16, 0, 256)
-	for p := uintptr(unsafe.Pointer(s)); ; p += 2 {
-		u := *(*uint16)(unsafe.Pointer(p))
-		if u == 0 {
-			return string(utf16.Decode(us))
-		}
-		us = append(us, u)
-	}
-	return ""
-}
-
-func Utf16ToStringLength(s *uint16, length int) string {
-	if s == nil {
-		panic("null cstring")
-	}
-	us := make([]uint16, 0, 256)
-	for p, i := uintptr(unsafe.Pointer(s)), 0; i < length; p, i = p+2, i+1 {
-		u := *(*uint16)(unsafe.Pointer(p))
-		us = append(us, u)
-	}
-	return string(utf16.Decode(us))
-}
-
-func BytePtrToString(s *byte) string {
-	if s == nil {
-		panic("null cstring")
-	}
-	bs := make([]byte, 0, 256)
-	for p := uintptr(unsafe.Pointer(s)); ; p += 1 {
-		b := *(*byte)(unsafe.Pointer(p))
-		if b == 0 {
-			return string(bs)
-		}
-		bs = append(bs, b)
-	}
-	return ""
-}
-
-func StringToBytePtr(s string) *byte {
-	bs := ([]byte)(s)
-	return &bs[0]
-}
-
-func Utf16FromString(s string) ([]uint16, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, syscall.EINVAL
-		}
-	}
-	return utf16.Encode([]rune(s + "\x00")), nil
-}
-
-func StringToWcharPtr(s string) *C.WCHAR {
-	return (*C.WCHAR)(unsafe.Pointer(StringToUTF16Ptr(s)))
-}
-
-func StringToUTF16Ptr(s string) *uint16 {
-	us, _ := Utf16FromString(s)
-	return &us[0]
-}
-
-func StringToUTF16PtrWithLen(s string) (*uint16, int) {
-	us, _ := Utf16FromString(s)
-	length := len(us) - 1
-	return &us[0], length
-}
-
-func BytePtrToBytes(bp *byte, size uint) []byte {
-	bs := []byte{}
-	p := uintptr(unsafe.Pointer(bp))
-	step := unsafe.Sizeof(*bp)
-	for i := uint(0); i < size; i++ {
-		b := *(*byte)(unsafe.Pointer(p + uintptr(i)*step))
-		bs = append(bs, b)
-	}
-	return bs
-}
+package sciter
+
+/*
+#cgo CFLAGS: -Iinclude
+#include "sciter-x.h"
+*/
+import "C"
+import (
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+)
+
+// Returns the utf-8 encoding of the utf-16 sequence s,
+// with a terminating NUL removed.
+func Utf16ToString(s *uint16) string {
+	if s == nil {
+		panic("null cstring")
+	}
+	us := make([]uint16, 0, 256)
+	for p := uintptr(unsafe.Pointer(s)); ; p += 2 {
+		u := *(*uint16)(unsafe.Pointer(p))
+		if u == 0 {
+			return string(utf16.Decode(us))
+		}
+		us = append(us, u)
+	}
+	return ""
+}
+
+func Utf16ToStringLength(s *uint16, length int) string {
+	if s == nil {
+		panic("null cstring")
+	}
+	us := make([]uint16, 0, 256)
+	for p, i := uintptr(unsafe.Pointer(s)), 0; i < length; p, i = p+2, i+1 {
+		u := *(*uint16)(unsafe.Pointer(p))
+		us = append(us, u)
+	}
+	return string(utf16.Decode(us))
+}
+
+func StringToBytePtr(s string) *byte {
+	bs := ([]byte)(s)
+	return &bs[0]
+}
+
+func Utf16FromString(s string) ([]uint16, error) {
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, syscall.EINVAL
+		}
+	}
+	return utf16.Encode([]rune(s + "\x00")), nil
+}
+
+func StringToWcharPtr(s string) *C.WCHAR {
+	return (*C.WCHAR)(unsafe.Pointer(StringToUTF16Ptr(s)))
+}
+
+func StringToUTF16Ptr(s string) *uint16 {
+	us, _ := Utf16FromString(s)
+	return &us[0]
+}
+
+func StringToUTF16PtrWithLen(s string) (*uint16, int) {
+	us, _ := Utf16FromString(s)
+	length := len(us) - 1
+	return &us[0], length
+}
+
+func BytePtrToBytes(bp *byte, size uint) []byte {
+	bs := []byte{}
+	p := uintptr(unsafe.Pointer(bp))
+	step := unsafe.Sizeof(*bp)
+	for i := uint(0); i < size; i++ {
+		b := *(*byte)(unsafe.Pointer(p + uintptr(i)*step))
+		bs = append(bs, b)
+	}
+	return bs
+}