Changeset 36 for rxutilex/trunk/rxutilex.c

Timestamp:

Feb 12, 2017, 8:48:39 AM (8 years ago)

Author:

Alex Taylor

Message:

Add Sys2QueryDriveInfo function and updated documentation.

File:

• rxutilex/trunk/rxutilex.c (modified) (13 diffs)

rxutilex/trunk/rxutilex.c

@@ -1 +1 @@
 /******************************************************************************
  * REXX Utility Functions - Extended (RXUTILEX.DLL)                           *
- * (C) 2011, 2014 Alex Taylor.                                                *
+ * (C) 2011, 2017 Alex Taylor.                                                *
  *                                                                            *
  * LICENSE:                                                                   *
@@ -45 +45 @@
 #define INCL_WINCLIPBOARD
 #define INCL_WINERRORS
+#define INCL_DOS
+#define INCL_DOSDEVIOCTL
 #define INCL_DOSERRORS
 #define INCL_DOSMISC
@@ -55 +57 @@
 #endif
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -88 +91 @@
 #define SZ_LIBRARY_NAME         "RXUTILEX"  // Name of this library
 //#define SZ_ERROR_NAME           "SYS2ERR"   // REXX variable used to store error codes
-#define SZ_VERSION              "0.1.3"     // Current version of this library
+#define SZ_VERSION              "0.1.4"     // Current version of this library
 
 // Maximum string lengths...
@@ -106 +109 @@
 #define US_NUMSTR_MAXZ          64                                   // ...of a formatted number string
 #define US_PIPESTATUS_MAXZ      128                                  // ...of a pipe status string
+#define US_DISKINFO_MAXZ        128                                  // ...of a disk information string
 
 #define UL_SSBUFSIZE            0xFFFF      // Buffer size for the DosQuerySysState() data
@@ -124 +128 @@
     "Sys2QueryProcessList",
     "Sys2KillProcess",
+    "Sys2QueryDriveInfo",
     "Sys2QueryForegroundProcess",
     "Sys2QueryPhysicalMemory",
@@ -163 +168 @@
 RexxFunctionHandler Sys2QueryForegroundProcess;
 
+RexxFunctionHandler Sys2QueryDriveInfo;
+
 RexxFunctionHandler Sys2QueryPhysicalMemory;
 
 RexxFunctionHandler Sys2LocateDLL;
 RexxFunctionHandler Sys2ReplaceModule;
-
-// RexxFunctionHandler Sys2ReplaceObjectClass;
 
 RexxFunctionHandler Sys2CreateNamedPipe;
@@ -181 +186 @@
 RexxFunctionHandler Sys2Write;
 RexxFunctionHandler Sys2SyncBuffer;
+
 
 // Private internal functions
@@ -2279 +2285 @@
 
 
+/* ------------------------------------------------------------------------- *
+ * Sys2QueryDriveInfo                                                        *
+ *                                                                           *
+ * Get non-filesystem-dependent information about a logical drive (volume).  *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. Drive/volume letter to query, trailing colon optional.    (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   On success, returns a string in the format                              *
+ *      <drive> <size> <type> <flag>                                         *
+ *   where <drive> is the uppercase drive letter followed by a colon,        *
+ *         <size>  is the total size of the drive/volume in binary kilobytes,*
+ *         <type>  is one of:                                                *
+ *                   FLOPPY_5L - 48 TPI low-density diskette drive           *
+ *                   FLOPPY_5H - 96 TPI high-density diskette drive          *
+ *                   FLOPPY_3L - 3.5-inch 720KB drive                        *
+ *                   FLOPPY_3H - 3.5-inch high-density 1.44MB diskette drive *
+ *                   FLOPPY_3X - 3.5-inch ext-density 2.88MB diskette drive  *
+ *                   FLOPPY_8L - 8-inch single-density diskette drive        *
+ *                   FLOPPY_8H - 8-inch double-density diskette drive        *
+ *                   OTHER     - other (including CD drive with no media)    *
+ *                   HDD       - hard disk drive (including PRM)             *
+ *                   TAPE      - tape drive                                  *
+ *                   OPTICAL   - read/write optical drive                    *
+ *     and <flag> is 1 for non-partitionable removable media (e.g. floppies) *
+ *                or 0 otherwise (including both fixed and PRM disks)        *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY Sys2QueryDriveInfo( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    BIOSPARAMETERBLOCK data;
+    CHAR   szDiskInfo[ US_DISKINFO_MAXZ ];
+    UCHAR  achPP[ 2 ],
+           chVol;
+    ULONG  cbPP,
+           cbData,
+           ulSectors,
+           ulSize;
+    BOOL   bRemovable;
+    APIRET rc;
+
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Make sure we have exactly one valid argument (the drive letter)
+    if ( argc != 1  || ( !RXVALIDSTRING(argv[0]) ))
+        return ( 40 );
+    chVol = toupper( argv[0].strptr[0] );
+    if (( chVol < 'A') || ( chVol > 'Z'))
+        return ( 40 );
+
+    cbPP = 2;
+    achPP[ 0 ] = 0;
+    achPP[ 1 ] = chVol - 65;
+    cbData = sizeof( data );
+    rc = DosDevIOCtl( (HFILE) -1, IOCTL_DISK, DSK_GETDEVICEPARAMS,
+                      (PVOID) achPP, 2, &cbPP, &data, cbData, &cbData );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosDevIOCtl");
+        SaveResultString( prsResult, NULL, 0 );
+        return ( 0 );
+    }
+
+    ulSectors = data.cSectors? data.cSectors: data.cLargeSectors;
+    ulSize = (data.usBytesPerSector > 1024) ?
+                 (ULONG) (ulSectors * ( data.usBytesPerSector / 1024 )) :
+                 (ULONG) (ulSectors / ( 1024 / data.usBytesPerSector ));
+    bRemovable = !( data.fsDeviceAttr & 1 );
+
+    sprintf( szDiskInfo, "%c: %u ", chVol, ulSize );
+    switch( data.bDeviceType ) {
+        case 0:     // 48 TPI low-density diskette drive
+            strncat( szDiskInfo, "FLOPPY_5L", US_DISKINFO_MAXZ-1 );
+            break;
+        case 1:     // 96 TPI high-density diskette drive
+            strncat( szDiskInfo, "FLOPPY_5H", US_DISKINFO_MAXZ-1 );
+            break;
+        case 2:     // Small (3.5-inch) 720KB drive
+            strncat( szDiskInfo, "FLOPPY_3L", US_DISKINFO_MAXZ-1 );
+            break;
+        case 3:     // 8-inch single-density diskette drive
+            strncat( szDiskInfo, "FLOPPY_8L", US_DISKINFO_MAXZ-1 );
+            break;
+        case 4:     // 8-inch double-density diskette drive
+            strncat( szDiskInfo, "FLOPPY_8H", US_DISKINFO_MAXZ-1 );
+            break;
+        case 5:     // Fixed disk
+            strncat( szDiskInfo, "HDD", US_DISKINFO_MAXZ-1 );
+            break;
+        case 6:     // Tape drive
+            strncat( szDiskInfo, "TAPE", US_DISKINFO_MAXZ-1 );
+            break;
+        case 7:     // Other (includes 1.44MB 3.5-inch diskette drive)
+            if ( ulSize == 1440 )
+                strncat( szDiskInfo, "FLOPPY_3H", US_DISKINFO_MAXZ-1 );
+            else
+                strncat( szDiskInfo, "OTHER", US_DISKINFO_MAXZ-1 );
+            break;
+        case 8:     // R/W optical disk
+            strncat( szDiskInfo, "OPTICAL", US_DISKINFO_MAXZ-1 );
+            break;
+        case 9:     // 3.5-inch 4.0MB diskette drive (2.88MB formatted)
+            strncat( szDiskInfo, "FLOPPY_3X", US_DISKINFO_MAXZ-1 );
+            break;
+        default:
+            strncat( szDiskInfo, "UNKNOWN", US_DISKINFO_MAXZ-1 );
+            break;
+    }
+    strncat( szDiskInfo, ( bRemovable? " 1": " 0" ), US_DISKINFO_MAXZ-1 );
+
+    SaveResultString( prsResult, szDiskInfo, strlen(szDiskInfo) );
+    return ( 0 );
+}
+
+
 
 // -------------------------------------------------------------------------
@@ -2477 +2599 @@
 
 
-/* MOVED */
+
+
 #ifdef NO_SHARED_SOURCE
+
+/****
+ **** MOVED TO shfuncs.c
+ ****/
 
 /* ------------------------------------------------------------------------- *
@@ -2501 +2628 @@
     // 2016-02-20 SHL Rework for easier usage
     if (!pchBytes)
-      ulBytes = 0;                              // Sync for caller
+        ulBytes = 0;                              // Sync for caller
     if ( ulBytes > 256 ) {
         // REXX provides 256 bytes by default; allocate more if necessary
@@ -2515 +2642 @@
     }
     if (ulBytes)
-      memcpy( prsResult->strptr, pchBytes, ulBytes );
+        memcpy( prsResult->strptr, pchBytes, ulBytes );
     prsResult->strlength = ulBytes;
 
@@ -2607 +2734 @@
 }
 
-#endif
+#endif // NO_SHARED_SOURCE
+