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

Windows: Fix QDir::drives() to no longer list ejected media

Browse Source 
Add a check using GetVolumeInformation() (modeled after QStorageInfo::ready)
within a SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX scope.
Remove old #ifdef used for Windows CE.

[ChangeLog][QtCore][QDir] On Windows, QDir::drives() no longer
returns drives whose media were ejected.

Fixes: QTBUG-69029
Change-Id: I2d4a32e9281ccf3c0f2ebfa427122609aa4f327f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Friedemann Kleint 2018-09-25 10:27:55 +02:00
parent 364d3da3d5
commit 69e68218e5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/io/qfsfileengine_win.cpp
View File

@ -545,23 +545,33 @@ QString QFSFileEngine::tempPath()
return QFileSystemEngine::tempPath(); return QFileSystemEngine::tempPath();
} }
#if !defined(Q_OS_WINRT)
// cf QStorageInfo::isReady
static inline bool isDriveReady(const wchar_t *path)
{
DWORD fileSystemFlags;
const UINT driveType = GetDriveType(path);
return (driveType != DRIVE_REMOVABLE && driveType != DRIVE_CDROM)
|| GetVolumeInformation(path, nullptr, 0, nullptr, nullptr,
&fileSystemFlags, nullptr, 0) == TRUE;
}
#endif // !Q_OS_WINRT
QFileInfoList QFSFileEngine::drives() QFileInfoList QFSFileEngine::drives()
{ {
QFileInfoList ret; QFileInfoList ret;
#if !defined(Q_OS_WINRT) #if !defined(Q_OS_WINRT)
# if defined(Q_OS_WIN32)
const UINT oldErrorMode = ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); const UINT oldErrorMode = ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
quint32 driveBits = (quint32) GetLogicalDrives() & 0x3ffffff; quint32 driveBits = (quint32) GetLogicalDrives() & 0x3ffffff;
::SetErrorMode(oldErrorMode); wchar_t driveName[] = L"A:\\";
# endif
char driveName[] = "A:/";
while (driveBits) { while (driveBits) {
if (driveBits & 1) if ((driveBits & 1) && isDriveReady(driveName))
ret.append(QFileInfo(QLatin1String(driveName))); ret.append(QFileInfo(QString::fromWCharArray(driveName)));
driveName[0]++; driveName[0]++;
driveBits = driveBits >> 1; driveBits = driveBits >> 1;
} }
::SetErrorMode(oldErrorMode);
return ret; return ret;
#else // !Q_OS_WINRT #else // !Q_OS_WINRT
ret.append(QFileInfo(QLatin1String("/"))); ret.append(QFileInfo(QLatin1String("/")));