From e1cc1cfadaa63b21c6af42dfb44a5471287f6fb9 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Sun, 15 Aug 2021 20:16:59 -0700
Subject: [PATCH] Update to DokanY 1.3.0.1000

---
 .github/workflows/actions/setup_windows/action.yaml | 2 +-
 .github/workflows/main.yaml                         | 2 +-
 CMakeSettings.json                                  | 8 ++++----
 ChangeLog.txt                                       | 4 ++++
 README.md                                           | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions/setup_windows/action.yaml b/.github/workflows/actions/setup_windows/action.yaml
index 5314a8e0..01d8646f 100644
--- a/.github/workflows/actions/setup_windows/action.yaml
+++ b/.github/workflows/actions/setup_windows/action.yaml
@@ -7,4 +7,4 @@ runs:
       shell: bash
       run: |
         choco install -y ninja
-        choco install -y dokany --version 1.2.2.1001 --installargs INSTALLDEVFILES=1
+        choco install -y dokany --version 1.3.0.1000 --installargs INSTALLDEVFILES=1
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c842f1a4..e33d61d2 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -533,7 +533,7 @@ jobs:
           # TODO CMAKE_SYSTEM_VERSION is probably not needed anymore
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_TESTING=on -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.2.2" -A ${{matrix.arch}} -DCMAKE_SYSTEM_VERSION="10.0.18362.0"
+          cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_TESTING=on -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.3.0" -A ${{matrix.arch}} -DCMAKE_SYSTEM_VERSION="10.0.18362.0"
           cmake --build . --config ${{matrix.build_type}}
       # - name: Show ccache statistics
       #   shell: bash
diff --git a/CMakeSettings.json b/CMakeSettings.json
index e7ec23db..496bee4d 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x86" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.2.2\"",
+      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": ""
     },
@@ -18,7 +18,7 @@
       "inheritEnvironments": [ "msvc_x86" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.2.2\"",
+      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": ""
     },
@@ -29,7 +29,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.2.2\"",
+      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": ""
     },
@@ -40,7 +40,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.2.2\"",
+      "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": ""
     }
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2d2daa69..e76e5b13 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+Version 0.12.0 (unreleased)
+---------------
+* Updated to DokanY 1.3.0.1000
+
 Version 0.11.1 (unreleased)
 ---------------
 Bugfix:
diff --git a/README.md b/README.md
index 85f11c45..f1013bcc 100644
--- a/README.md
+++ b/README.md
@@ -137,11 +137,11 @@ Building on Windows (experimental)
 ----------------------------------
 
 1. Install conan. If you want to use "pip install conan", you may have to install Python first.
-2. Install DokanY 1.2.2. Other versions may not work.
+2. Install DokanY 1.3.0.1000. Other versions may not work.
 3. Run CMake to generate Visual Studio 2019 project files (this may not be necessary, but it makes sure everything works as expected and you can see potential errors happening during this step)
 
 $ mkdir build && cd build
-$ cmake .. -G "Visual Studio 16 2019" -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.2.2"]
+$ cmake .. -G "Visual Studio 16 2019" -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.3.0"]
 
 4. Potentially modify CMakeSettings.json file to fit your needs
 5. Open the cryfs source folder with Visual Studio 2019, or alternatively build on command line using