Upgrade to Dokan 2.2.0 and bump dependencies

Author: denisovpi

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = ["dokan-sys", "dokan"]
+resolver = "2"
 
 [profile.release]
 lto = true

Cargo.toml

@@ -60,12 +60,12 @@ init:
 
 install:
   - ps: &download-dokany |
-      Invoke-WebRequest https://github.com/dokan-dev/dokany/releases/download/v2.0.6.1000/DokanSetup.exe -OutFile "$Env:TEMP\DokanSetup.exe"
+      Invoke-WebRequest https://github.com/dokan-dev/dokany/releases/download/v2.2.0.1000/DokanSetup.exe -OutFile "$Env:TEMP\DokanSetup.exe"
       Start-Process "$Env:TEMP\DokanSetup.exe" -ArgumentList '/quiet /norestart' -Wait
 
       if ($Env:USE_INSTALLED_LIB -eq $true) {
-          $Env:DokanLibrary2_LibraryPath_x64 = 'C:\Program Files\Dokan\Dokan Library-2.0.6\lib\'
-          $Env:DokanLibrary2_LibraryPath_x86 = 'C:\Program Files\Dokan\Dokan Library-2.0.6\x86\lib\'
+          $Env:DokanLibrary2_LibraryPath_x64 = 'C:\Program Files\Dokan\Dokan Library-2.2.0\lib\'
+          $Env:DokanLibrary2_LibraryPath_x86 = 'C:\Program Files\Dokan\Dokan Library-2.2.0\x86\lib\'
       } else {
           Remove-Item 'C:\Windows\System32\dokan2.dll'
           Remove-Item 'C:\Windows\SysWOW64\dokan2.dll'

appveyor.yml

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade to **Dokan 2.2.0**.
+- Bump dependencies.
+
 ## [0.3.1] - 2022-10-04
 
 ### Added

dokan-sys/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "dokan-sys"
-version = "0.3.1+dokan206"
+version = "0.3.1+dokan220"
 authors = ["DDoSolitary <[email protected]>"]
 description = "Raw FFI bindings for Dokan (user mode file system library for Windows)"
 homepage = "https://dokan-dev.github.io"
@@ -18,11 +18,11 @@ build = "build.rs"
 appveyor = { repository = "Liryna/dokan-rust" }
 
 [dependencies]
-libc = "0.2.82"
-winapi = { version = "0.3.9", features = ["std", "basetsd", "fileapi", "minwinbase", "minwindef", "ntdef", "winnt"] }
+libc = "0.2"
+winapi = { version = "0.3", features = ["std", "basetsd", "fileapi", "minwinbase", "minwindef", "ntdef", "winnt"] }
 
 [build-dependencies]
-cc = "1.0.66"
+cc = "1.1"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

dokan-sys/Cargo.toml

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade to **Dokan 2.2.0** through `dokan-sys`.
+- Bump dependencies.
+
 ## [0.3.1] - 2022-10-04
 
 ### Added

dokan-sys/src/dokany

@@ -1,6 +1,6 @@
 [package]
 name = "dokan"
-version = "0.3.1+dokan206"
+version = "0.3.1+dokan220"
 authors = ["DDoSolitary <[email protected]>"]
 description = "Rust-friendly wrapper for Dokan (user mode file system library for Windows)"
 homepage = "https://dokan-dev.github.io"
@@ -16,17 +16,17 @@ edition = "2021"
 appveyor = { repository = "Liryna/dokan-rust" }
 
 [dependencies]
-bitflags = "1.2.1"
-dokan-sys = { version = "0.3.1", path = "../dokan-sys" }
-widestring = "0.4.3"
-winapi = { version = "0.3.9", features = ["std", "errhandlingapi", "handleapi", "heapapi", "ioapiset", "minwinbase", "minwindef", "ntdef", "ntstatus", "processthreadsapi", "sddl", "securitybaseapi", "synchapi", "winbase", "winerror", "winnt"] }
+bitflags = "2.6"
+dokan-sys = { path = "../dokan-sys" }
+widestring = "1.1"
+winapi = { version = "0.3", features = ["std", "errhandlingapi", "handleapi", "heapapi", "ioapiset", "minwinbase", "minwindef", "ntdef", "ntstatus", "processenv", "processthreadsapi", "sddl", "securitybaseapi", "synchapi", "winbase", "winerror", "winnt"] }
 
 [dev-dependencies]
-clap = "2.33.3"
-ctrlc = "3.2.3"
-lazy_static = "1.4.0"
-parking_lot = "0.11.1"
-regex = "1.4.3"
+clap = "4.5"
+ctrlc = "3.4"
+lazy_static = "1.5"
+parking_lot = "0.12"
+regex = "1.11"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

dokan/CHANGELOG.md

@@ -13,7 +13,7 @@ use std::{
 	time::SystemTime,
 };
 
-use clap::{App, Arg};
+use clap::{Arg, ArgAction, Command};
 use dokan::{
 	init, shutdown, unmount, CreateFileInfo, DiskSpaceInfo, FileInfo, FileSystemHandler,
 	FileSystemMounter, FileTimeOperation, FillDataError, FillDataResult, FindData, FindStreamData,
@@ -1280,49 +1280,52 @@ impl<'c, 'h: 'c> FileSystemHandler<'c, 'h> for MemFsHandler {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-	let matches = App::new("dokan-rust memfs example")
+	let matches = Command::new("dokan-rust memfs example")
 		.author(env!("CARGO_PKG_AUTHORS"))
 		.arg(
-			Arg::with_name("mount_point")
-				.short("m")
+			Arg::new("mount_point")
+				.short('m')
 				.long("mount-point")
-				.takes_value(true)
+                .num_args(1)
 				.value_name("MOUNT_POINT")
 				.required(true)
 				.help("Mount point path."),
 		)
 		.arg(
-			Arg::with_name("single_thread")
-				.short("t")
+			Arg::new("single_thread")
+				.short('t')
 				.long("single-thread")
-				.help("Force a single thread. Otherwise Dokan will allocate the number of threads regarding the workload."),
+				.help("Force a single thread. Otherwise Dokan will allocate the number of threads regarding the workload.")
+				.action(ArgAction::SetTrue),
 		)
 		.arg(
-			Arg::with_name("dokan_debug")
-				.short("d")
+			Arg::new("dokan_debug")
+				.short('d')
 				.long("dokan-debug")
-				.help("Enable Dokan's debug output."),
+				.help("Enable Dokan's debug output.")
+				.action(ArgAction::SetTrue),
 		)
 		.arg(
-			Arg::with_name("removable")
-				.short("r")
+			Arg::new("removable")
+				.short('r')
 				.long("removable")
-				.help("Mount as a removable drive."),
+				.help("Mount as a removable drive.")
+				.action(ArgAction::SetTrue),
 		)
 		.get_matches();
 
-	let mount_point = U16CString::from_str(matches.value_of("mount_point").unwrap())?;
+	let mount_point = U16CString::from_str(matches.get_one::<String>("mount_point").unwrap())?;
 
 	let mut flags = MountFlags::ALT_STREAM;
-	if matches.is_present("dokan_debug") {
+	if matches.get_flag("dokan_debug") {
 		flags |= MountFlags::DEBUG | MountFlags::STDERR;
 	}
-	if matches.is_present("removable") {
+	if matches.get_flag("removable") {
 		flags |= MountFlags::REMOVABLE;
 	}
 
 	let options = MountOptions {
-		single_thread: matches.is_present("single_thread"),
+		single_thread: matches.get_flag("single_thread"),
 		flags,
 		..Default::default()
 	};

dokan/Cargo.toml

@@ -47,20 +47,20 @@ impl<'a> From<&'a DOKAN_MOUNT_POINT_INFO> for MountPointInfo<'a> {
 		let mount_point = if info.MountPoint[0] == 0 {
 			None
 		} else {
-			Some(U16CStr::from_slice_with_nul(&info.MountPoint).unwrap())
+			Some(U16CStr::from_slice_truncate(&info.MountPoint).unwrap())
 		};
 
 		let unc_name = if info.UNCName[0] == 0 {
 			None
 		} else {
-			Some(U16CStr::from_slice_with_nul(&info.UNCName).unwrap())
+			Some(U16CStr::from_slice_truncate(&info.UNCName).unwrap())
 		};
 
 		MountPointInfo {
 			device_type: info.Type.into(),
 			mount_point,
 			unc_name,
-			device_name: U16CStr::from_slice_with_nul(&info.DeviceName).unwrap(),
+			device_name: U16CStr::from_slice_truncate(&info.DeviceName).unwrap(),
 			session_id: info.SessionId,
 		}
 	}