Skip to content

Commit a3d638a

Browse files
dependabot[bot]youknowone
dependabot[bot]
and
youknowone
authored
Bump windows-sys from 0.59.0 to 0.61.2 (#6346)
* Bump windows-sys from 0.59.0 to 0.61.2 Bumps [windows-sys](https://github.com/microsoft/windows-rs) from 0.59.0 to 0.61.2. - [Release notes](https://github.com/microsoft/windows-rs/releases) - [Commits](https://github.com/microsoft/windows-rs/commits) --- updated-dependencies: - dependency-name: windows-sys dependency-version: 0.61.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix breaking changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeong, YunWon <jeong@youknowone.org>
1 parent bf565e9 commit a3d638a

6 files changed

Lines changed: 31 additions & 32 deletions

File tree

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ unic-ucd-ident = "0.9.0"
219219
unicode_names2 = "2.0.0"
220220
unicode-bidi-mirroring = "0.4"
221221
widestring = "1.2.0"
222-
windows-sys = "0.59.0"
222+
windows-sys = "0.61.2"
223223
wasm-bindgen = "0.2.100"
224224

225225
# Lints

‎crates/common/src/fileutils.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub mod windows {
3030
use std::os::windows::io::AsRawHandle;
3131
use std::sync::OnceLock;
3232
use windows_sys::Win32::Foundation::{
33-
BOOL, ERROR_INVALID_HANDLE, ERROR_NOT_SUPPORTED, FILETIME, FreeLibrary, SetLastError,
33+
ERROR_INVALID_HANDLE, ERROR_NOT_SUPPORTED, FILETIME, FreeLibrary, SetLastError,
3434
};
3535
use windows_sys::Win32::Storage::FileSystem::{
3636
BY_HANDLE_FILE_INFORMATION, FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_READONLY,
@@ -299,7 +299,7 @@ pub mod windows {
299299
FILE_INFO_BY_NAME_CLASS,
300300
*mut libc::c_void,
301301
u32,
302-
) -> BOOL,
302+
) -> i32,
303303
>,
304304
> = OnceLock::new();
305305

‎crates/vm/src/stdlib/winapi.rs‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mod _winapi {
1919
Win32::Foundation::{HANDLE, HINSTANCE, MAX_PATH},
2020
core::PCWSTR,
2121
};
22-
use windows_sys::Win32::Foundation::{BOOL, INVALID_HANDLE_VALUE};
22+
use windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE;
2323

2424
#[pyattr]
2525
use windows_sys::Win32::{
@@ -36,14 +36,19 @@ mod _winapi {
3636
LCMAP_TRADITIONAL_CHINESE, LCMAP_UPPERCASE,
3737
},
3838
Storage::FileSystem::{
39-
COPYFILE2_CALLBACK_CHUNK_FINISHED, COPYFILE2_CALLBACK_CHUNK_STARTED,
40-
COPYFILE2_CALLBACK_ERROR, COPYFILE2_CALLBACK_POLL_CONTINUE,
41-
COPYFILE2_CALLBACK_STREAM_FINISHED, COPYFILE2_CALLBACK_STREAM_STARTED,
42-
COPYFILE2_PROGRESS_CANCEL, COPYFILE2_PROGRESS_CONTINUE, COPYFILE2_PROGRESS_PAUSE,
43-
COPYFILE2_PROGRESS_QUIET, COPYFILE2_PROGRESS_STOP, FILE_FLAG_FIRST_PIPE_INSTANCE,
44-
FILE_FLAG_OVERLAPPED, FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_TYPE_CHAR,
45-
FILE_TYPE_DISK, FILE_TYPE_PIPE, FILE_TYPE_REMOTE, FILE_TYPE_UNKNOWN, OPEN_EXISTING,
46-
PIPE_ACCESS_DUPLEX, PIPE_ACCESS_INBOUND, SYNCHRONIZE,
39+
COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_COPY_SYMLINK,
40+
COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_NO_BUFFERING, COPY_FILE_NO_OFFLOAD,
41+
COPY_FILE_OPEN_SOURCE_FOR_WRITE, COPY_FILE_REQUEST_COMPRESSED_TRAFFIC,
42+
COPY_FILE_REQUEST_SECURITY_PRIVILEGES, COPY_FILE_RESTARTABLE,
43+
COPY_FILE_RESUME_FROM_PAUSE, COPYFILE2_CALLBACK_CHUNK_FINISHED,
44+
COPYFILE2_CALLBACK_CHUNK_STARTED, COPYFILE2_CALLBACK_ERROR,
45+
COPYFILE2_CALLBACK_POLL_CONTINUE, COPYFILE2_CALLBACK_STREAM_FINISHED,
46+
COPYFILE2_CALLBACK_STREAM_STARTED, COPYFILE2_PROGRESS_CANCEL,
47+
COPYFILE2_PROGRESS_CONTINUE, COPYFILE2_PROGRESS_PAUSE, COPYFILE2_PROGRESS_QUIET,
48+
COPYFILE2_PROGRESS_STOP, FILE_FLAG_FIRST_PIPE_INSTANCE, FILE_FLAG_OVERLAPPED,
49+
FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_TYPE_CHAR, FILE_TYPE_DISK, FILE_TYPE_PIPE,
50+
FILE_TYPE_REMOTE, FILE_TYPE_UNKNOWN, OPEN_EXISTING, PIPE_ACCESS_DUPLEX,
51+
PIPE_ACCESS_INBOUND, SYNCHRONIZE,
4752
},
4853
System::{
4954
Console::{STD_ERROR_HANDLE, STD_INPUT_HANDLE, STD_OUTPUT_HANDLE},
@@ -65,13 +70,6 @@ mod _winapi {
6570
IDLE_PRIORITY_CLASS, INFINITE, NORMAL_PRIORITY_CLASS, PROCESS_DUP_HANDLE,
6671
REALTIME_PRIORITY_CLASS, STARTF_USESHOWWINDOW, STARTF_USESTDHANDLES,
6772
},
68-
WindowsProgramming::{
69-
COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_COPY_SYMLINK,
70-
COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_NO_BUFFERING, COPY_FILE_NO_OFFLOAD,
71-
COPY_FILE_OPEN_SOURCE_FOR_WRITE, COPY_FILE_REQUEST_COMPRESSED_TRAFFIC,
72-
COPY_FILE_REQUEST_SECURITY_PRIVILEGES, COPY_FILE_RESTARTABLE,
73-
COPY_FILE_RESUME_FROM_PAUSE,
74-
},
7573
},
7674
UI::WindowsAndMessaging::SW_HIDE,
7775
};
@@ -80,7 +78,7 @@ mod _winapi {
8078
const NULL: isize = 0;
8179

8280
#[pyfunction]
83-
fn CloseHandle(handle: HANDLE) -> WindowsSysResult<BOOL> {
81+
fn CloseHandle(handle: HANDLE) -> WindowsSysResult<i32> {
8482
WindowsSysResult(unsafe { windows_sys::Win32::Foundation::CloseHandle(handle.0 as _) })
8583
}
8684

@@ -128,7 +126,7 @@ mod _winapi {
128126
src: HANDLE,
129127
target_process: HANDLE,
130128
access: u32,
131-
inherit: BOOL,
129+
inherit: i32,
132130
options: OptionalArg<u32>,
133131
vm: &VirtualMachine,
134132
) -> PyResult<HANDLE> {
@@ -299,7 +297,7 @@ mod _winapi {
299297
unsafe {
300298
windows_sys::Win32::System::Threading::OpenProcess(
301299
desired_access,
302-
BOOL::from(inherit_handle),
300+
i32::from(inherit_handle),
303301
process_id,
304302
) as _
305303
}
@@ -473,7 +471,7 @@ mod _winapi {
473471
}
474472

475473
#[pyfunction]
476-
fn TerminateProcess(h: HANDLE, exit_code: u32) -> WindowsSysResult<BOOL> {
474+
fn TerminateProcess(h: HANDLE, exit_code: u32) -> WindowsSysResult<i32> {
477475
WindowsSysResult(unsafe {
478476
windows_sys::Win32::System::Threading::TerminateProcess(h.0 as _, exit_code)
479477
})
@@ -513,7 +511,7 @@ mod _winapi {
513511
let handle = unsafe {
514512
windows_sys::Win32::System::Threading::OpenMutexW(
515513
desired_access,
516-
BOOL::from(inherit_handle),
514+
i32::from(inherit_handle),
517515
windows_sys::core::PCWSTR::from(name as _),
518516
)
519517
};
@@ -524,7 +522,7 @@ mod _winapi {
524522
}
525523

526524
#[pyfunction]
527-
fn ReleaseMutex(handle: isize) -> WindowsSysResult<BOOL> {
525+
fn ReleaseMutex(handle: isize) -> WindowsSysResult<i32> {
528526
WindowsSysResult(unsafe {
529527
windows_sys::Win32::System::Threading::ReleaseMutex(handle as _)
530528
})

‎crates/vm/src/stdlib/winreg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ mod winreg {
11491149

11501150
#[pyfunction]
11511151
fn QueryReflectionKey(key: PyRef<PyHkey>, vm: &VirtualMachine) -> PyResult<bool> {
1152-
let mut result: windows_sys::Win32::Foundation::BOOL = 0;
1152+
let mut result: i32 = 0;
11531153
let res = unsafe { Registry::RegQueryReflectionKey(key.hkey.load(), &mut result) };
11541154
if res == 0 {
11551155
Ok(result != 0)

‎crates/vm/src/windows.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
};
1010
use std::ffi::OsStr;
1111
use windows::Win32::Foundation::HANDLE;
12-
use windows_sys::Win32::Foundation::{BOOL, HANDLE as RAW_HANDLE, INVALID_HANDLE_VALUE};
12+
use windows_sys::Win32::Foundation::{HANDLE as RAW_HANDLE, INVALID_HANDLE_VALUE};
1313

1414
pub(crate) trait WindowsSysResultValue {
1515
type Ok: ToPyObject;
@@ -27,7 +27,8 @@ impl WindowsSysResultValue for RAW_HANDLE {
2727
}
2828
}
2929

30-
impl WindowsSysResultValue for BOOL {
30+
// BOOL is i32 in windows-sys 0.61+
31+
impl WindowsSysResultValue for i32 {
3132
type Ok = ();
3233
fn is_err(&self) -> bool {
3334
*self == 0

0 commit comments

Comments
 (0)