Bump windows crate to 0.56.0

Byron · May 1, 2024 · c0e0f7a · c0e0f7a
1 parent 35b549f
commit c0e0f7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,7 @@ once_cell = "1.18.0"
 once_cell = "1.7.2"
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.44.0", features = [
+windows = { version = "0.56.0", features = [
     "Win32_Foundation",
     "Win32_Storage_EnhancedStorage",
     "Win32_System_Com_StructuredStorage",

diff --git a/src/windows.rs b/src/windows.rs
@@ -5,32 +5,18 @@ use std::{
     os::windows::{ffi::OsStrExt, prelude::*},
     path::PathBuf,
 };
-use windows::core::{Interface, GUID, PCWSTR, PWSTR};
 use windows::Win32::{
     Foundation::*, Storage::EnhancedStorage::*, System::Com::*, System::SystemServices::*,
     UI::Shell::PropertiesSystem::*, UI::Shell::*,
 };
+use windows::{
+    core::{Interface, PCWSTR, PWSTR},
+    Win32::System::Com::StructuredStorage::PropVariantToBSTR,
+};
 
-///////////////////////////////////////////////////////////////////////////
-// These don't have bindings in windows-rs for some reason
-///////////////////////////////////////////////////////////////////////////
-const PSGUID_DISPLACED: GUID =
-    GUID::from_values(0x9b174b33, 0x40ff, 0x11d2, [0xa2, 0x7e, 0x00, 0xc0, 0x4f, 0xc3, 0x8, 0x71]);
-const PID_DISPLACED_FROM: u32 = 2;
-const PID_DISPLACED_DATE: u32 = 3;
 const SCID_ORIGINAL_LOCATION: PROPERTYKEY = PROPERTYKEY { fmtid: PSGUID_DISPLACED, pid: PID_DISPLACED_FROM };
 const SCID_DATE_DELETED: PROPERTYKEY = PROPERTYKEY { fmtid: PSGUID_DISPLACED, pid: PID_DISPLACED_DATE };
 
-const FOF_SILENT: u32 = 0x0004;
-const FOF_NOCONFIRMATION: u32 = 0x0010;
-const FOF_ALLOWUNDO: u32 = 0x0040;
-const FOF_NOCONFIRMMKDIR: u32 = 0x0200;
-const FOF_NOERRORUI: u32 = 0x0400;
-const FOF_WANTNUKEWARNING: u32 = 0x4000;
-const FOF_NO_UI: u32 = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR;
-const FOFX_EARLYFAILURE: u32 = 0x00100000;
-///////////////////////////////////////////////////////////////////////////
-
 impl From<windows::core::Error> for Error {
     fn from(err: windows::core::Error) -> Error {
         Error::Os { code: err.code().0, description: format!("windows error: {err}") }