Skip to content

Commit c4395bd

Browse files
committed
Merge branch 'master' into Corillian-asyncio
# Conflicts: # dokan.sln # dokan/dokan.c # dokan/setfile.c # dokan_wix/dokanx64.ddf # dokan_wix/dokanx86.ddf # samples/dokan_mirror/mirror.c
2 parents 831c1f1 + 623432e commit c4395bd

File tree

27 files changed

+404
-2076
lines changed

27 files changed

+404
-2076
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
#github: [liryna]
1+
github: Liryna
22
liberapay: Liryna
33
issuehunt: dokan-dev/dokany
4+
patreon: liryna

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1212
### Added
1313
- Kernel - Added support for FileIdExtdBothDirectoryInformation, which is required when the target is mapped as a volume into docker containers.
1414
### Changed
15+
- Kernel - Single build target Win7 / enable new features according to OS during runtime.
1516
- Kernel - Only log to event viewer when debug default log is enabled.
16-
- Library - Clarified documentation of dokan file-change notification functions
17+
- Library - Clarified documentation of dokan file-change notification functions.
1718
- Build - Run Code Analysis on all builds of debug build configurations within Visual Studio, but not by default from msbuild.
1819
### Fixed
1920
- Library - Incorrect call to `legacyKeepAliveThreadIds` `WaitForObject`.
2021
- Kernel - FileNameInformation - Only concat `UNCName` / `DiskDeviceName` for network devices.
2122
- FUSE - Infinite loop when using characters from Unicode supplementary planes ('🔈' for example).
23+
- FUSE - Support WriteFile with offset `-1`.
24+
- FUSE - `get_file` - Do not use the current file shared mode.
2225

2326
## [1.3.0.1000] - 2019-07-24
2427
### Added
@@ -443,7 +446,8 @@ Latest Dokan version from Hiroki Asakawa.
443446
[http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/)
444447

445448

446-
[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.2.2.1000...master
449+
[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.3.0.1000...master
450+
[1.3.0.1000]: https://github.com/dokan-dev/dokany/compare/v1.2.2.1000...v1.3.0.1000
447451
[1.2.2.1000]: https://github.com/dokan-dev/dokany/compare/v1.2.1.2000...v1.2.2.1000
448452
[1.2.1.2000]: https://github.com/dokan-dev/dokany/compare/v1.2.1.1000...v1.2.1.2000
449453
[1.2.1.1000]: https://github.com/dokan-dev/dokany/compare/v1.2.0.1000...v1.2.1.1000

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# Dokany
22
[![Build status](https://ci.appveyor.com/api/projects/status/4tpt4v8btyahh3le/branch/master?svg=true)](https://ci.appveyor.com/project/Maxhy/dokany/branch/master)
33
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=dokany&metric=alert_status)](https://sonarcloud.io/dashboard?id=dokany)
4-
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=dokany-dev-sys&metric=alert_status)](https://sonarcloud.io/dashboard?id=dokany-dev-sys)
54
[![Coverity Scan](https://img.shields.io/coverity/scan/6789.svg)](https://scan.coverity.com/projects/dokan-dev-dokany)
65
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/43afb600ca75462e94d9484c32090135)](https://www.codacy.com/app/Liryna/dokany?utm_source=github.com&utm_medium=referral&utm_content=dokan-dev/dokany&utm_campaign=Badge_Grade)
76
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1234/badge)](https://bestpractices.coreinfrastructure.org/projects/1234)
87
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdokan-dev%2Fdokany.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdokan-dev%2Fdokany?ref=badge_shield)
98
|
109
[![Bounty](https://img.shields.io/bountysource/team/dokan-dev/activity.svg)](https://www.bountysource.com/teams/dokan-dev/issues)
11-
[![PayPal donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&[email protected]&lc=US&item_name=Dokany&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted "Donate!")
1210
|
1311
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/dokan-dev/dokany.svg)](http://isitmaintained.com/project/dokan-dev/dokany "Average time to resolve an issue")
1412
[![Percentage of issues still open](http://isitmaintained.com/badge/open/dokan-dev/dokany.svg)](http://isitmaintained.com/project/dokan-dev/dokany "Percentage of issues still open")

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
$msys2_tar = "$env:TEMP\msys2-base-x86_64.tar.xz"
160160
Invoke-WebRequest $msys2_tar_url -OutFile $msys2_tar
161161
if ($(Get-FileHash -Algorithm SHA256 $msys2_tar).Hash -ne $msys2_tar_sha256) {
162-
throw "Hash mismatch while downloading Doxygen"
162+
throw "Hash mismatch while downloading msys2"
163163
}
164164
Write-Host "Extracting MSYS2"
165165
Exec-External {& cmd /c "7z x -so $msys2_tar | 7z x -si -ttar -o$env:MSYS2_INST_DIR\..\"}
@@ -214,7 +214,7 @@
214214
Invoke-WebRequest https://sonarcloud.io/static/cpp/build-wrapper-win-x86.zip -OutFile .\build-wrapper-win-x86.zip
215215
Exec-External { & 7z e .\build-wrapper-win-x86.zip }
216216
$env:Path += ";$((Get-Location).Path)"
217-
.\scripts\sonar-build.ps1 dokany dokany-dev-sys $env:SonarQubeToken dokan-dev https://sonarcloud.io $env:APPVEYOR_BUILD_VERSION
217+
.\scripts\sonar-build.ps1 dokany $env:SonarQubeToken dokan-dev https://sonarcloud.io $env:APPVEYOR_BUILD_VERSION
218218
}
219219
- ps: |
220220
if ($env:CONFIGURATION -eq "Coverity" -and "$env:APPVEYOR_REPO_BRANCH" -eq "master") {
@@ -231,7 +231,7 @@
231231
$buildArgs = @(
232232
"/m",
233233
"/l:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll",
234-
"/p:Configuration=Win10 Debug",
234+
"/p:Configuration=Debug",
235235
"/p:Platform=x64")
236236
237237
Exec-External {& "$env:SYSTEMDRIVE\Tools\Coverity\bin\cov-build.exe" `
@@ -298,7 +298,7 @@
298298
& .\SetAssemblyVersion\bin\Release\SetAssemblyVersion ..\CHANGELOG.md version.xml ..\
299299
300300
cd ${env:APPVEYOR_BUILD_FOLDER}
301-
Exec-External {& .\scripts\build.ps1}
301+
Exec-External {& .\scripts\build.ps1 -Configurations Release }
302302
.\cert\dokan-sign.ps1
303303
304304
cd dokan_wix

cert/dokan-sign.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
$env:CERTISSUER="DokanCA"
2-
$env:ADDITIONALCERT="$pwd\cert\DokanCA.cer"
32

43
.\scripts\sign.ps1

0 commit comments

Comments
 (0)