mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix use of SetHandleInformation on UWP

Browse Source
This commit is contained in:
bdbai 2022-05-15 21:15:45 +08:00
parent e1ec3260d7
commit 4f637ee30b
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/std/src/os/windows/io/handle.rs
View File

@ -206,6 +206,7 @@ impl OwnedHandle {
}
/// Allow child processes to inherit the handle.
#[cfg(not(target_vendor = "uwp"))]
pub(crate) fn set_inheritable(&self) -> io::Result<()> {
cvt(unsafe {
c::SetHandleInformation(

1
library/std/src/os/windows/io/socket.rs
View File

@ -10,6 +10,7 @@ use crate::mem;
use crate::mem::forget;
use crate::sys;
use crate::sys::c;
#[cfg(not(target_vendor = "uwp"))]
use crate::sys::cvt;
/// A borrowed socket.

1
library/std/src/sys/windows/handle.rs
View File

@ -221,6 +221,7 @@ impl Handle {
Ok(Self(self.0.duplicate(access, inherit, options)?))
}
#[cfg(not(target_vendor = "uwp"))]
pub(crate) fn set_inheritable(&self) -> io::Result<()> {
self.0.set_inheritable()
}

13
library/std/src/sys/windows/pipe.rs
View File

@ -57,10 +57,21 @@ impl Pipes {
} else {
let (ours, theirs) = if ours_readable { (read, write) } else { (write, read) };
let ours = Handle::from_raw_handle(ours);
#[cfg(not(target_vendor = "uwp"))]
let theirs = Handle::from_raw_handle(theirs);
#[cfg(target_vendor = "uwp")]
let mut theirs = Handle::from_raw_handle(theirs);
if their_handle_inheritable {
theirs.set_inheritable()?;
#[cfg(not(target_vendor = "uwp"))]
{
theirs.set_inheritable()?;
}
#[cfg(target_vendor = "uwp")]
{
theirs = theirs.duplicate(0, true, c::DUPLICATE_SAME_ACCESS)?;
}
}
Ok(Pipes { ours: AnonPipe::Sync(ours), theirs: AnonPipe::Sync(theirs) })