Changeset 716 for trunk/src

Timestamp:

Apr 30, 2010, 12:17:16 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Do DosOpen() with OPEN_FLAGS_FAIL_ON_ERROR on drive letters instead of DosQueryFSAttach() to check if a removable drive is actually accessible or not. This eliminates the hardware error popups in Qt file dialogs even with AUTOFAIL=NO/absent in config.sys.

Location:

trunk/src/corelib/io

Files:

• qfsfileengine_iterator_os2.cpp (modified) (1 diff)
• qfsfileengine_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -133 +133 @@
             // 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;
-            arc = DosQueryFSAttach(drv, 0, FSAIL_QUERYNAME, pfsq, &bufSize);
+            HFILE hdrv;
+            ULONG action;
+            arc = DosOpen(drv, &hdrv, &action, 0, FILE_NORMAL, FILE_OPEN,
+                          OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |
+                          OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, NULL);
+            if (arc == NO_ERROR) {
+                // sometimes, 0 is returned for drive A: with no media in it
+                // but SYS0045 pops up when doing stat(). The trick is to
+                // read from the handle to detect this case.
+                char buf;
+                arc = DosRead(hdrv, &buf, sizeof(buf), &action);
+                if (arc != ERROR_SECTOR_NOT_FOUND)
+                    arc = NO_ERROR;
+                DosClose(hdrv);
+            }
         }
-        if (arc != NO_ERROR) {
+        if (arc == ERROR_NOT_READY || arc == ERROR_DISK_CHANGE ||
+            arc == ERROR_SECTOR_NOT_FOUND || arc == ERROR_INVALID_DRIVE) {
             that->platform->dir = 0;
             that->platform->done = true;

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -617 +617 @@
                 // media inserted will cause an unnecessary delay and noise.
                 BYTE drv[3] = { filePath.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) {
+                HFILE hdrv;
+                ULONG action;
+                APIRET arc = DosOpen(drv, &hdrv, &action, 0, FILE_NORMAL, FILE_OPEN,
+                                     OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |
+                                     OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, NULL);
+                if (arc == NO_ERROR) {
+                    // sometimes, 0 is returned for drive A: with no media in it
+                    // but SYS0045 pops up when doing stat(). The trick is to
+                    // read from the handle to detect this case.
+                    char buf;
+                    arc = DosRead(hdrv, &buf, sizeof(buf), &action);
+                    if (arc != ERROR_SECTOR_NOT_FOUND)
+                        arc = NO_ERROR;
+                    DosClose(hdrv);
+                }
+                if (arc == ERROR_NOT_READY || arc == ERROR_DISK_CHANGE ||
+                    arc == ERROR_SECTOR_NOT_FOUND) {
+                    // it must be a removable drive with no media in it
+                    could_stat = false;
+                } else if (arc == ERROR_INVALID_DRIVE) {
+                    // just an invalid drive letter
                     could_stat = false;
                 } else {