functionalscript 0.0.462 → 0.0.464

package/.github/workflows/com.yml

@@ -19,10 +19,13 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js 19
       uses: actions/setup-node@v2
       with:
         node-version: 19
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7
     - run: npm ci
     - run: npm run comtest

package/Cargo.lock

@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "nanocom"
-version = "0.2.0"
+version = "0.2.1"
 
 [[package]]
 name = "testrust"

package/com/cpp/com.hpp

@@ -21,7 +21,12 @@ namespace com
     };
 
     typedef uint32_t HRESULT;
+
+    static HRESULT const E_NOINTERFACE = 0x80004002;
+    static HRESULT const S_OK = 0;
+
     typedef uint32_t ULONG;
+
     typedef int32_t BOOL;
 
     class IUnknown
@@ -32,7 +37,7 @@ namespace com
         virtual ULONG COM_STDCALL Release() noexcept = 0;
     };
 
-    template <class I>
+    template<class I>
     class ref
     {
     public:
@@ -50,4 +55,21 @@ namespace com
     private:
         I &p;
     };
+
+    template<class I>
+    class implementation: public I
+    {
+        HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown **const ppvObject) noexcept override
+        {
+            return E_NOINTERFACE;
+        }
+        ULONG COM_STDCALL AddRef() noexcept override
+        {
+            return 0;
+        }
+        ULONG COM_STDCALL Release() noexcept override
+        {
+            return 0;
+        }
+    };
 }

package/com/rust/nanocom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nanocom"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "Nano-COM, extremly small subset of cross-platform COM"
 authors = ["NatFoam"]

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

@@ -3,7 +3,7 @@ use std::{
     sync::atomic::{AtomicU32, Ordering},
 };
 
-use crate::{hresult::HRESULT, iunknown::IUnknown, Class, Interface, Object, Ref, Vmt};
+use crate::{guid::GuidEx, hresult::HRESULT, iunknown::IUnknown, Class, Object, Ref};
 
 #[repr(C)]
 pub struct CObject<T: Class> {
@@ -12,14 +12,6 @@ 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,
@@ -38,7 +30,7 @@ impl<T: Class> CObject<T> {
         riid: &u128,
         ppv_object: &mut *const Object,
     ) -> HRESULT {
-        let (p, r) = if *riid == guid::<()>() || *riid == guid::<T::Interface>() {
+        let (p, r) = if *riid == <()>::PLATFORM_GUID || *riid == T::Interface::PLATFORM_GUID {
             Self::AddRef(this);
             (this.to_iunknown() as *const Object, HRESULT::S_OK)
         } else {

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

@@ -1 +1,15 @@
+use crate::Interface;
+
 pub type GUID = u128;
+
+pub trait GuidEx: Interface {
+    const PLATFORM_GUID: GUID = {
+        let x = Self::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: Interface> GuidEx for T {}

package/com/test/build.f.cjs

@@ -77,13 +77,17 @@ const cpp = ({dirname, platform}) => ({
 })
 
 /** @type {Func} */
-const cs = ({dirname}) => ({
+const cs = ({dirname, platform}) => ({
     file: {
         name: `${dirname}/cs/_result.cs`,
         content: csContent,
     },
     line: [
-        ['dotnet', 'run', '--project', `${dirname}/cs/cs.csproj`]],
+        platform === 'win32'
+            ? ['dotnet', 'run', '--project', `${dirname}/cs/cs.csproj`]
+        // .Net on Linux and Windows doesn't properly support COM object marshalling
+            : ['dotnet', 'build', `${dirname}/cs/cs.csproj`]
+    ],
 })
 
 /** @type {Func} */

package/com/test/cpp/main.cpp

@@ -12,3 +12,34 @@ extern "C" int c_get()
 {
     return 43;
 }
+
+class Impl: public com::implementation<My::IMy>
+{
+    My::Slice COM_STDCALL GetSlice() noexcept override
+    {
+    }
+    void COM_STDCALL SetSlice(My::Slice slice) noexcept override
+    {
+    }
+    ::com::BOOL *COM_STDCALL GetUnsafe() noexcept override
+    {
+    }
+    void COM_STDCALL SetUnsafe(My::Slice *p, uint32_t size) noexcept override
+    {
+    }
+    ::com::BOOL COM_STDCALL Some(My::IMy &p) noexcept override
+    {
+    }
+    ::com::ref<My::IMy> COM_STDCALL GetIMy() noexcept override
+    {
+    }
+    void COM_STDCALL SetManagedStruct(My::ManagedStruct a) noexcept override
+    {
+    }
+};
+
+DLL_EXPORT
+extern "C" My::IMy* c_my_create()
+{
+    return new Impl();
+}

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

@@ -46,9 +46,11 @@ 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.462",
+  "version": "0.0.464",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {