From 725e9ee9970e447dad8448fc9a294b3a2f937df1 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 24 Jun 2024 15:12:03 +0000 Subject: [PATCH] Update generate Windows bindings --- library/std/src/sys/pal/windows/c/windows_sys.rs | 2 +- library/std/src/sys/pal/windows/stdio.rs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/library/std/src/sys/pal/windows/c/windows_sys.rs b/library/std/src/sys/pal/windows/c/windows_sys.rs index 19f013d3347e4..68ff54261f638 100644 --- a/library/std/src/sys/pal/windows/c/windows_sys.rs +++ b/library/std/src/sys/pal/windows/c/windows_sys.rs @@ -618,7 +618,7 @@ extern "system" { extern "system" { pub fn WriteConsoleW( hconsoleoutput: HANDLE, - lpbuffer: *const core::ffi::c_void, + lpbuffer: PCWSTR, nnumberofcharstowrite: u32, lpnumberofcharswritten: *mut u32, lpreserved: *const core::ffi::c_void, diff --git a/library/std/src/sys/pal/windows/stdio.rs b/library/std/src/sys/pal/windows/stdio.rs index 690b60d1decca..10aeeac07ea2e 100644 --- a/library/std/src/sys/pal/windows/stdio.rs +++ b/library/std/src/sys/pal/windows/stdio.rs @@ -232,13 +232,7 @@ fn write_u16s(handle: c::HANDLE, data: &[u16]) -> io::Result { debug_assert!(data.len() < u32::MAX as usize); let mut written = 0; cvt(unsafe { - c::WriteConsoleW( - handle, - data.as_ptr() as c::LPCVOID, - data.len() as u32, - &mut written, - ptr::null_mut(), - ) + c::WriteConsoleW(handle, data.as_ptr(), data.len() as u32, &mut written, ptr::null_mut()) })?; Ok(written as usize) }