Changeset 60

Timestamp:

Apr 18, 2001, 7:17:09 PM (24 years ago)

Author:

umoeller

Message:

Misc updates.

Location:

trunk

Files:

• include/helpers/dosh.h (modified) (2 diffs)
• src/helpers/dosh.c (modified) (3 diffs)

trunk/include/helpers/dosh.h

@@ -64 +64 @@
      ********************************************************************/
 
-    VOID doshEnumDrives(PSZ pszBuffer,
-                        const char *pcszFileSystem,
-                        BOOL fSkipRemoveables);
+    VOID XWPENTRY doshEnumDrives(PSZ pszBuffer,
+                                 const char *pcszFileSystem,
+                                 BOOL fSkipRemoveables);
+    typedef VOID XWPENTRY DOSHENUMDRIVES(PSZ pszBuffer,
+                                         const char *pcszFileSystem,
+                                         BOOL fSkipRemoveables);
+    typedef DOSHENUMDRIVES *PDOSHENUMDRIVES;
 
     CHAR doshQueryBootDrive(VOID);
@@ -74 +78 @@
     APIRET doshSetLogicalMap(ULONG ulLogicalDrive);
 
-    APIRET doshQueryDiskFree(ULONG ulLogicalDrive,
-                             double *pdFree);
-
-    APIRET doshQueryDiskFSType(ULONG ulLogicalDrive,
-                               PSZ pszBuf,
-                               ULONG cbBuf);
+    APIRET XWPENTRY doshQueryDiskSize(ULONG ulLogicalDrive, double *pdSize);
+    typedef APIRET XWPENTRY DOSHQUERYDISKSIZE(ULONG ulLogicalDrive, double *pdSize);
+    typedef DOSHQUERYDISKSIZE *PDOSHQUERYDISKSIZE;
+
+    APIRET XWPENTRY doshQueryDiskFree(ULONG ulLogicalDrive, double *pdFree);
+    typedef APIRET XWPENTRY DOSHQUERYDISKFREE(ULONG ulLogicalDrive, double *pdFree);
+    typedef DOSHQUERYDISKFREE *PDOSHQUERYDISKFREE;
+
+    APIRET XWPENTRY doshQueryDiskFSType(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
+    typedef APIRET XWPENTRY DOSHQUERYDISKFSTYPE(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
+    typedef DOSHQUERYDISKFSTYPE *PDOSHQUERYDISKFSTYPE;
 
     APIRET doshIsFixedDisk(ULONG  ulLogicalDrive,

trunk/src/helpers/dosh.c

@@ -572 +572 @@
                        | OPEN_SHARE_DENYNONE,
                  0);
+
     if (rc == NO_ERROR)
     {
@@ -589 +590 @@
 
 /*
- *@@ doshQueryDiskFree:
- *       returns the number of bytes remaining on the disk
- *       specified by the given logical drive.
- *
- *       Note: This returns a "double" value, because a ULONG
- *       can only hold values of some 4 billion, which would
- *       lead to funny results for drives > 4 GB.
- *
- *@@changed V0.9.0 [umoeller]: fixed another > 4 GB bug (thanks to Rdiger Ihle)
- *@@changed V0.9.7 (2000-12-01) [umoeller]: changed prototype
- */
-
-APIRET doshQueryDiskFree(ULONG ulLogicalDrive, // in: 1 for A:, 2 for B:, 3 for C:, ...
-                         double *pdFree)
+ *@@ doshQueryDiskSize:
+ *      returns the size of the specified disk in bytes.
+ *
+ *      Note: This returns a "double" value, because a ULONG
+ *      can only hold values of some 4 billion, which would
+ *      lead to funny results for drives > 4 GB.
+ *
+ *@@added V0.9.11 (2001-04-18) [umoeller]
+ */
+
+APIRET doshQueryDiskSize(ULONG ulLogicalDrive, // in: 1 for A:, 2 for B:, 3 for C:, ...
+                         double *pdSize)
 {
     APIRET      arc = NO_ERROR;
@@ -608 +607 @@
     double      dbl = -1;
 
-    arc = DosQueryFSInfo(ulLogicalDrive, FSIL_ALLOC, &fsa, sizeof(fsa));
-    if (arc == NO_ERROR)
+    if (!(arc = DosQueryFSInfo(ulLogicalDrive, FSIL_ALLOC, &fsa, sizeof(fsa))))
+        *pdSize = ((double)fsa.cSectorUnit * fsa.cbSector * fsa.cUnit);
+
+    return (arc);
+}
+
+/*
+ *@@ doshQueryDiskFree:
+ *      returns the number of bytes remaining on the disk
+ *      specified by the given logical drive.
+ *
+ *      Note: This returns a "double" value, because a ULONG
+ *      can only hold values of some 4 billion, which would
+ *      lead to funny results for drives > 4 GB.
+ *
+ *@@changed V0.9.0 [umoeller]: fixed another > 4 GB bug (thanks to Rdiger Ihle)
+ *@@changed V0.9.7 (2000-12-01) [umoeller]: changed prototype
+ */
+
+APIRET doshQueryDiskFree(ULONG ulLogicalDrive, // in: 1 for A:, 2 for B:, 3 for C:, ...
+                         double *pdFree)
+{
+    APIRET      arc = NO_ERROR;
+    FSALLOCATE  fsa;
+    double      dbl = -1;
+
+    if (!(arc = DosQueryFSInfo(ulLogicalDrive, FSIL_ALLOC, &fsa, sizeof(fsa))))
         *pdFree = ((double)fsa.cSectorUnit * fsa.cbSector * fsa.cUnitAvail);
                    // ^ fixed V0.9.0