Update several dependencies. (#6171)
This updates to rustix 0.37.13, which contains some features we can use to implement more features in wasi-common for the wasi-sockets API. This also pulls in several other updates to avoid having multiple versions of rustix. This does introduce multiple versions of windows-sys, as the errno and tokio crates are currently using 0.45 while rustix and other dependencies have updated to 0.48; PRs updating these are already in flight so this will hopefully be resolved soon. It also includes cap-std 1.0.14, which disables the use of `openat2` and `statx` on Android, fixing a bug where some Android devices crash the process when those syscalls are executed.
This commit is contained in:
@@ -931,7 +931,7 @@ fn lookup_with_dlsym(name: &str) -> Option<*const u8> {
|
||||
#[cfg(windows)]
|
||||
fn lookup_with_dlsym(name: &str) -> Option<*const u8> {
|
||||
use std::os::windows::io::RawHandle;
|
||||
use windows_sys::Win32::Foundation::HINSTANCE;
|
||||
use windows_sys::Win32::Foundation::HMODULE;
|
||||
use windows_sys::Win32::System::LibraryLoader;
|
||||
|
||||
const UCRTBASE: &[u8] = b"ucrtbase.dll\0";
|
||||
@@ -948,7 +948,7 @@ fn lookup_with_dlsym(name: &str) -> Option<*const u8> {
|
||||
];
|
||||
|
||||
for handle in &handles {
|
||||
let addr = LibraryLoader::GetProcAddress(*handle as HINSTANCE, c_str_ptr.cast());
|
||||
let addr = LibraryLoader::GetProcAddress(*handle as HMODULE, c_str_ptr.cast());
|
||||
match addr {
|
||||
None => continue,
|
||||
Some(addr) => return Some(addr as *const u8),
|
||||
|
||||
Reference in New Issue
Block a user