1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStorageInfo/Windows: Improve error handling

Browse Source 
Bail out of QStorageInfoPrivate::doStats() should an error occur
and set the ready/valid flags accordingly.

Task-number: QTBUG-6039
Change-Id: Id5354b31329d951599ae991aa7edde0515c90514
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2017-06-13 11:45:59 +02:00
parent 6e861d8412
commit 1bc5f619ea
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/corelib/io/qstorageinfo_win.cpp
View File

@ -43,36 +43,52 @@
#include <QtCore/qfileinfo.h> #include <QtCore/qfileinfo.h>
#include <QtCore/qvarlengtharray.h> #include <QtCore/qvarlengtharray.h>
#include "qfilesystementry_p.h"
#include <qt_windows.h> #include <qt_windows.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static const int defaultBufferSize = MAX_PATH + 1; static const int defaultBufferSize = MAX_PATH + 1;
void QStorageInfoPrivate::initRootPath() static QString canonicalPath(const QString &rootPath)
{ {
rootPath = QFileInfo(rootPath).canonicalFilePath(); QString path = QDir::toNativeSeparators(QFileInfo(rootPath).canonicalFilePath());
if (path.isEmpty())
if (rootPath.isEmpty()) return path;
return;
QString path = QDir::toNativeSeparators(rootPath);
rootPath.clear();
if (path.startsWith(QLatin1String("\\\\?\\"))) if (path.startsWith(QLatin1String("\\\\?\\")))
path.remove(0, 4); path.remove(0, 4);
if (path.length() < 2 || path.at(1) != QLatin1Char(':')) if (path.length() < 2 || path.at(1) != QLatin1Char(':'))
return; return QString();
path[0] = path[0].toUpper(); path[0] = path[0].toUpper();
if (!(path.at(0).unicode() >= 'A' && path.at(0).unicode() <= 'Z')) if (!(path.at(0).unicode() >= 'A' && path.at(0).unicode() <= 'Z'))
return; return QString();
if (!path.endsWith(QLatin1Char('\\'))) if (!path.endsWith(QLatin1Char('\\')))
path.append(QLatin1Char('\\')); path.append(QLatin1Char('\\'));
return path;
}
void QStorageInfoPrivate::initRootPath()
{
// Do not unnecessarily call QFileInfo::canonicalFilePath() if the path is
// already a drive root since it may hang on network drives.
const QString path = QFileSystemEntry::isDriveRootPath(rootPath)
? QDir::toNativeSeparators(rootPath)
: canonicalPath(rootPath);
if (path.isEmpty()) {
valid = ready = false;
return;
}
// ### test if disk mounted to folder on other disk // ### test if disk mounted to folder on other disk
wchar_t buffer[defaultBufferSize]; wchar_t buffer[defaultBufferSize];
if (::GetVolumePathName(reinterpret_cast<const wchar_t *>(path.utf16()), buffer, defaultBufferSize)) if (::GetVolumePathName(reinterpret_cast<const wchar_t *>(path.utf16()), buffer, defaultBufferSize))
rootPath = QDir::fromNativeSeparators(QString::fromWCharArray(buffer)); rootPath = QDir::fromNativeSeparators(QString::fromWCharArray(buffer));
else
valid = ready = false;
} }
static inline QByteArray getDevice(const QString &rootPath) static inline QByteArray getDevice(const QString &rootPath)
@ -108,11 +124,14 @@ static inline QByteArray getDevice(const QString &rootPath)
void QStorageInfoPrivate::doStat() void QStorageInfoPrivate::doStat()
{ {
valid = ready = true;
initRootPath(); initRootPath();
if (rootPath.isEmpty()) if (!valid || !ready)
return; return;
retrieveVolumeInfo(); retrieveVolumeInfo();
if (!valid || !ready)
return;
device = getDevice(rootPath); device = getDevice(rootPath);
retrieveDiskFreeSpace(); retrieveDiskFreeSpace();
} }
@ -137,9 +156,6 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
ready = false; ready = false;
valid = ::GetLastError() == ERROR_NOT_READY; valid = ::GetLastError() == ERROR_NOT_READY;
} else { } else {
ready = true;
valid = true;
fileSystemType = QString::fromWCharArray(fileSystemTypeBuffer).toLatin1(); fileSystemType = QString::fromWCharArray(fileSystemTypeBuffer).toLatin1();
name = QString::fromWCharArray(nameBuffer); name = QString::fromWCharArray(nameBuffer);
@ -154,7 +170,7 @@ void QStorageInfoPrivate::retrieveDiskFreeSpace()
const UINT oldmode = ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); const UINT oldmode = ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
const QString path = QDir::toNativeSeparators(rootPath); const QString path = QDir::toNativeSeparators(rootPath);
::GetDiskFreeSpaceEx(reinterpret_cast<const wchar_t *>(path.utf16()), ready = ::GetDiskFreeSpaceEx(reinterpret_cast<const wchar_t *>(path.utf16()),
PULARGE_INTEGER(&bytesAvailable), PULARGE_INTEGER(&bytesAvailable),
PULARGE_INTEGER(&bytesTotal), PULARGE_INTEGER(&bytesTotal),
PULARGE_INTEGER(&bytesFree)); PULARGE_INTEGER(&bytesFree));