Mercurial > vim
changeset 13853:1ea18443d569 v8.0.1798
patch 8.0.1798: MS-Windows: file considered read-only too often
commit https://github.com/vim/vim/commit/5aa9896b2e3330e32dc42a54731cc44ec904acca
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 6 17:09:38 2018 +0200
patch 8.0.1798: MS-Windows: file considered read-only too often
Problem: MS-Windows: file considered read-only when another program has
opened it.
Solution: Pass file sharing flag to CreateFile(). (Linwei, closes #2860)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 May 2018 17:15:05 +0200 |
| parents | 50956a238b39 |
| children | a5ad04c23f38 |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -6847,7 +6847,6 @@ default_shell(void) mch_access(char *n, int p) { HANDLE hFile; - DWORD am; int retval = -1; /* default: fail */ #ifdef FEAT_MBYTE WCHAR *wn = NULL; @@ -6931,16 +6930,22 @@ mch_access(char *n, int p) } else { + // Don't consider a file read-only if another process has opened it. + DWORD share_mode = FILE_SHARE_READ | FILE_SHARE_WRITE; + /* Trying to open the file for the required access does ACL, read-only * network share, and file attribute checks. */ - am = ((p & W_OK) ? GENERIC_WRITE : 0) - | ((p & R_OK) ? GENERIC_READ : 0); + DWORD access_mode = ((p & W_OK) ? GENERIC_WRITE : 0) + | ((p & R_OK) ? GENERIC_READ : 0); + #ifdef FEAT_MBYTE if (wn != NULL) - hFile = CreateFileW(wn, am, 0, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileW(wn, access_mode, share_mode, + NULL, OPEN_EXISTING, 0, NULL); else #endif - hFile = CreateFile(n, am, 0, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFile(n, access_mode, share_mode, + NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) goto getout; CloseHandle(hFile);