From efc6d8e3fa67e9dfae845b7695921c5efd45436d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:10:33 +0000 Subject: [PATCH] Update windows requirement from 0.52.0 to 0.53.0 Updates the requirements on [windows](https://github.com/microsoft/windows-rs) to permit the latest version. - [Release notes](https://github.com/microsoft/windows-rs/releases) - [Commits](https://github.com/microsoft/windows-rs/compare/0.52.0...0.53.0) --- updated-dependencies: - dependency-name: windows dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- ffi/CMakeLists.txt | 2 +- src/enums.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index beeed61..be69ce6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ keyvalues-parser = "0.2.0" [target.'cfg(windows)'.dependencies] dirs = "5.0" -windows = { version = "0.52.0", features = ["Foundation_Collections", "System_UserProfile"] } +windows = { version = "0.53.0", features = ["Foundation_Collections", "System_UserProfile"] } [dev-dependencies] criterion = "0.5.1" diff --git a/ffi/CMakeLists.txt b/ffi/CMakeLists.txt index 9254338..807d43c 100644 --- a/ffi/CMakeLists.txt +++ b/ffi/CMakeLists.txt @@ -9,7 +9,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif () if (MSVC) - set (SYSTEM_LIBS ntdll ws2_32 Userenv bcrypt) + set (SYSTEM_LIBS ntdll windowsapp Userenv Propsys) endif () set (LIBLOADORDER_FFI_LIBRARY "${CMAKE_SOURCE_DIR}/../target/debug/${CMAKE_STATIC_LIBRARY_PREFIX}loadorder_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}") diff --git a/src/enums.rs b/src/enums.rs index a7d2356..c349bbe 100644 --- a/src/enums.rs +++ b/src/enums.rs @@ -189,7 +189,7 @@ impl From for Error { #[cfg(windows)] impl From for Error { fn from(error: windows::core::Error) -> Self { - Error::SystemError(error.code().0, error.message().to_os_string()) + Error::SystemError(error.code().0, error.message().into()) } }