Changeset 10

Timestamp:

02/22/06 13:03:35 (3 years ago)

Author:

jvw

Message:

Fix FileDialog? trap, other minor updates

Location:

trunk/txlib

Files:

• include/txlib.h (modified) (3 diffs)
• txfsys.c (modified) (8 diffs)
• txosapi.c (modified) (2 diffs)
• txscript.c (modified) (5 diffs)
• txvers.h (modified) (2 diffs)
• txwproc.c (modified) (2 diffs)
• txwstdlg.c (modified) (4 diffs)

trunk/txlib/include/txlib.h

@@ -550 +550 @@
 );
 
+// Substitute $n parameters in a string by supplied values; n = 0..9 (maximum)
+ULONG txsSubstituteParams                       // RET   nr of substitutions
+(
+   char               *string,                  // IN    base string
+   char              **values,                  // IN    values to substitute
+   int                 count,                   // IN    number of values
+   int                 size,                    // IN    size of output buffer
+   char               *result                   // OUT   substituted (MAXLIN)
+);
+
 #if   defined (DEV32)
 
@@ -805 +815 @@
 );
 
-#define  TXFSV_HD      0
-#define  TXFSV_FLOP    1
-#define  TXFSV_LAN     2
-#define  TXFSV_CD      4
-#define  TXFSV_ALL     7
+#define  TXFSV_HD      0x0000
+#define  TXFSV_FLOP    0x0001
+#define  TXFSV_LAN     0x0002
+#define  TXFSV_CD      0x0004
+#define  TXFSV_ALL     0x0007
+#define  TXFSV_REM     0x0100                   // removables only
 // Build string with present volumes
 int TxFsVolumes                                 // RET   nr of drives listed
@@ -847 +858 @@
 );
 
+// Eject a removable medium specified by driveletter
+ULONG TxFsEjectRemovable
+(
+   char               *drive                    // IN    Driveletter to eject
+);
+
+// Determine if a driveletter represents a removable medium/device
+BOOL TxFsIsRemovable                            // RET   drive is removable
+(
+   char               *drive                    // IN    Driveletter to test
+);
 
 // Determine free and total-available space (sectors) on specified drive

trunk/txlib/txfsys.c

@@ -40 +40 @@
 
 
-#if   defined (LINUX)                           // LINUX specific
-
-   #define BLKGETSIZE        0x1260
-   #define BLKSSZGET         0x1268
-
-   #define ROOT_DEVICE       "/dev/root"
+#if   defined (WIN32)
+#elif defined (DOS32)
+
+#define DRIVETYPE_REMOTE  0x1000                // BIT 12 from Ioctl 4409 dx
+#define DRIVETYPE_RAMDRV  0x0800                // BIT 11 from Ioctl 4409 dx
+
+#elif defined (LINUX)
+
+#define BLKGETSIZE        0x1260
+#define BLKSSZGET         0x1268
+
+#define ROOT_DEVICE       "/dev/root"
 
 // Translate root-devicename to disk-partition device name using cached /etc/fstab info
@@ -54 +60 @@
 );
 
-#elif defined (DOS32)                           // DOS specific local stuff
-
-#define DRIVETYPE_REMOTE  0x1000                // BIT 12 from Ioctl 4409 dx
-#define DRIVETYPE_RAMDRV  0x0800                // BIT 11 from Ioctl 4409 dx
+#else
+
+#define TXFSDC_BLOCKR         0x00              // block device removable
+#define TXFSDC_GETBPB         0x00              // get device bpb info
+
+#define TXFSDC_UNLOCK         0x00              // unlock logical drive
+#define TXFSDC_LOCK           0x01              // lock logical drive
+#define TXFSDC_EJECT          0x02              // eject removable
+#define TXFSDC_LOAD           0x03              // load removable
+
+typedef struct drivecmd
+{
+   BYTE                cmd;                     // 0=unlock 1=lock 2=eject
+   BYTE                drv;                     // 0=A, 1=B 2=C ...
+} DRIVECMD;                                     // end of struct "drivecmd"
+
+#define TXFSBPB_REMOVABLE     0x08              // BPB attribute for removable
+
+typedef struct drivebpb
+{
+   TXFS_EBPB           ebpb;                    // extended BPB
+   BYTE                reserved[6];
+   USHORT              cyls;
+   BYTE                type;
+   USHORT              attributes;              // device attributes
+   BYTE                fill[6];                 // documented for IOCtl
+} DRIVEBPB;                                     // end of struct "drivebpb"
 
 #endif
+
 
 /*****************************************************************************/
@@ -135 +165 @@
       if (drivemap & (1 << ml))
       {
-         BOOL       incl = TRUE;
          TXTT       fstype;
 
@@ -141 +170 @@
          if (TxFsType( drive, fstype, NULL))
          {
+            BOOL       removable = TxFsIsRemovable( drive);
+            BOOL       incl = TRUE;
+
             //- Note, connected Win-NT drives use the REAL FS-name like NTFS!
             if     ((strnicmp( fstype, "LAN",    3) == 0) || //- OS/2 LAN drives
@@ -149 +181 @@
             else if (strnicmp( fstype, "CD", 2) == 0) // OS2:CDFS, DOS/WIN:CDROM
             {
-               incl = (flags & TXFSV_CD);
+               removable = TRUE;                // overrule for any CDROM
+               incl      = (flags & TXFSV_CD);
+            }
+            if ((flags & TXFSV_REM) && (removable == FALSE))
+            {
+               incl = FALSE;                    // just want removables ...
             }
             if (incl)
@@ -358 +395 @@
       strcat( leader, "Mounted device");
    #else
-      strcat( leader, "Volume info on");
+      if (TxFsIsRemovable( drive))
+      {
+         strcat( leader, "RemovableDrive");
+      }
+      else
+      {
+         strcat( leader, "Volume info on");
+      }
    #endif
 
@@ -609 +653 @@
       }
    #endif
+   if (list == NULL)                            // empty sofar ?
+   {
+      list = TxSelEmptyList( "- No volumes matching the criteria -",
+            "No volumes found that match the criteria for this list");
+   }
    RETURN( list);
 }                                               // end 'TxFsDriveSelist'
@@ -785 +834 @@
 
 /*****************************************************************************/
+// Eject a removable medium specified by driveletter
+/*****************************************************************************/
+ULONG TxFsEjectRemovable
+(
+   char               *drive                    // IN    Driveletter to eject
+)
+{
+   ULONG               rc = NO_ERROR;           // DOS rc
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      DRIVECMD         IOCtl;
+      ULONG            DataLen;
+      ULONG            ParmLen;
+   #endif
+
+   ENTER();
+   TxFsAutoFailCriticalErrors( TRUE);           // avoid Not-ready pop-ups
+
+   TRACES(("Drive: %s\n", drive));
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      ParmLen   = sizeof(DRIVECMD);
+      IOCtl.cmd = TXFSDC_EJECT;
+      IOCtl.drv = toupper(drive[0]) - 'A';
+      DataLen   = 0;
+
+      rc = DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                       DSK_UNLOCKEJECTMEDIA,
+                       &IOCtl, ParmLen, &ParmLen,
+                       NULL,   DataLen, &DataLen);
+   #endif
+   TxFsAutoFailCriticalErrors( FALSE);          // enable criterror handler
+   RETURN (rc);
+}                                               // end 'TxFsEjectRemovable'
+/*---------------------------------------------------------------------------*/
+
+
+/*****************************************************************************/
+// Determine if a driveletter represents a removable medium/device
+/*****************************************************************************/
+BOOL TxFsIsRemovable                            // RET   drive is removable
+(
+   char               *drive                    // IN    Driveletter to test
+)
+{
+   BOOL                rc = FALSE;
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      DRIVECMD         IOCtl;
+      DRIVEBPB         RemAt;
+      ULONG            DataLen;
+      ULONG            ParmLen;
+      BYTE             NoRem;
+   #endif
+
+   ENTER();
+   TxFsAutoFailCriticalErrors( TRUE);           // avoid Not-ready pop-ups
+
+   TRACES(("Drive: %s\n", drive));
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      ParmLen   = sizeof(IOCtl);
+      IOCtl.cmd = TXFSDC_BLOCKR;
+      IOCtl.drv = toupper(drive[0]) - 'A';
+      DataLen   = sizeof(NoRem);
+
+      if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                                  DSK_BLOCKREMOVABLE,
+                                  &IOCtl, ParmLen, &ParmLen,
+                                  &NoRem, DataLen, &DataLen) == NO_ERROR)
+      {
+         if (NoRem)                             // non-removable sofar, check
+         {                                      // BPB as well (USB devices)
+            ParmLen   = sizeof(IOCtl);
+            IOCtl.cmd = TXFSDC_GETBPB;
+            IOCtl.drv = toupper(drive[0]) - 'A';
+            DataLen   = sizeof(RemAt);
+
+            if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                                        DSK_GETDEVICEPARAMS,
+                                        &IOCtl, ParmLen, &ParmLen,
+                                        &RemAt, DataLen, &DataLen) == NO_ERROR)
+
+            {
+               if (RemAt.attributes & TXFSBPB_REMOVABLE)
+               {
+                  TRACES(( "BPB removable, like USB\n"));
+                  rc = TRUE;                    // removable, probably USB
+               }
+            }
+         }
+         else
+         {
+            TRACES(( "Block removable\n"));
+            rc = TRUE;                          // removable block device
+         }
+      }
+   #endif
+   TxFsAutoFailCriticalErrors( FALSE);          // enable criterror handler
+   BRETURN (rc);
+}                                               // end 'TxFsIsRemovable'
+/*---------------------------------------------------------------------------*/
+
+
+/*****************************************************************************/
 // Determine free and total-available space (sectors) on specified drive
 /*****************************************************************************/

trunk/txlib/txosapi.c

@@ -253 +253 @@
    if (txfLargeAPItested == FALSE)
    {
-      rc = DosLoadModule( dlmerror,
-                          TXMAXLN,              // error buffer and size
-                          TXF_DOSCALLS,         // name of dll
-                          &doscalls);           // module handle
-      if (rc == NO_ERROR)
+      if ((DosLoadModule( dlmerror, TXMAXLN, TXF_DOSCALLS, &doscalls)) == NO_ERROR)
       {
          TRACES(("Txf DOSCALLS module handle: %lu\n", doscalls));
@@ -285 +281 @@
    }
 
-   if (txfLargeAPIentryp.DosOpenLarge != NULL)
+   if ((txfLargeAPIentryp.DosOpenLarge != NULL) &&
+       (txfLargeAPIentryp.DosSeekLarge != NULL)  )
    {
       rc = TRUE;

trunk/txlib/txscript.c

@@ -50 +50 @@
 #define TXSC_P_PROMPT       ";;prompt"
 #define TXSC_P_ERRORS       ";;error"
+
+#define TXSC_PARAMS         10                  // substitutable parameters
 
 static  char       *runhelp[] =
@@ -105 +107 @@
 };
 #endif
-
-
-// Substitute $n parameters in a string by supplied values; n = 0..9
-static ULONG txsSubstituteParams                // RET   nr of substitutions
-(
-   char               *string,                  // IN    base string
-   char              **values,                  // IN    values to substitute
-   char               *result                   // OUT   substituted (MAXLIN)
-);
 
 
@@ -184 +177 @@
                TxRepl( scrline, '\n', '\0');
                TxRepl( scrline, '\r', '\0');    // mainly for Linux/Unix ...
-               txsSubstituteParams( scrline, params, command);
+               txsSubstituteParams( scrline, params,  TXSC_PARAMS,
+                                             TXMAXLN, command);
 
                if ( (strlen( command) > 0) &&   // not empty, and
@@ -413 +407 @@
 /*---------------------------------------------------------------------------*/
 
-/*****************************************************************************/
-// Substitute $n parameters in a string by supplied values; n = 0..9
-/*****************************************************************************/
-static ULONG txsSubstituteParams                // RET   nr of substitutions
+
+/*****************************************************************************/
+// Substitute $n parameters in a string by supplied values; n = 0..9 (maximum)
+/*****************************************************************************/
+ULONG txsSubstituteParams                       // RET   nr of substitutions
 (
    char               *string,                  // IN    base string
    char              **values,                  // IN    values to substitute
+   int                 count,                   // IN    number of values
+   int                 size,                    // IN    size of output buffer
    char               *result                   // OUT   substituted (MAXLIN)
 )
@@ -438 +435 @@
          bs++;                                  // skip  $
          si  = (int) ((*bs) - '0');             // index 0..9
-         if (values[si] != NULL)                // value available ?
+         if ((si < count) &&
+             (values[si] != NULL))              // value available ?
          {
             rl += strlen( values[si]);
-            if (rl < TXMAXLN)                   // room to grow ?
+            if (rl < size)                      // room to grow ?
             {
                strcpy(  rs,  values[si]);       // copy value

trunk/txlib/txvers.h

@@ -40 +40 @@
 // Originally developed for LPTool/DFSee utilities, open-sourced in 2005
 //
-#define TXLIB_V "1.06 05-01-2006" // JvW Topline feedback on alt-/ trace toggle
+#define TXLIB_V "1.06 26-01-2006" // JvW SubstituteParams now external function
+//efine TXLIB_V "1.06 06-01-2006" // JvW Fixed trap in FileDlg due to USER ptr
+//efine TXLIB_V "1.06 05-01-2006" // JvW Topline feedback on alt-/ trace toggle
 //efine TXLIB_V "1.06 05-01-2006" // JvW Added usrdata ptr to txwWidgetDialog()
 //efine TXLIB_V "1.05 29-12-2005" // JvW Fixed Radio-repaint bug on (x == TRUE)
@@ -407 +409 @@
 
 #define TXLIB_N "TX-library"
-#define TXLIB_C "(c) 1995-2005: Fsys Software"
+#define TXLIB_C "(c) 1995-2006: Fsys Software"
 
 #endif

trunk/txlib/txwproc.c

@@ -208 +208 @@
                txwPostMsg(   hwnd, TXWM_ACTIVATE, TRUE, 0);
             }
-            txwSetWindowPtr( hwnd, TXQWP_USER, (void *) mp2); // user data
             break;
 
@@ -1425 +1424 @@
       wnd->us[TXQWS_FLAGS]  &= ~TXFF_DLGDISMISSED;  //- clear dismissed flag
 
+      if (cData != NULL)                        // optional, USER PTR could be
+      {                                         // set by caller already!
+         wnd->ul[TXQWP_USER] = (ULONG) cData;
+      }
       txwPostMsg( (TXWHANDLE) wnd, TXWM_INITDLG, focus, (ULONG) cData);
 

trunk/txlib/txwstdlg.c

@@ -1644 +1644 @@
       bframe = txwCreateWindow( parent, TXW_CANVAS, 0, 0, &window, NULL);
       txwSetWindowUShort( bframe, TXQWS_ID, TXWD_WID_MBAR);
-      txwSetWindowPtr( bframe, TXQWP_USER, mbar); // make mbar available
 
       for (m = 0, line = 0, lwidth = 1; m < mbar->count; m++)
@@ -1690 +1689 @@
          txwa->mainmenu = bframe;
       }
-      rc = txwDlgBox( parent, owner, txwMenuDlgWinProc, bframe, NULL);
+      rc = txwDlgBox( parent, owner, txwMenuDlgWinProc, bframe, mbar);
       if (flags & TXMN_MAIN_MENU)
       {
@@ -2229 +2228 @@
          fframe = txwCreateWindow( parent, TXW_CANVAS, 0, 0, &window, NULL);
          txwSetWindowUShort( fframe, TXQWS_ID, TXFD_WID_DFRAME);
-         txwSetWindowPtr( fframe, TXQWP_USER, fd); // make filedata available
          TRACES(("Attached filedata structure at %8.8lx to FD-frame\n", fd));
 
@@ -2418 +2416 @@
             }
 
-            fd->result = txwDlgBox( parent, parent, txwDefFileDlgProc,
-                                                    fframe, NULL);
+            fd->result = txwDlgBox( parent, parent, txwDefFileDlgProc, fframe, fd);
          }
          txSelDestroy( &fdpriv.direct);         // free directory list