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

fix(napi-sys): missing napi9 load on Windows (#1780)

Browse source
This commit is contained in:
LongYinan 2023-11-06 10:59:28 +08:00 committed by GitHub
parent 546b108a5b
commit cec062bd4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/sys/src/functions.rs
View file

@ -761,7 +761,7 @@ pub use napi8::*;
pub use napi9::*; pub use napi9::*;
#[cfg(windows)] #[cfg(windows)]
pub(super) unsafe fn load() -> Result<libloading::Library, libloading::Error> { pub(super) unsafe fn load_all() -> Result<libloading::Library, libloading::Error> {
let host = match libloading::os::windows::Library::this() { let host = match libloading::os::windows::Library::this() {
Ok(lib) => lib.into(), Ok(lib) => lib.into(),
Err(err) => { Err(err) => {
@ -785,6 +785,8 @@ pub(super) unsafe fn load() -> Result<libloading::Library, libloading::Error> {
napi7::load(&host)?; napi7::load(&host)?;
#[cfg(feature = "napi8")] #[cfg(feature = "napi8")]
napi8::load(&host)?; napi8::load(&host)?;
#[cfg(feature = "napi9")]
napi9::load(&host)?;
#[cfg(feature = "experimental")] #[cfg(feature = "experimental")]
experimental::load(&host)?; experimental::load(&host)?;
Ok(host) Ok(host)

2
crates/sys/src/lib.rs
View file

@ -90,7 +90,7 @@ pub use types::*;
#[cfg(windows)] #[cfg(windows)]
#[allow(clippy::missing_safety_doc)] #[allow(clippy::missing_safety_doc)]
pub unsafe fn setup() -> libloading::Library { pub unsafe fn setup() -> libloading::Library {
match load() { match load_all() {
Err(err) => panic!("{}", err), Err(err) => panic!("{}", err),
Ok(l) => l, Ok(l) => l,
} }