wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 879957 Avoid calling FileEncryptionStatusW r=jimm

Browse Source
This commit is contained in:
Neil Rashbrook 2013-06-11 19:01:58 +01:00
parent e459c55070
commit 4f5b77783e
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xpcom/io/nsLocalFileWin.cpp
View File

@ -1826,44 +1826,33 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent,
int copyOK;
DWORD dwVersion = GetVersion();
DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
DWORD dwCopyFlags = 0;
DWORD dwCopyFlags = COPY_FILE_ALLOW_DECRYPTED_DESTINATION;
if (dwMajorVersion > 5) {
bool path1Remote, path2Remote;
if (!IsRemoteFilePath(filePath.get(), path1Remote) ||
!IsRemoteFilePath(destPath.get(), path2Remote) ||
path1Remote || path2Remote) {
dwCopyFlags = COPY_FILE_NO_BUFFERING;
dwCopyFlags |= COPY_FILE_NO_BUFFERING;
}
}
if (!move)
{
copyOK = ::CopyFileExW(filePath.get(), destPath.get(), NULL, NULL, NULL, dwCopyFlags);
else {
DWORD status;
if (FileEncryptionStatusW(filePath.get(), &status)
&& status == FILE_IS_ENCRYPTED)
}
else
{
copyOK = ::MoveFileExW(filePath.get(), destPath.get(), MOVEFILE_REPLACE_EXISTING);
// Check if copying the source file to a different volume,
// as this could be an SMBV2 mapped drive.
if (!copyOK && GetLastError() == ERROR_NOT_SAME_DEVICE)
{
dwCopyFlags |= COPY_FILE_ALLOW_DECRYPTED_DESTINATION;
copyOK = CopyFileExW(filePath.get(), destPath.get(), NULL, NULL, NULL, dwCopyFlags);
if (copyOK)
DeleteFileW(filePath.get());
}
else
{
copyOK = ::MoveFileExW(filePath.get(), destPath.get(),
MOVEFILE_REPLACE_EXISTING);
// Check if copying the source file to a different volume,
// as this could be an SMBV2 mapped drive.
if (!copyOK && GetLastError() == ERROR_NOT_SAME_DEVICE)
{
copyOK = CopyFileExW(filePath.get(), destPath.get(), NULL, NULL, NULL, dwCopyFlags);
if (copyOK)
DeleteFile(filePath.get());
}
}
}
if (!copyOK) // CopyFileEx and MoveFileEx return zero at failure.