CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ NP2E issue #100 "File lock not released on open" (https://github.com/ProgerXP/Notepad2e/issues/100):

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-09-05 00:11:45 +02:00
parent 3e23113b7f
commit d6775f7161
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Helpers.h
View File

@ -16,11 +16,11 @@
#ifndef _NP3_HELPERS_H_
#define _NP3_HELPERS_H_
#include <VersionHelpers.h>
#define STRSAFE_NO_CB_FUNCTIONS
#undef STRSAFE_NO_DEPRECATE // don't allow deprecated functions
#include <strsafe.h>
#include <shlwapi.h>
#define STRGFY(X) L##X
#define MKWSTRG(strg) STRGFY(strg)
@ -338,10 +338,10 @@ inline int _StringCchCmpINW(PCNZWCH s1,int l1,PCNZWCH s2,int l2) {
// including <pathcch.h> and linking against pathcch.lib causes an
// API-MS-WIN-CORE-PATH-L1-1-0.DLL library missing error,
// so switch back to previous (deprecated) methods:
#define PathCchAppend(p,l,a) PathAppend((p),(a))
#define PathCchCanonicalize(p,l,a) PathCanonicalize((p),(a))
#define PathCchRenameExtension(p,l,a) PathRenameExtension((p),(a))
#define PathCchRemoveFileSpec(p,l) PathRemoveFileSpec((p))
inline HRESULT PathCchAppend(PWSTR p,size_t l,PCWSTR a) { UNUSED(l); return (PathAppend(p,a) ? S_OK : E_FAIL); }
inline HRESULT PathCchCanonicalize(PWSTR p,size_t l,PCWSTR a) { UNUSED(l); return (PathCanonicalize(p,a) ? S_OK : E_FAIL); }
inline HRESULT PathCchRenameExtension(PWSTR p,size_t l,PCWSTR a) { UNUSED(l); return (PathRenameExtension(p,a) ? S_OK : E_FAIL); }
inline HRESULT PathCchRemoveFileSpec(PWSTR p,size_t l) { UNUSED(l); return (PathRemoveFileSpec(p) ? S_OK : E_FAIL); }
#endif //_NP3_HELPERS_H_

8
src/Notepad3.c
View File

@ -7379,6 +7379,14 @@ BOOL FileLoad(BOOL bDontSave,BOOL bNew,BOOL bReload,BOOL bNoEncDetect,LPCWSTR lp
if (PathIsLnkFile(szFileName))
PathGetLnkPath(szFileName,szFileName,COUNTOF(szFileName));
// change current directory to prevent directory lock on another path
WCHAR szFolder[MAX_PATH+2];
if (SUCCEEDED(StringCchCopy(szFolder,COUNTOF(szFolder),tch))) {
if (SUCCEEDED(PathCchRemoveFileSpec(szFolder,COUNTOF(szFolder)))) {
SetCurrentDirectory(szFolder);
}
}
// Ask to create a new file...
if (!bReload && !PathFileExists(szFileName))
{