Skip to content

Commit 9cebf4e

Browse files
committed
Fix new FlushFileBuffers function
1 parent c0a027c commit 9cebf4e

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/shims/windows/foreign_items.rs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use std::ffi::OsStr;
22
use std::path::{self, Path, PathBuf};
33
use std::{io, iter, str};
44

5-
use rustc_abi::{Align, CanonAbi, Size, X86Call};
5+
use rustc_abi::{Align, Size};
66
use rustc_middle::ty::Ty;
77
use rustc_span::Symbol;
88
use rustc_target::callconv::FnAbi;
9-
use rustc_target::spec::{Arch, Env};
9+
use rustc_target::spec::Env;
1010

1111
use self::shims::windows::handle::{Handle, PseudoHandle};
1212
use crate::shims::os_str::bytes_to_os_str;
@@ -422,7 +422,12 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
422422
this.write_scalar(res, dest)?;
423423
}
424424
"FlushFileBuffers" => {
425-
let [handle] = this.check_shim_sig_lenient(abi, sys_conv, link_name, args)?;
425+
let [handle] = this.check_shim_sig(
426+
shim_sig!(extern "system" fn(winapi::HANDLE) -> winapi::BOOL),
427+
link_name,
428+
abi,
429+
args,
430+
)?;
426431
let res = this.FlushFileBuffers(handle)?;
427432
this.write_scalar(res, dest)?;
428433
}
@@ -1199,7 +1204,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
11991204
this.write_int(1, dest)?;
12001205
}
12011206
"GetModuleHandleA" if this.frame_in_std() => {
1202-
let [module_name] = this.check_shim_sig(
1207+
let [_module_name] = this.check_shim_sig(
12031208
shim_sig!(extern "system" fn(*const _) -> winapi::HMODULE),
12041209
link_name,
12051210
abi,
@@ -1209,7 +1214,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
12091214
this.write_int(1, dest)?;
12101215
}
12111216
"SetConsoleTextAttribute" if this.frame_in_std() => {
1212-
let [console_output, attribute] = this.check_shim_sig(
1217+
let [_console_output, _attribute] = this.check_shim_sig(
12131218
shim_sig!(extern "system" fn(winapi::HANDLE, u16) -> winapi::BOOL),
12141219
link_name,
12151220
abi,
@@ -1231,7 +1236,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
12311236
this.write_null(dest)?;
12321237
}
12331238
"GetFileType" if this.frame_in_std() => {
1234-
let [file] = this.check_shim_sig(
1239+
let [_file] = this.check_shim_sig(
12351240
shim_sig!(extern "system" fn(winapi::HANDLE) -> u32),
12361241
link_name,
12371242
abi,
@@ -1241,7 +1246,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
12411246
this.write_null(dest)?;
12421247
}
12431248
"AddVectoredExceptionHandler" if this.frame_in_std() => {
1244-
let [first, handler] = this.check_shim_sig(
1249+
let [_first, _handler] = this.check_shim_sig(
12451250
shim_sig!(extern "system" fn(u32, *mut _) -> *mut _),
12461251
link_name,
12471252
abi,
@@ -1251,7 +1256,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
12511256
this.write_int(1, dest)?;
12521257
}
12531258
"SetThreadStackGuarantee" if this.frame_in_std() => {
1254-
let [stack_size_in_bytes] = this.check_shim_sig(
1259+
let [_stack_size_in_bytes] = this.check_shim_sig(
12551260
shim_sig!(extern "system" fn(*mut _) -> winapi::BOOL),
12561261
link_name,
12571262
abi,

0 commit comments

Comments
 (0)