Merge pull request #13 from tekai-crabnebula/fix/windows-forward-slas…

…h-handling

fix: Handle forward slash path in Windows

crates/drag/Cargo.toml

@@ -25,6 +25,9 @@ objc = "0.2"
 gtk = "0.15"
 gdkx11 = "0.15"
 
+[target."cfg(target_os = \"windows\")".dependencies]
+dunce = "1"
+
 [target."cfg(target_os = \"windows\")".dependencies.windows]
 version = "0.51"
 features = [

crates/drag/src/lib.rs

@@ -23,7 +23,7 @@
 //!   let window = tao::window::WindowBuilder::new().build(&event_loop).unwrap();
 //!
 //!   let item = drag::DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]);
-//!   let preview_icon = drag::Image::File("../../icon.png".into());
+//!   let preview_icon = drag::Image::File("./examples/icon.png".into());
 //!
 //!   drag::start_drag(
 //!     #[cfg(target_os = "linux")]
@@ -45,7 +45,7 @@
 //!   let webview = wry::webview::WebViewBuilder::new(window).unwrap().build().unwrap();
 //!
 //!   let item = drag::DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]);
-//!   let preview_icon = drag::Image::File("../../icon.png".into());
+//!   let preview_icon = drag::Image::File("./examples/icon.png".into());
 //!
 //!   drag::start_drag(
 //!     #[cfg(target_os = "linux")]
@@ -66,7 +66,7 @@
 //!   let window = winit::window::WindowBuilder::new().build(&event_loop).unwrap();
 //!
 //!   let item = drag::DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]);
-//!   let preview_icon = drag::Image::File("../../icon.png".into());
+//!   let preview_icon = drag::Image::File("./examples/icon.png".into());
 //!
 //!   # #[cfg(not(target_os = "linux"))]
 //!   let _ = drag::start_drag(&window, item, preview_icon);
@@ -89,6 +89,8 @@ pub enum Error {
     #[cfg(windows)]
     #[error("{0}")]
     WindowsError(#[from] windows::core::Error),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
     #[error("unsupported window handle")]
     UnsupportedWindowHandle,
     #[error("failed to start drag")]

crates/drag/src/platform_impl/windows/image.rs

@@ -4,6 +4,8 @@
 
 use std::os::windows::ffi::OsStrExt;
 use std::{ffi::c_void, iter::once, path::Path};
+use windows::core::PCWSTR;
+use windows::Win32::Foundation::*;
 use windows::Win32::{
     Graphics::{
         Gdi::{CreateBitmap, HBITMAP},
@@ -14,9 +16,8 @@ use windows::Win32::{
     },
     System::Com::{CoCreateInstance, CLSCTX_INPROC_SERVER},
 };
-use windows::{core::*, Win32::Foundation::*};
 
-use super::utils::adjust_canonicalization;
+use crate::Result;
 
 pub(crate) fn read_bytes_to_hbitmap(bytes: &[u8]) -> Result<HBITMAP> {
     unsafe {
@@ -41,7 +42,7 @@ pub(crate) fn read_path_to_hbitmap(path: &Path) -> Result<HBITMAP> {
         let factory: IWICImagingFactory =
             CoCreateInstance(&CLSID_WICImagingFactory, None, CLSCTX_INPROC_SERVER)?;
 
-        let path = adjust_canonicalization(path);
+        let path = dunce::canonicalize(path)?;
         let wide_path: Vec<u16> = path.as_os_str().encode_wide().chain(once(0)).collect();
 
         let decoder = factory.CreateDecoderFromFilename(

crates/drag/src/platform_impl/windows/mod.rs

@@ -32,7 +32,6 @@ use windows::{
 };
 
 mod image;
-mod utils;
 
 static mut OLE_RESULT: Result<()> = Ok(());
 static OLE_UNINITIALIZE: Once = Once::new();
@@ -199,7 +198,13 @@ pub fn start_drag<W: HasRawWindowHandle>(
                         return Err(e.clone().into());
                     }
                 }
-                let data_object: IDataObject = get_file_data_object(&files).unwrap();
+
+                let mut paths = Vec::new();
+                for f in files {
+                    paths.push(dunce::canonicalize(f)?);
+                }
+
+                let data_object: IDataObject = get_file_data_object(&paths).unwrap();
                 let drop_source: IDropSource = DropSource::new().into();
 
                 unsafe {
@@ -276,7 +281,7 @@ fn get_hglobal(size: usize, buffer: Vec<u16>) -> Result<HGLOBAL> {
     Ok(handle)
 }
 
-pub fn create_instance<T: Interface + ComInterface>(clsid: &GUID) -> windows::core::Result<T> {
+pub fn create_instance<T: Interface + ComInterface>(clsid: &GUID) -> Result<T> {
     unsafe { CoCreateInstance(clsid, None, CLSCTX_ALL) }
 }
 
@@ -299,7 +304,6 @@ fn get_shell_item_array(paths: &[PathBuf]) -> Option<IShellItemArray> {
 
 fn get_file_item_id(path: &Path) -> *mut Common::ITEMIDLIST {
     unsafe {
-        let path = utils::adjust_canonicalization(path);
         let wide_path: Vec<u16> = path.as_os_str().encode_wide().chain(once(0)).collect();
         windows::Win32::UI::Shell::ILCreateFromPathW(PCWSTR::from_raw(wide_path.as_ptr()))
     }

examples/tao/src/main.rs

@@ -51,7 +51,7 @@ fn main() {
                     &window,
                     DragItem::Files(vec![std::fs::canonicalize("./examples/icon.png").unwrap()]),
                     Image::Raw(include_bytes!("../../icon.png").to_vec()),
-                    // Image::File("../../icon.png".into()),
+                    // Image::File("./examples/icon.png".into()),
                 )
                 .unwrap();
             }

examples/winit/src/main.rs

@@ -45,7 +45,7 @@ fn main() {
                             vec![std::fs::canonicalize("./examples/icon.png").unwrap()],
                         ),
                         Image::Raw(include_bytes!("../../icon.png").to_vec()),
-                        // Image::File("../../icon.png".into()),
+                        // Image::File("./examples/icon.png".into()),
                     )
                     .unwrap();
                 }

examples/wry/src/main.rs

@@ -96,7 +96,7 @@ fn main() -> wry::Result<()> {
                             std::fs::canonicalize("./examples/icon.bmp").unwrap(),
                         ]),
                         Image::Raw(include_bytes!("../../icon.png").to_vec()),
-                        // Image::File("../../icon.png".into()),
+                        // Image::File("./examples/icon.png".into()),
                     )
                     .unwrap();
                 }