From fde9d195eac6d3ea6b37e72851ad31fba758cb00 Mon Sep 17 00:00:00 2001 From: Liryna Date: Thu, 30 Dec 2021 09:57:31 -0500 Subject: [PATCH] Installer - Moving to version 2.0.0 --- CHANGELOG.md | 3 +++ Dokan.props | 4 ++-- appveyor.yml | 10 +++++----- dokan/dokan.def | 2 +- dokan/dokan.h | 6 +++--- dokan/dokan.rc | 8 ++++---- dokan_fuse/CMakeLists.txt | 6 +++--- dokan_fuse/src/dokanfuse.rc | 8 ++++---- dokan_np/dokan_np.rc | 8 ++++---- dokan_wix/version.xml | 8 ++++---- samples/memfs_test.ps1 | 2 +- sys/dokan.inf | 6 +++--- sys/dokan.rc | 8 ++++---- sys/public.h | 2 +- sys/util/log.h | 2 +- 15 files changed, 43 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c17f17b4..8eb50b7ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ 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.0.0.1000] - 2021-12-30 + ## [1.5.1.1000] - 2021-11-26 ### Added - Mirror - Add an option to personalize the volume name. @@ -549,6 +551,7 @@ Latest Dokan version from Hiroki Asakawa. [http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/) +[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.5.1.1000...master [1.5.1.1000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.3000...v1.5.1.1000 [1.5.0.3000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.2000...v1.5.0.3000 [1.5.0.2000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.1000...v1.5.0.2000 diff --git a/Dokan.props b/Dokan.props index 147a416ff..7916df553 100644 --- a/Dokan.props +++ b/Dokan.props @@ -2,8 +2,8 @@ - 1 - 1.5.1 + 2 + 2.0.0 diff --git a/appveyor.yml b/appveyor.yml index 76dfe0a1b..65bb66ef9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ WLK_INST_CACHE: '%DOKAN_CI_CACHE%\wlk_inst' DOKAN_MAIN_BUILD_JOB_NAME: "Image: Visual Studio 2019; Configuration: All" - version: 1.5.1-{build} + version: 2.0.0-{build} configuration: - All - SonarQube @@ -65,7 +65,7 @@ } - ps: | if ($env:CONFIGURATION -eq "FsTest") { - & verifier /standard /driver dokan1.sys + & verifier /standard /driver dokan2.sys Write-Host "Before reboot" Start-Sleep -s 30 # Wait appveyor to be ready https://github.com/appveyor/ci/issues/3650 Restart-Computer @@ -303,9 +303,9 @@ - ps: | if ($env:CONFIGURATION -eq "FsTest") { Write-Host Running tests... - $env:DokanLibrary1 = [System.Environment]::GetEnvironmentVariable("DokanLibrary1", "Machine") - $memfs = @("${env:DokanLibrary1}\sample\memfs\memfs.exe", "${env:DokanLibrary1}\x86\sample\memfs\memfs.exe") - $mirrors = @("${env:DokanLibrary1}\sample\mirror\mirror.exe", "${env:DokanLibrary1}\x86\sample\mirror\mirror.exe") + $env:DokanLibrary2 = [System.Environment]::GetEnvironmentVariable("DokanLibrary2", "Machine") + $memfs = @("${env:DokanLibrary2}\sample\memfs\memfs.exe", "${env:DokanLibrary2}\x86\sample\memfs\memfs.exe") + $mirrors = @("${env:DokanLibrary2}\sample\mirror\mirror.exe", "${env:DokanLibrary2}\x86\sample\mirror\mirror.exe") cd .\samples .\memfs_test.ps1 -Memfs $memfs diff --git a/dokan/dokan.def b/dokan/dokan.def index 207caa56b..a2badada2 100644 --- a/dokan/dokan.def +++ b/dokan/dokan.def @@ -1,5 +1,5 @@ -LIBRARY dokan1 +LIBRARY dokan2 EXPORTS diff --git a/dokan/dokan.h b/dokan/dokan.h index 350d57d8d..119f6b0e0 100644 --- a/dokan/dokan.h +++ b/dokan/dokan.h @@ -55,10 +55,10 @@ extern "C" { */ /** @{ */ -/** The current Dokan version (140 means ver 1.4.0). \ref DOKAN_OPTIONS.Version */ -#define DOKAN_VERSION 160 +/** The current Dokan version (200 means ver 2.0.0). \ref DOKAN_OPTIONS.Version */ +#define DOKAN_VERSION 200 /** Minimum Dokan version (ver 2.0.0) accepted. */ -#define DOKAN_MINIMUM_COMPATIBLE_VERSION 110 +#define DOKAN_MINIMUM_COMPATIBLE_VERSION 200 /** Driver file name including the DOKAN_MAJOR_API_VERSION */ #define DOKAN_DRIVER_NAME L"dokan" DOKAN_MAJOR_API_VERSION L".sys" /** Network provider name including the DOKAN_MAJOR_API_VERSION */ diff --git a/dokan/dokan.rc b/dokan/dokan.rc index 852ef616c..e636462a9 100644 --- a/dokan/dokan.rc +++ b/dokan/dokan.rc @@ -16,8 +16,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,1,1000 - PRODUCTVERSION 1,5,1,1000 + FILEVERSION 2,0,0,1000 + PRODUCTVERSION 2,0,0,1000 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -34,12 +34,12 @@ BEGIN BEGIN VALUE "CompanyName", "Dokan Project" VALUE "FileDescription", "Dokan Library" - VALUE "FileVersion", "1.5.1.1000" + VALUE "FileVersion", "2.0.0.1000" VALUE "InternalName", "dokan.dll" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "dokan.dll" VALUE "ProductName", "Dokan" - VALUE "ProductVersion", "1.5.1.1000" + VALUE "ProductVersion", "2.0.0.1000" END END BLOCK "VarFileInfo" diff --git a/dokan_fuse/CMakeLists.txt b/dokan_fuse/CMakeLists.txt index b67c9446a..740f62acb 100644 --- a/dokan_fuse/CMakeLists.txt +++ b/dokan_fuse/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.5) -project(dokanfuse1) +project(dokanfuse2) include(GNUInstallDirs) if(NOT CMAKE_BUILD_TYPE) @@ -55,14 +55,14 @@ set(install_headers set(compat_headers include/old/fuse.h ) -add_library(dokanfuse1 SHARED ${sources}) +add_library(dokanfuse2 SHARED ${sources}) INSTALL(FILES ${install_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fuse/) INSTALL(FILES ${compat_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) if(FUSE_PKG_CONFIG) INSTALL(FILES ${pkg_config_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() -INSTALL(TARGETS dokanfuse1 +INSTALL(TARGETS dokanfuse2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/dokan_fuse/src/dokanfuse.rc b/dokan_fuse/src/dokanfuse.rc index bfef29c80..8b3be05d3 100644 --- a/dokan_fuse/src/dokanfuse.rc +++ b/dokan_fuse/src/dokanfuse.rc @@ -16,8 +16,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,1,1000 - PRODUCTVERSION 1,5,1,1000 + FILEVERSION 2,0,0,1000 + PRODUCTVERSION 2,0,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", "1.5.1.1000" + VALUE "FileVersion", "2.0.0.1000" VALUE "InternalName", "dokanfuse.dll" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "dokanfuse.dll" VALUE "ProductName", "Dokan" - VALUE "ProductVersion", "1.5.1.1000" + VALUE "ProductVersion", "2.0.0.1000" END END BLOCK "VarFileInfo" diff --git a/dokan_np/dokan_np.rc b/dokan_np/dokan_np.rc index e15a01552..e3e5dbf3a 100644 --- a/dokan_np/dokan_np.rc +++ b/dokan_np/dokan_np.rc @@ -16,8 +16,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,1,1000 - PRODUCTVERSION 1,5,1,1000 + FILEVERSION 2,0,0,1000 + PRODUCTVERSION 2,0,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", "1.5.1.1000" + VALUE "FileVersion", "2.0.0.1000" VALUE "InternalName", "dokan.dll" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "dokannp.dll" VALUE "ProductName", "Dokan" - VALUE "ProductVersion", "1.5.1.1000" + VALUE "ProductVersion", "2.0.0.1000" END END BLOCK "VarFileInfo" diff --git a/dokan_wix/version.xml b/dokan_wix/version.xml index 683d13131..ca1841e24 100644 --- a/dokan_wix/version.xml +++ b/dokan_wix/version.xml @@ -1,14 +1,14 @@ - + - + - - + + diff --git a/samples/memfs_test.ps1 b/samples/memfs_test.ps1 index e6069638d..133771b01 100644 --- a/samples/memfs_test.ps1 +++ b/samples/memfs_test.ps1 @@ -69,7 +69,7 @@ $ifstestParameters = @( "-g", "EaInformation", "-g", "FileSystemControlGeneral", # reason: Retrieval Pointers fsctl not supported "/v", # verbose output - "/d", "\Device\Dokan_1", # Dokan device named need for FileSystemDeviceOpenTest + "/d", "\Device\Dokan_2", # Dokan device named need for FileSystemDeviceOpenTest "/r", "$fsTestPath2", # SimpleRenameInformationTest need an extra volum "/u", $ifstest_user, "/U", $ifstest_pass diff --git a/sys/dokan.inf b/sys/dokan.inf index 922d3151f..af45f5cb1 100644 --- a/sys/dokan.inf +++ b/sys/dokan.inf @@ -28,7 +28,7 @@ DelService = %ServiceName%,0x200 1 = %Disk1% [SourceDisksFiles] -dokan1.sys = 1 +dokan2.sys = 1 [DokanFileSystem.DriverFiles] %DriverName%.sys @@ -51,7 +51,7 @@ HKR,,TypesSupported,0x00010001,7 [Strings] Dokan = "Dokan" -DriverName = "dokan1" +DriverName = "dokan2" Disk1 = "Dokan installation media" ServiceDesc = "Dokan kernel-mode file system driver." -ServiceName = "dokan1" +ServiceName = "dokan2" diff --git a/sys/dokan.rc b/sys/dokan.rc index d2c9eda52..a5bf990ab 100644 --- a/sys/dokan.rc +++ b/sys/dokan.rc @@ -16,8 +16,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,1,1000 - PRODUCTVERSION 1,5,1,1000 + FILEVERSION 2,0,0,1000 + PRODUCTVERSION 2,0,0,1000 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -34,12 +34,12 @@ BEGIN BEGIN VALUE "CompanyName", "Dokan Project" VALUE "FileDescription", "Dokan Driver" - VALUE "FileVersion", "1.5.1.1000" + VALUE "FileVersion", "2.0.0.1000" VALUE "InternalName", "dokan.sys" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "dokan.sys" VALUE "ProductName", "Dokan" - VALUE "ProductVersion", "1.5.1.1000" + VALUE "ProductVersion", "2.0.0.1000" END END BLOCK "VarFileInfo" diff --git a/sys/public.h b/sys/public.h index dfe778a43..6699e0778 100644 --- a/sys/public.h +++ b/sys/public.h @@ -24,7 +24,7 @@ with this program. If not, see . #define PUBLIC_H_ #ifndef DOKAN_MAJOR_API_VERSION -#define DOKAN_MAJOR_API_VERSION L"1" +#define DOKAN_MAJOR_API_VERSION L"2" #include #endif diff --git a/sys/util/log.h b/sys/util/log.h index 0c2baf95d..caa475a41 100644 --- a/sys/util/log.h +++ b/sys/util/log.h @@ -69,7 +69,7 @@ VOID IncrementVcbLogCacheCount(); // Main print function which should not be used directly. #define DDbgPrint(Format, ...) \ KdPrintEx((DPFLTR_IHVDRIVER_ID, DPFLTR_TRACE_LEVEL, \ - "[dokan1]" Format "\n", __VA_ARGS__)); + "[dokan2]" Format "\n", __VA_ARGS__)); #if (NTDDI_VERSION >= NTDDI_WIN8) #define DokanQuerySystemTime KeQuerySystemTimePrecise