Use cvt from the cvt crate in winx

This commit is contained in:
Marcin Mielniczuk
2019-10-07 16:25:20 +02:00
committed by Jakub Konka
parent 692bb27209
commit 5dad532a43
2 changed files with 2 additions and 9 deletions

View File

@@ -9,3 +9,4 @@ description = "Windows API helper library"
[dependencies]
winapi = { version = "0.3", features = ["std", "errhandlingapi", "handleapi", "processthreadsapi", "securitybaseapi", "winbase", "winerror", "ws2def", "fileapi", "aclapi" ] }
bitflags = "1.0"
cvt = "0.1"

View File

@@ -1,5 +1,6 @@
#![allow(non_camel_case_types)]
use crate::{winerror, Result};
use cvt::cvt;
use std::ffi::{c_void, OsString};
use std::fs::File;
use std::io;
@@ -380,15 +381,6 @@ pub fn get_file_path(file: &File) -> Result<OsString> {
Ok(OsString::from_wide(written_bytes))
}
// Taken from Rust libstd, file libstd/sys/windows/fs.rs
fn cvt(i: winapi::shared::minwindef::BOOL) -> io::Result<()> {
if i == 0 {
Err(io::Error::last_os_error())
} else {
Ok(())
}
}
pub fn get_fileinfo(file: &File) -> io::Result<fileapi::BY_HANDLE_FILE_INFORMATION> {
use fileapi::{GetFileInformationByHandle, BY_HANDLE_FILE_INFORMATION};
use std::mem;