* Sync up to trunk head (r64894).

svn path=/branches/shell-experiments/; revision=64895
This commit is contained in:
Amine Khaldi 2014-10-22 17:07:43 +00:00
commit 06e986393a
111 changed files with 3765 additions and 1930 deletions

View file

@ -136,6 +136,7 @@ copy(TCHAR source[MAX_PATH],
_tcscat(TempSrc,_T(".decrypt"));
if (!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION))
{
CloseHandle (hFileSrc);
nErrorLevel = 1;
return 0;
}
@ -766,6 +767,7 @@ INT cmd_copy(LPTSTR param)
/* Check Breaker */
if (CheckCtrlBreak(BREAK_INPUT))
{
FindClose(hFile);
freep(arg);
return 1;
}
@ -789,6 +791,7 @@ INT cmd_copy(LPTSTR param)
if (_tcscmp(tmpDestPath, _T("\\\\.\\")) &&
!IsExistingDirectory(tmpDestPath))
{
FindClose(hFile);
ConOutFormatMessage(GetLastError(), szSrcPath);
freep(arg);
nErrorLevel = 1;