naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(napi): Windows i686 memory error

Browse source
This commit is contained in:
LongYinan 2021-10-24 23:13:08 +08:00
parent d164a79514
commit 40c237ef19
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/macro/src/lib.rs
View file

@ -141,7 +141,10 @@ pub fn js_function(attr: RawStream, input: RawStream) -> RawStream {
use std::ffi::CString; use std::ffi::CString;
use napi::{Env, Error, Status, NapiValue, NapiRaw, CallContext}; use napi::{Env, Error, Status, NapiValue, NapiRaw, CallContext};
let mut argc = #arg_len_span as usize; let mut argc = #arg_len_span as usize;
let mut raw_args: [napi::sys::napi_value; #arg_len_span] = [ptr::null_mut(); #arg_len_span]; #[cfg(all(target_os = "windows", target_arch = "x86"))]
let mut raw_args = vec![ptr::null_mut(); #arg_len_span];
#[cfg(not(all(target_os = "windows", target_arch = "x86")))]
let mut raw_args = [ptr::null_mut(); #arg_len_span];
let mut raw_this = ptr::null_mut(); let mut raw_this = ptr::null_mut();
unsafe { unsafe {
@ -157,6 +160,9 @@ pub fn js_function(attr: RawStream, input: RawStream) -> RawStream {
} }
let mut env = unsafe { Env::from_raw(raw_env) }; let mut env = unsafe { Env::from_raw(raw_env) };
#[cfg(all(target_os = "windows", target_arch = "x86"))]
let ctx = CallContext::new(&mut env, cb_info, raw_this, raw_args.as_slice(), argc);
#[cfg(not(all(target_os = "windows", target_arch = "x86")))]
let ctx = CallContext::new(&mut env, cb_info, raw_this, &raw_args, argc); let ctx = CallContext::new(&mut env, cb_info, raw_this, &raw_args, argc);
#execute_js_function #execute_js_function
} }