feat: Sciter archive support.

Also refactor some C -> Go data conversions.

refs sciter-sdk#86

Author: pravic

README.md

@@ -13,8 +13,7 @@ Check [this page](http://sciter.com/developers/sciter-sdk-bindings/) for other l
 # Attention
 
 The ownership of project is transferred to this new organization.
-Thus the `import path` for golang should now be `github.com/sciter-sdk/go-sciter`,
-but the package name is still `sciter`.
+Thus the `import path` for golang should now be `github.com/sciter-sdk/go-sciter`, but the package name is still `sciter`.
 
 # Introduction
 
@@ -66,6 +65,8 @@ Things that are not supported:
 
     Under Linux gcc(4.8 or above) and gtk+-3.0 are needed.
 
+    At the moment only **Go 1.10** or higher is supported (issue #136).
+
  4. `go get -x github.com/sciter-sdk/go-sciter`
 
  5. Run the example and enjoy :)

sciter-x-api.c

@@ -54,15 +54,6 @@ const char * SCITER_DLL_PATH = SCITER_DLL_NAME;
        return _api;
     }
 
-	HSARCHIVE SCAPI SciterOpenArchive (LPCBYTE archiveData, UINT archiveDataLength) { 
-		return SAPI(NULL)->SciterOpenArchive (archiveData,archiveDataLength); 
-	}
-
-	BOOL SCAPI SciterGetArchiveItem (HSARCHIVE harc, LPCWSTR path, LPCBYTE* pdata, UINT* pdataLength){
-		return SAPI(NULL)->SciterGetArchiveItem (harc,path,pdata,pdataLength); 
-	}
-
-
 #elif defined(OSX)
 
     #include <string.h>
@@ -376,3 +367,15 @@ const char * SCITER_DLL_PATH = SCITER_DLL_NAME;
   BOOL SCAPI Sciter_V2v(HVM vm, const VALUE* value, tiscript_value* out_script_value) { return SAPI(NULL)->Sciter_V2v(vm,value,out_script_value); }
 
   BOOL SCAPI SciterProcX(HWINDOW hwnd, SCITER_X_MSG* pMsg) { return SAPI(NULL)->SciterProcX(hwnd, pMsg); }
+
+	HSARCHIVE SCAPI SciterOpenArchive (LPCBYTE archiveData, UINT archiveDataLength) { 
+		return SAPI(NULL)->SciterOpenArchive (archiveData, archiveDataLength); 
+	}
+
+	BOOL SCAPI SciterGetArchiveItem (HSARCHIVE harc, LPCWSTR path, LPCBYTE* pdata, UINT* pdataLength) {
+		return SAPI(NULL)->SciterGetArchiveItem (harc, path, pdata, pdataLength); 
+	}
+  
+  BOOL SCAPI SciterCloseArchive (HSARCHIVE harc) {
+    return SAPI(NULL)->SciterCloseArchive (harc);
+  }

sciter.go

@@ -26,6 +26,13 @@ extern INT SC_CALLBACK ELEMENT_COMPARATOR_cgo( HELEMENT he1, HELEMENT he2, LPVOI
 extern BOOL SC_CALLBACK KeyValueCallback_cgo(LPVOID param, const VALUE* pkey, const VALUE* pval );
 
 extern const char * SCITER_DLL_PATH;
+
+extern HSARCHIVE SCAPI SciterOpenArchive (LPCBYTE archiveData, UINT archiveDataLength);
+
+extern BOOL SCAPI SciterGetArchiveItem (HSARCHIVE harc, LPCWSTR path, LPCBYTE* pdata, UINT* pdataLength);
+
+extern BOOL SCAPI SciterCloseArchive (HSARCHIVE harc);
+
 */
 import "C"
 import (
@@ -41,6 +48,8 @@ type Sciter struct {
 	callbacks map[*CallbackHandler]struct{}
 	// map scripting function name to NativeFunctor
 	*eventMapper
+	// sciter archive
+	har C.HSARCHIVE
 }
 
 var (
@@ -439,25 +448,34 @@ func (s *Sciter) SetHomeURL(baseUrl string) (ok bool) {
 	}
 	return true
 }
+
+// Open a data blob of the Sciter compressed archive.
 func (s *Sciter) OpenArchive(data []byte) {
-    s.har = C.SciterOpenArchive((*C.BYTE)(&data[0]), C.UINT(len(data)))
+	s.har = C.SciterOpenArchive((*C.BYTE)(&data[0]), C.UINT(len(data)))
 }
+
+// Get an archive item referenced by \c uri.
+//
+// Usually it is passed to \c Sciter.DataReady().
 func (s *Sciter) GetArchiveItem(uri string) []byte {
-    var pv uintptr = 0
-    var length uint = 0
-    pBytes := (*C.LPCBYTE)(unsafe.Pointer(&pv))
-    pnBytes := (*C.UINT)(unsafe.Pointer(&length))
-    r := C.SciterGetArchiveItem(s.har, StringToWcharPtr(uri), pBytes, pnBytes)
-    if r == 0 {
-        return nil
-    }
-    ret := []byte{}
-    for i := 0; i < int(length); i++ {
-        b := *(*byte)(unsafe.Pointer(pv + uintptr(i)))
-        ret = append(ret, b)
-    }
-    return ret
+	var data C.LPCBYTE
+	var length C.UINT
+	cdata := (*C.LPCBYTE)(&data)
+	clength := C.LPUINT(&length)
+	r := C.SciterGetArchiveItem(s.har, StringToWcharPtr(uri), cdata, clength)
+	if r == 0 {
+		return nil
+	}
+	ret := ByteCPtrToBytes(data, length)
+	return ret
 }
+
+// Close the archive.
+func (s *Sciter) CloseArchive() {
+	C.SciterCloseArchive(s.har)
+	s.har = C.HSARCHIVE(nil)
+}
+
 // #if defined(OSX)
 // HWINDOW  SciterCreateNSView ( LPRECT frame ) ;//{ return SAPI()->SciterCreateNSView ( frame ); }
 // #endif
@@ -664,14 +682,7 @@ func (e *Element) ParentElement() (*Element, error) {
 
 //export goLPCBYTE_RECEIVER
 func goLPCBYTE_RECEIVER(bs *byte, n uint, param unsafe.Pointer) int {
-	var r []byte
-	p := uintptr(unsafe.Pointer(bs))
-	println("goLPCBYTE_RECEIVER:", n)
-	for i := 0; i < int(n); i++ {
-		u := *(*byte)(unsafe.Pointer(p + uintptr(i)))
-		r = append(r, u)
-	}
-	println("in:", string(r))
+	r := BytePtrToBytes(bs, n)
 	*(*[]byte)(param) = r
 	return 0
 }
@@ -2021,21 +2032,16 @@ func (pdst *Value) SetFloat(data float64) error {
 func (pdst *Value) Bytes() []byte {
 	cpdst := (*C.VALUE)(unsafe.Pointer(pdst))
 	// args
-	var pv uintptr = 0
-	var length uint = 0
+	var pv C.LPCBYTE
+	var length C.UINT
 	pBytes := (*C.LPCBYTE)(unsafe.Pointer(&pv))
-	pnBytes := (*C.UINT)(unsafe.Pointer(&length))
+	pnBytes := C.LPUINT(&length)
 	// cgo call
 	r := C.ValueBinaryData(cpdst, pBytes, pnBytes)
 	if r != C.UINT(HV_OK) {
 		return nil
 	}
-	ret := []byte{}
-	sz := unsafe.Sizeof(pv)
-	for i := 0; i < int(length); i++ {
-		b := *(*byte)(unsafe.Pointer(pv + uintptr(i)*sz))
-		ret = append(ret, b)
-	}
+	ret := ByteCPtrToBytes(pv, length)
 	return ret
 }
 

sciter_windows.go

@@ -25,16 +25,6 @@ func ProcND(hwnd win.HWND, msg uint, wParam uintptr, lParam uintptr) (ret int, h
 	return
 }
 
-//BOOL SciterLoadFile (HWINDOW hWndSciter, LPCWSTR filename) ;//{ return SAPI()->SciterLoadFile (hWndSciter,filename); }
-func LoadFileForHWND(hwnd win.HWND, filename string) error {
-
-	ret := C.SciterLoadFile(C.HWINDOW(unsafe.Pointer(hwnd)), StringToWcharPtr(filename))
-	if ret == 0 {
-		return fmt.Errorf("LoadFile with: %s failed", filename)
-	}
-	return nil
-}
-
 // HWINDOW  SciterCreateWindow ( UINT creationFlags,LPRECT frame, SciterWindowDelegate* delegate, LPVOID delegateParam, HWINDOW parent);
 
 // Create sciter window.

types.go

@@ -887,14 +887,7 @@ func (s *ScnLoadData) Uri() string {
 }
 
 func (s *ScnLoadData) Data() []byte {
-	ret := []byte{}
-	var b byte
-	pdata := uintptr(unsafe.Pointer(s.outData))
-	step := unsafe.Sizeof(b)
-	for i := 0; i < int(s.outDataSize); i++ {
-		b = *(*byte)(unsafe.Pointer(pdata + uintptr(i)*step))
-		ret = append(ret, b)
-	}
+	ret := ByteCPtrToBytes(s.outData, s.outDataSize)
 	return ret
 }
 

utils.go

@@ -69,13 +69,12 @@ func StringToUTF16PtrWithLen(s string) (*uint16, int) {
 	return &us[0], length
 }
 
+func ByteCPtrToBytes(bp: C.LPCBYTE, size C.UINT) []byte {
+	bs := C.GoBytes(unsafe.Pointer(data), C.INT(length))
+	return bs
+}
+
 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)
-	}
+	bs := C.GoBytes(unsafe.Pointer(bp), C.INT(size))
 	return bs
 }