Changeset 614 for trunk/src

Timestamp:

Feb 27, 2010, 12:27:27 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QFSFileEngineIterator: Check that the drive is ready before trying to open it which reduces delays and noise for drives with no media inserted [based on the patch by rudi].

File:

• trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -44 +44 @@
 #include "qplatformdefs.h"
 #include "qfsfileengine_iterator_p.h"
+
+#include <qt_os2.h>
 
 #include <QtCore/qvariant.h>
@@ -126 +128 @@
         if (!path.endsWith(QLatin1Char('/')))
             path.append(QLatin1Char('/'));
-        if ((that->platform->dir = ::opendir(QFile::encodeName(path).data())) == 0) {
+        // check that the drive is ready before trying to open it which reduces
+        // delays and noise for drives with no media inserted
+        BYTE drv[3] = { path.at(0).cell(), ':', '\0' };
+        BYTE buf[sizeof(FSQBUFFER2) + (3 * CCHMAXPATH)] = {0};
+        ULONG bufSize = sizeof(buf);
+        PFSQBUFFER2 pfsq = (PFSQBUFFER2) buf;
+        APIRET arc = DosQueryFSAttach(drv, 0, FSAIL_QUERYNAME, pfsq, &bufSize);
+        if (arc != NO_ERROR) {
+            that->platform->dir = 0;
+            that->platform->done = true;
+        } else if ((that->platform->dir = ::opendir(QFile::encodeName(path).data())) == 0) {
             that->platform->done = true;
         } else {