Merge pull request #370 from cunarist/32-bit-message-id

32-bit message ID
cunarist · Jun 11, 2024 · 0e328c9 · 0e328c9
2 parents 3126033 + c6d4d9f
commit 0e328c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/flutter_ffi_plugin/lib/src/interface_os.dart b/flutter_ffi_plugin/lib/src/interface_os.dart
@@ -77,20 +77,10 @@ Future<void> sendDartSignalReal(
   binaryMemory.asTypedList(binary.length).setAll(0, binary);
 
   final rustFunction = rustLibrary.lookupFunction<
-      Void Function(
-        IntPtr,
-        Pointer<Uint8>,
-        IntPtr,
-        Pointer<Uint8>,
-        IntPtr,
-      ),
-      void Function(
-        int,
-        Pointer<Uint8>,
-        int,
-        Pointer<Uint8>,
-        int,
-      )>('send_dart_signal_extern');
+      Void Function(Int32, Pointer<Uint8>, UintPtr, Pointer<Uint8>, UintPtr),
+      void Function(int, Pointer<Uint8>, int, Pointer<Uint8>, int)>(
+    'send_dart_signal_extern',
+  );
 
   rustFunction(
     messageId,
@@ -105,12 +95,9 @@ Future<void> sendDartSignalReal(
 }
 
 void prepareIsolateReal(int port) {
-  final rustFunction = rustLibrary.lookupFunction<
-      Void Function(
-        IntPtr,
-      ),
-      void Function(
-        int,
-      )>('prepare_isolate_extern');
+  final rustFunction =
+      rustLibrary.lookupFunction<Void Function(Int64), void Function(int)>(
+    'prepare_isolate_extern',
+  );
   rustFunction(port);
 }
diff --git a/rust_crate/Cargo.toml b/rust_crate/Cargo.toml
@@ -14,7 +14,7 @@ backtrace = "0.3.69"
 protoc-prebuilt = "0.3.0"
 home = "0.5.9"
 which = "6.0.0"
-allo-isolate = "0.1.24"
+allo-isolate = "0.1.25"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 
 [target.'cfg(target_family = "wasm")'.dependencies]

diff --git a/rust_crate/src/macros.rs b/rust_crate/src/macros.rs
@@ -26,7 +26,7 @@ macro_rules! write_interface {
         #[cfg(not(target_family = "wasm"))]
         #[no_mangle]
         pub unsafe extern "C" fn send_dart_signal_extern(
-            message_id: i64,
+            message_id: i32,
             message_pointer: *const u8,
             message_size: usize,
             binary_pointer: *const u8,
@@ -36,7 +36,7 @@ macro_rules! write_interface {
                 unsafe { std::slice::from_raw_parts(message_pointer, message_size).to_vec() };
             let binary =
                 unsafe { std::slice::from_raw_parts(binary_pointer, binary_size).to_vec() };
-            messages::generated::handle_dart_signal(message_id as i32, message_bytes, binary);
+            messages::generated::handle_dart_signal(message_id, message_bytes, binary);
         }
 
         #[cfg(target_family = "wasm")]