Release 2.2.0.1000

dokan-dev · Aug 18, 2024 · 7945a1f · 7945a1f
1 parent 136d054
commit 7945a1f
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0.1000] - 2024-08-18
+
+### Changed
+- Installer - Migrate to WiX 5 and Add ARM64 MSI (bundled in the bootstrapper).
+- Library - Keep network drive isolated between users when browsing with UNC path (#1235).
+- FUSE - Add option `-b` to enable Dokan ipc batching option.
+
+### Fixed
+- Library - Fix missing return value on `DokanNetworkProviderUninstall` failure.
+- Memfs - Release instance resources on unmount.
+- Kernel - Prevent MountEntry node access when concurrently removed.
+
 ## [2.1.0.1000] - 2023-12-22
 
 ### Added
@@ -709,6 +721,7 @@ Latest Dokan version from Hiroki Asakawa.
  [http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/)
 
 
+[2.2.0.1000]: https://github.com/dokan-dev/dokany/compare/v2.1.0.1000...v2.2.0.1000
 [2.1.0.1000]: https://github.com/dokan-dev/dokany/compare/v2.0.6.1000...v2.1.0.1000
 [2.0.6.1000]: https://github.com/dokan-dev/dokany/compare/v2.0.5.1000...v2.0.6.1000
 [2.0.5.1000]: https://github.com/dokan-dev/dokany/compare/v2.0.4.1000...v2.0.5.1000

diff --git a/Dokan.props b/Dokan.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <DOKANAPIVersion>2</DOKANAPIVersion>
-    <DOKANVersion>2.1.0</DOKANVersion>
+    <DOKANVersion>2.2.0</DOKANVersion>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

diff --git a/dokan/dokan.h b/dokan/dokan.h
@@ -56,7 +56,7 @@ extern "C" {
 /** @{ */
 
 /** The current Dokan version (200 means ver 2.0.0). \ref DOKAN_OPTIONS.Version */
-#define DOKAN_VERSION 210
+#define DOKAN_VERSION 220
 /** Minimum Dokan version (ver 2.0.0) accepted. */
 #define DOKAN_MINIMUM_COMPATIBLE_VERSION 200
 /** Driver file name including the DOKAN_MAJOR_API_VERSION */

diff --git a/dokan/dokan.rc b/dokan/dokan.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,1000
- PRODUCTVERSION 2,1,0,1000
+ FILEVERSION 2,2,0,1000
+ PRODUCTVERSION 2,2,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Library"
-            VALUE "FileVersion", "2.1.0.1000"
+            VALUE "FileVersion", "2.2.0.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "dokan.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.1.0.1000"
+            VALUE "ProductVersion", "2.2.0.1000"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/dokan_fuse/src/dokanfuse.rc b/dokan_fuse/src/dokanfuse.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,1000
- PRODUCTVERSION 2,1,0,1000
+ FILEVERSION 2,2,0,1000
+ PRODUCTVERSION 2,2,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Fuse library"
-            VALUE "FileVersion", "2.1.0.1000"
+            VALUE "FileVersion", "2.2.0.1000"
             VALUE "InternalName", "dokanfuse.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokanfuse.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.1.0.1000"
+            VALUE "ProductVersion", "2.2.0.1000"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/dokan_np/dokan_np.rc b/dokan_np/dokan_np.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,1000
- PRODUCTVERSION 2,1,0,1000
+ FILEVERSION 2,2,0,1000
+ PRODUCTVERSION 2,2,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Network Provider"
-            VALUE "FileVersion", "2.1.0.1000"
+            VALUE "FileVersion", "2.2.0.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokannp.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.1.0.1000"
+            VALUE "ProductVersion", "2.2.0.1000"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/dokan_wix/version.xml b/dokan_wix/version.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 <?define ProductName="Dokan Library" ?>
-<?define ProductCodeX64="{9A7325EA-D3C9-0201-0000-231222144112}" ?>
+<?define ProductCodeX64="{9A7325EA-D3C9-0202-0000-240818095850}" ?>
 <?define UpgradeCodeX64="{31A8F445-2AC6-494B-819C-4F4E1B2AECF1}" ?>
-<?define ProductCodeX86="{D1680D5B-295F-0201-0000-231222144112}" ?>
+<?define ProductCodeX86="{D1680D5B-295F-0202-0000-240818095850}" ?>
 <?define UpgradeCodeX86="{B08DE90A-F064-4ADC-99AC-2EC933417CC5}" ?>
-<?define ProductCodeARM64="{24671A98-9A6B-4000-9CFC-D79A85F3EDD9}" ?>
+<?define ProductCodeARM64="{24671A98-9A6B-0202-0000-240818095850}" ?>
 <?define UpgradeCodeARM64="{BD055051-AFAD-497D-8297-C4389835870A}" ?>
 <?define ProviderKey="{6DE61B71-BBFA-4007-8660-BD13A0DF9004}" ?>
 <?define BundleUpgradeCode="{F9DD32AC-C2BA-4B2C-841F-B34ABED0A0F1}" ?>
-<?define BaseVersion="2.1.0" ?>
+<?define BaseVersion="2.2.0" ?>
 <?define MajorVersion="2" ?>
 <?define BuildVersion="1000" ?>
 <?define CompanyName="Dokany Project" ?>

diff --git a/sys/dokan.rc b/sys/dokan.rc
@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,1000
- PRODUCTVERSION 2,1,0,1000
+ FILEVERSION 2,2,0,1000
+ PRODUCTVERSION 2,2,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Driver"
-            VALUE "FileVersion", "2.1.0.1000"
+            VALUE "FileVersion", "2.2.0.1000"
             VALUE "InternalName", "dokan.sys"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokan.sys"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "2.1.0.1000"
+            VALUE "ProductVersion", "2.2.0.1000"
         END
     END
     BLOCK "VarFileInfo"