Changeset 796

Timestamp:

Oct 18, 2010, 7:09:36 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Don't report non-existent floppy drives in QDir::drives(). This makes letter A: and B: disappear from standard file dialogs in case if the computer doesn't have the floppy controller at all or it is disabled in BIOS [patch by rudi].

File:

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

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -69 +69 @@
 #include <grp.h>
 
+
 #include "qt_os2.h"
 
@@ -590 +591 @@
     QFileInfoList ret;
 
-        ULONG driveBits, dummy;
-        DosQueryCurrentDisk(&dummy, &driveBits);
-        driveBits &= 0x3ffffff;
-
-        char driveName[4];
-        qstrcpy(driveName, "A:/");
-
-        while(driveBits) {
-            if (driveBits & 1)
+    ULONG driveBits, dummy;
+    DosQueryCurrentDisk(&dummy, &driveBits);
+    driveBits &= 0x3ffffff;
+
+    char driveName[4] = "A:/";
+
+    while (driveBits) {
+        if (driveName[0] < 'C') {
+            // hide non-existent floppies
+            BIOSPARAMETERBLOCK  bpb;
+            UCHAR               ioc[2] = { 0, driveName[0] - 'A' };
+            if (DosDevIOCtl((HFILE)-1, IOCTL_DISK, DSK_GETDEVICEPARAMS,
+                            ioc, 2, NULL, &bpb, sizeof(bpb), NULL) != 0) {
+                driveBits &= ~1;
+            }
+        }
+        if (driveBits & 1)
             ret.append(QString::fromLatin1(driveName).toUpper());
-            driveName[0]++;
-            driveBits = driveBits >> 1;
-        }
+    driveName[0]++;
+    driveBits = driveBits >> 1;
+}
 
     return ret;