functionalscript 0.0.461 → 0.0.462

package/com/rust/nanocom/src/cobject.rs

@@ -12,6 +12,14 @@ pub struct CObject<T: Class> {
     pub value: T,
 }
 
+const fn guid<I: Interface>() -> u128 {
+    let x = <I>::GUID;
+    (x >> 96) |
+    ((x >>  48) & 0x00000_000_0000_0000_0000_FFFF_0000_0000) |
+    ((x >>  16) & 0x0000_0000_0000_0000_FFFF_0000_0000_0000) |
+    (((x as u64).swap_bytes() as u128) << 64)
+}
+
 impl<T: Class> CObject<T> {
     pub const IUNKNOWN: IUnknown<T::Interface> = IUnknown {
         QueryInterface: Self::QueryInterface,
@@ -30,7 +38,7 @@ impl<T: Class> CObject<T> {
         riid: &u128,
         ppv_object: &mut *const Object,
     ) -> HRESULT {
-        let (p, r) = if *riid == <()>::GUID || *riid == T::Interface::GUID {
+        let (p, r) = if *riid == guid::<()>() || *riid == guid::<T::Interface>() {
             Self::AddRef(this);
             (this.to_iunknown() as *const Object, HRESULT::S_OK)
         } else {

package/com/rust/nanocom/tests/it.rs

@@ -87,7 +87,7 @@ mod number {
 }
 
 mod use_number {
-    use nanocom::{CObjectEx, Class};
+    use nanocom::CObjectEx;
 
     use super::{library::IMyEx, number::X};
 

package/com/test/cs/Program.cs

@@ -1,12 +1,19 @@
 using System.Runtime.InteropServices;
+using My;
 
 [DllImport("testrust")]
 static extern int get();
 
+[DllImport("testrust")]
+static extern IMy rust_my_create();
+
 [DllImport("testc")]
 static extern int c_get();
 
 // See https://aka.ms/new-console-template for more information
 Console.WriteLine("Hello, World!");
 Console.WriteLine(get());
-Console.WriteLine(c_get());
+Console.WriteLine(c_get());
+
+var x = rust_my_create();
+x.SetSlice(new Slice { Start = null, Size = (UIntPtr)44 });

package/com/test/rust/src/lib.rs

@@ -1,7 +1,10 @@
-use crate::_result::IMy::ClassEx;
-
 mod _result;
 
+use _result::IMy;
+use nanocom::CObjectEx;
+
+use crate::_result::IMy::ClassEx;
+
 struct My {}
 
 impl nanocom::Class for My {
@@ -18,7 +21,7 @@ impl _result::IMy::Ex for nanocom::CObject<My> {
     }
 
     fn SetSlice(&self, slice: _result::Slice) {
-        todo!()
+        println!("SetSlice: {:?}, {:?}", slice.Start, slice.Size);
     }
 
     fn GetUnsafe(&self) -> *const bool {
@@ -43,4 +46,9 @@ impl _result::IMy::Ex for nanocom::CObject<My> {
 }
 
 #[no_mangle]
-pub extern "C" fn get() -> i32 { 42 }
+pub extern "C" fn get() -> i32 { 42 }
+
+#[no_mangle]
+pub extern "C" fn rust_my_create() -> IMy::Ref {
+    My {}.to_cobject()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.461",
+  "version": "0.0.462",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {