AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows/QSaveFile: Fix locking issues on Dropbox drives

Browse Source 
Add a flag to QTemporaryFileEngine causing the file to be opened in
non-shared mode, preventing renaming failures caused by the Dropbox
driver accessing it.

Task-number: QTBUG-57299
Change-Id: Id7afc3559fd15784d4166efbbd057d592b5e0ab2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2018-01-26 08:37:40 +01:00
parent 2bfafb673c
commit fe5edcee60
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qsavefile.cpp
View File

@ -264,7 +264,7 @@ bool QSaveFile::open(OpenMode mode)
} }
#endif #endif
d->fileEngine = new QTemporaryFileEngine(&d->finalFileName); d->fileEngine = new QTemporaryFileEngine(&d->finalFileName, QTemporaryFileEngine::Win32NonShared);
// if the target file exists, we'll copy its permissions below, // if the target file exists, we'll copy its permissions below,
// but until then, let's ensure the temporary file is not accessible // but until then, let's ensure the temporary file is not accessible
// to a third party // to a third party

11
src/corelib/io/qtemporaryfile.cpp
View File

@ -207,7 +207,7 @@ QFileSystemEntry::NativePath QTemporaryFileName::generateNext()
changed and contain the generated path name. changed and contain the generated path name.
*/ */
static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &templ, static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &templ,
quint32 mode, QSystemError &error) quint32 mode, int flags, QSystemError &error)
{ {
const int maxAttempts = 16; const int maxAttempts = 16;
for (int attempt = 0; attempt < maxAttempts; ++attempt) { for (int attempt = 0; attempt < maxAttempts; ++attempt) {
@ -216,16 +216,18 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
Q_UNUSED(mode); Q_UNUSED(mode);
const DWORD shareMode = (flags & QTemporaryFileEngine::Win32NonShared)
? 0u : (FILE_SHARE_READ | FILE_SHARE_WRITE);
# ifndef Q_OS_WINRT # ifndef Q_OS_WINRT
file = CreateFile((const wchar_t *)path.constData(), file = CreateFile((const wchar_t *)path.constData(),
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_NEW, shareMode, NULL, CREATE_NEW,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
# else // !Q_OS_WINRT # else // !Q_OS_WINRT
file = CreateFile2((const wchar_t *)path.constData(), file = CreateFile2((const wchar_t *)path.constData(),
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, CREATE_NEW, shareMode, CREATE_NEW,
NULL); NULL);
# endif // Q_OS_WINRT # endif // Q_OS_WINRT
@ -247,6 +249,7 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t
return false; return false;
} }
#else // POSIX #else // POSIX
Q_UNUSED(flags)
file = QT_OPEN(path.constData(), file = QT_OPEN(path.constData(),
QT_OPEN_CREAT | QT_OPEN_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, QT_OPEN_CREAT | QT_OPEN_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE,
static_cast<mode_t>(mode)); static_cast<mode_t>(mode));
@ -366,7 +369,7 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)
unnamedFile = true; unnamedFile = true;
d->fileEntry.clear(); d->fileEntry.clear();
} else if (st == CreateUnnamedFileStatus::NotSupported && } else if (st == CreateUnnamedFileStatus::NotSupported &&
createFileFromTemplate(file, tfn, fileMode, error)) { createFileFromTemplate(file, tfn, fileMode, flags, error)) {
filePathIsTemplate = false; filePathIsTemplate = false;
unnamedFile = false; unnamedFile = false;
d->fileEntry = QFileSystemEntry(tfn.path, QFileSystemEntry::FromNativePath()); d->fileEntry = QFileSystemEntry(tfn.path, QFileSystemEntry::FromNativePath());

7
src/corelib/io/qtemporaryfile_p.h
View File

@ -108,8 +108,10 @@ class QTemporaryFileEngine : public QFSFileEngine
{ {
Q_DECLARE_PRIVATE(QFSFileEngine) Q_DECLARE_PRIVATE(QFSFileEngine)
public: public:
QTemporaryFileEngine(const QString *templateName) enum Flags { Win32NonShared = 0x1 };
: templateName(*templateName)
explicit QTemporaryFileEngine(const QString *_templateName, int _flags = 0)
: templateName(*_templateName), flags(_flags)
{} {}
void initialize(const QString &file, quint32 mode, bool nameIsTemplate = true) void initialize(const QString &file, quint32 mode, bool nameIsTemplate = true)
@ -144,6 +146,7 @@ public:
const QString &templateName; const QString &templateName;
quint32 fileMode; quint32 fileMode;
int flags = 0;
bool filePathIsTemplate; bool filePathIsTemplate;
bool filePathWasTemplate; bool filePathWasTemplate;
bool unnamedFile = false; bool unnamedFile = false;